Browse Source

update: kdepim-runtime, qhull

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2724 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 13 years ago
parent
commit
a904da49ac
2 changed files with 27 additions and 21 deletions
  1. 4 1
      k/kdepim-runtime/kdepim-runtime-vl.spec
  2. 23 20
      q/qhull/qhull-vl.spec

+ 4 - 1
k/kdepim-runtime/kdepim-runtime-vl.spec

@@ -3,7 +3,7 @@
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Summary(ja): KDE PIM ランタイム環境
-Version: 4.4.6
+Version: 4.4.10
 Release: 1%{?_dist_release}
 
 Group: Applications/Productivity
@@ -140,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 
 %changelog
+* Sun Feb 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.10-1
+- new upstream release
+
 * Fri Sep 24 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.6-1
 - new upstream release
 

+ 23 - 20
q/qhull/qhull-vl.spec

@@ -1,19 +1,19 @@
 %define name qhull
 %define version 2003.1
-%define release 0
 
 Summary: General dimension convex hull programs
 Name: %{name}
 Version: %{version}
-Release: 1%{?_dist_release}
-License:  Distributable
+Release: 2%{?_dist_release}
+License: Distributable
 Group: System Environment/Libraries
-Source0: http://www.qhull.org/download/qhull-%{version}.tar.gz
 URL: http://www.qhull.org
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Source0: http://www.qhull.org/download/qhull-%{version}.tar.gz
+
+Patch0: poly.c-qh_gethash.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 Qhull is a general dimension convex hull program that reads a set
@@ -23,8 +23,8 @@ diagrams, furthest-site Voronoi diagrams, and halfspace intersections
 about a point.
 
 %package devel
-Group: Development/Libraries
 Summary: Development files for qhull
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -35,11 +35,12 @@ diagrams, furthest-site Voronoi diagrams, and halfspace intersections
 about a point.
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q -n %{name}-%{version}
+%patch0 -p2
 
 
 %build
-%configure
+%configure --disable-static
 make
 
 %install
@@ -54,26 +55,28 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/%{name}-%{version}
-%_bindir/*
-%_libdir/*.so.*
-%_mandir/man1/*
+%{_bindir}/*
+%{_libdir}/libqhull.so.*
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root)
-%_libdir/*.*a
-%_libdir/*.so
-%_includedir/*
+%{_includedir}/qhull
+#{_libdir}/*.*a
+%{_libdir}/libqhull.so
 
 %changelog
+* Sat Feb 19 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2003.1-2
+- added Patch0 from upstream
+- added --disable-static to %%configure
+
 * Sat Sep 20 2008 Shu KONNO <owa@bg.wakwak.com> 2003.1-1vl5
 - applied new versioning policy
 - removed *.la