diff --git a/4ti2.changes b/4ti2.changes index 2653452..7b9a858 100644 --- a/4ti2.changes +++ b/4ti2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 17 08:05:30 UTC 2013 - jengelh@inai.de + +- Combine shared library packages lib4ti2{gmp0,int32-0,int64-0} + as they are updated in lockstep + ------------------------------------------------------------------- Fri Dec 7 09:02:56 UTC 2012 - jengelh@inai.de diff --git a/4ti2.spec b/4ti2.spec index ec2d006..208a278 100644 --- a/4ti2.spec +++ b/4ti2.spec @@ -43,29 +43,16 @@ BuildRequires: xz 4ti2 is a collection of programs that compute and solve algebraic, geometric and combinational problems on linear spaces. -%package -n lib4ti2gmp0 -Summary: GMP-using computation library for Gröbner bases with 4ti2 +%package -n lib4ti2-0 +Summary: Library for computation of Gröbner bases with 4ti2 Group: System/Libraries -%description -n lib4ti2gmp0 -This package contains the 4ti2 program library and supports arbitrary -precision integers through use of GNU MP. - -%package -n lib4ti2int32-0 -Summary: 32-bit wide integer-using computation library for Gröbner bases with 4ti2 -Group: System/Libraries - -%description -n lib4ti2int32-0 -This package contains the 4ti2 program library and supports integer -precision of 32 bits. - -%package -n lib4ti2int64-0 -Summary: 64-bit wide integer-using computation library for Gröbner bases with 4ti2 -Group: System/Libraries - -%description -n lib4ti2int64-0 -This package contains the 4ti2 program library and supports integer -precision of 64 bits. +%description -n lib4ti2-0 +This package contains the 4ti2 program library, which comes in three +flavors: +- 32-bit precision integers +- 64-bit precision integers +- arbitrary precision integer support through use of GNU MP %package -n libzsolve0 Summary: Library for solving linear systems over integers for 4ti2 @@ -78,9 +65,7 @@ integers (\mathbb{Z}). %package devel Summary: Development files for 4ti2 Group: Development/Libraries/C and C++ -Requires: lib4ti2gmp0 = %version -Requires: lib4ti2int32-0 = %version -Requires: lib4ti2int64-0 = %version +Requires: lib4ti2-0 = %version Requires: libzsolve0 = %version %description devel @@ -98,7 +83,8 @@ if [ ! -e libtool ]; then # libtool is created. cp "$(which libtool)" ./; fi; -%configure --enable-shared --disable-static --includedir="%_includedir/%name" +%configure --enable-shared --disable-static \ + --includedir="%_includedir/pkg/%name" make %{?_smp_mflags}; %install @@ -112,12 +98,8 @@ for i in 4ti2*; do ln -s "%_libexecdir/%name/$i" "$b/%_bindir/$i"; done; -%post -n lib4ti2gmp0 -p /sbin/ldconfig -%postun -n lib4ti2gmp0 -p /sbin/ldconfig -%post -n lib4ti2int32-0 -p /sbin/ldconfig -%postun -n lib4ti2int32-0 -p /sbin/ldconfig -%post -n lib4ti2int64-0 -p /sbin/ldconfig -%postun -n lib4ti2int64-0 -p /sbin/ldconfig +%post -n lib4ti2-0 -p /sbin/ldconfig +%postun -n lib4ti2-0 -p /sbin/ldconfig %post -n libzsolve0 -p /sbin/ldconfig %postun -n libzsolve0 -p /sbin/ldconfig @@ -125,18 +107,12 @@ done; %defattr(-,root,root) %_bindir/4ti2* %_libexecdir/%name -%doc doc/* +%doc COPYING doc/* -%files -n lib4ti2gmp0 +%files -n lib4ti2-0 %defattr(-,root,root) %_libdir/lib4ti2gmp.so.0* - -%files -n lib4ti2int32-0 -%defattr(-,root,root) %_libdir/lib4ti2int32.so.0* - -%files -n lib4ti2int64-0 -%defattr(-,root,root) %_libdir/lib4ti2int64.so.0* %files -n libzsolve0 @@ -145,7 +121,7 @@ done; %files devel %defattr(-,root,root) -%_includedir/4ti2 +%_includedir/pkg/ %_libdir/lib*.so %changelog