OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gmp?expand=0&rev=10

2009-04-23 12:59:42 +00:00 · 2009-04-23 12:59:42 +00:00 · d7ba7c4dce
commit d7ba7c4dce
parent 7822b63fc9
7 changed files with 130 additions and 78 deletions
--- a/baselibs.conf
+++ b/baselibs.conf
@ -1,2 +1,3 @@
-gmp
+libgmp3
+libgmpxx4
 gmp-devel
--- a/gmp-4.2.3.tar.bz2
+++ b/gmp-4.2.3.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:139b5abc49833832184c0a03ff6fc64c59ef102b420d2a5884ad78af5647414b
-size 1710314
--- a/gmp-4.3.0.tar.bz2
+++ b/gmp-4.3.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e18ec84c97938564d22fe46c8d6ef737cc5be508a30018a7fdde633f90bb20f0
+size 1897926
--- a/gmp-ia64.diff
+++ b/gmp-ia64.diff
@ -1,26 +0,0 @@
--- mpn/ia64/addmul_1.asm
-+++ mpn/ia64/addmul_1.asm
-@@ -75,7 +75,9 @@
- 		mov		r36 = 0			C clear for cmp
- 		nop.b		0		;;
- }
-		.align	32
-+ifdef(`HAVE_ABI_32', `',
-+`		{ nop 0 }
-+')
- .Loop:
- 	.pred.rel "mutex",p6,p7
-   { .mfi; (p16)	ldf8		f32 = [r17], 8		C  *0,3,6,9,12,15,18
--- mpn/ia64/mul_1.asm
-+++ mpn/ia64/mul_1.asm
-@@ -75,7 +75,9 @@
- 		mov		r36 = 0			C clear for cmp
- 		nop.b		0		;;
- }
-		.align	32
-+ifdef(`HAVE_ABI_32', `',
-+`		{ nop 0 }
-+')
- .Loop:
- 	.pred.rel "mutex",p6,p7
-   { .mfi; (p16)	ldf8		f32 = [r17], 8		C  *0,3,6,9,12,15,18
--- a/gmp-s390x.diff
+++ b/gmp-s390x.diff
@ -1,6 +1,8 @@
--- configure.in
-+++ configure.in
-@@ -1050,6 +1050,9 @@
+Index: configure.in
+===================================================================
+--- configure.in.orig	2009-04-14 14:36:29.000000000 +0200
+++ configure.in	2009-04-15 11:29:33.000000000 +0200
+@@ -1066,6 +1066,9 @@ case $host in
     ;;
 
 
@ -9,11 +11,13 @@
 +
   # IBM s/370 and similar
   [s3[6-9]0*-*-*])
-     gcc_cflags="-O2 $fomit_frame_pointer"
--- mpn/s390/gmp-mparam.h
-+++ mpn/s390/gmp-mparam.h
-@@ -20,7 +20,8 @@
- MA 02110-1301, USA. */
+     gcc_cflags="$gcc_cflags $fomit_frame_pointer"
+Index: mpn/s390/gmp-mparam.h
+===================================================================
+--- mpn/s390/gmp-mparam.h.orig	2009-04-14 14:36:31.000000000 +0200
+++ mpn/s390/gmp-mparam.h	2009-04-15 11:29:33.000000000 +0200
+@@ -18,7 +18,8 @@ You should have received a copy of the G
+ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
 -/* BITS_PER_MP_LIMB etc generated by configure */
@ -22,8 +26,10 @@
 
 
 /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
--- mpn/s390x/gmp-mparam.h
-+++ mpn/s390x/gmp-mparam.h
+Index: mpn/s390x/gmp-mparam.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ mpn/s390x/gmp-mparam.h	2009-04-15 11:29:33.000000000 +0200
@@ -0,0 +1,27 @@
 +/* gmp-mparam.h -- Compiler/machine parameter header file.
 +
@ -52,3 +58,18 @@
 +#define BITS_PER_INT 32
 +#define BITS_PER_SHORTINT 16
 +#define BITS_PER_CHAR 8
+Index: configure
+===================================================================
+--- configure.orig	2009-04-14 14:36:53.000000000 +0200
+++ configure	2009-04-15 11:29:43.000000000 +0200
+@@ -3201,6 +3201,9 @@ _ACEOF
+     ;;
+ 
+ 
+  s390x-*-*)
+       path="s390x" ;;
+
+   # IBM s/370 and similar
+   s3[6-9]0*-*-*)
+     gcc_cflags="$gcc_cflags $fomit_frame_pointer"
+
--- a/gmp.changes
+++ b/gmp.changes
@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Apr 23 14:50:03 CEST 2009 - mrueckert@suse.de
+
+- added small workaround for easier transition
+
+-------------------------------------------------------------------
+Wed Apr 15 10:29:12 CEST 2009 - rguenther@suse.de
+
+- Update to version 4.3.0.
+  * Speedups all over the board
+  * Fat binaries on x86_64
+- Split shared libraries according to policy.
+
 -------------------------------------------------------------------
 Wed Dec 10 12:34:56 CET 2008 - olh@suse.de

--- a/gmp.spec
+++ b/gmp.spec
@ -1,7 +1,7 @@
 #
-# spec file for package gmp (Version 4.2.3)
+# spec file for package gmp (Version 4.3.0)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -28,21 +28,54 @@ AutoReqProv:    on
 Obsoletes:      gmp-64bit
 %endif
 #
-Version:        4.2.3
-Release:        10
+Version:        4.3.0
+Release:        1
 Summary:        The GNU MP Library
 Url:            http://gmplib.org/
 Source:         gmp-%{version}.tar.bz2
 Patch0:         gmp-noexec.diff
-Patch1:         gmp-ia64.diff
 Patch2:         gmp-s390x.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires:       libgmp3 = %{version}
+Requires:       libgmpxx4 = %{version}

 %description
 A library for calculating huge numbers (integer and floating point).



+Authors:
+--------
+    Torbjorn Granlund <tege@zevs.sics.se>
+
+%package -n libgmp3
+License:        GPL v3 or later; LGPL v3 or later
+Summary:        Shared library for the GNU MP Library
+Group:          System/Libraries
+# in openSUSE 11.1 and SLE11 the shared libraries were in the gmp package itself
+# Provides:       gmp = 4.2.3
+# Obsoletes:      gmp < 4.2.3
+
+%description -n libgmp3
+Shared library for the GNU MP Library.
+
+
+
+Authors:
+--------
+    Torbjorn Granlund <tege@zevs.sics.se>
+
+%package -n libgmpxx4
+License:        GPL v3 or later; LGPL v3 or later
+Summary:        C++ bindings for the GNU MP Library
+Group:          System/Libraries
+Requires:       libgmp3 = %{version}
+
+%description -n libgmpxx4
+C++ bindings for the GNU MP Library.
+
+
+
 Authors:
 --------
    Torbjorn Granlund <tege@zevs.sics.se>
@ -51,7 +84,8 @@ Authors:
 License:        GPL v3 or later; LGPL v3 or later
 Summary:        Include Files and Libraries for Development with the GNU MP Library
 Group:          Development/Languages/C and C++
-Requires:       gmp = %{version}
+Requires:       libgmp3 = %{version}
+Requires:       libgmpxx4 = %{version}
 AutoReqProv:    on
 # bug437293
 %ifarch ppc64
@ -73,40 +107,33 @@ Authors:
 %prep
 %setup -q
 %patch0
-%patch1
 %patch2

 %build
-export HOME=/tmp/
+# export HOME=/tmp/
 # %%{?suse_update_config:%%{suse_update_config -f}}
-mv config.guess config.guess.gmp
-mv config.sub config.sub.gmp
-autoreconf -fi
-mv config.guess configfsf.guess
-mv config.sub configfsf.sub
-mv config.guess.gmp config.guess
-mv config.sub.gmp config.sub
-%ifarch ppc64
-# The PowerPC64 assembler funcs are for AIX and somehow don't work on Linux.
-rm -fv mpn/powerpc64/*.asm
-%endif
-CFLAGS="$RPM_OPT_FLAGS -Wall" \
+# mv config.guess config.guess.gmp
+# mv config.sub config.sub.gmp
+# autoreconf -fi
+# mv config.guess configfsf.guess
+# mv config.sub configfsf.sub
+# mv config.guess.gmp config.guess
+# mv config.sub.gmp config.sub
+# %ifarch ppc64
+# # The PowerPC64 assembler funcs are for AIX and somehow don't work on Linux.
+# rm -fv mpn/powerpc64/*.asm
+# %endif
+#%ifarch x86_64 x86
+#	    --enable-fat \
+#%endif
+CFLAGS="$RPM_OPT_FLAGS -fexceptions -Wall" \
 ./configure --prefix=/usr \
 	    --libdir=%{_libdir} \
            --infodir=%{_infodir} \
            --build=%{_target_platform} \
 	    --disable-mpfr \
            --enable-cxx
-#%ifarch x86_64
-#make CFLAGS="$RPM_OPT_FLAGS -Wall" fib_table.h mp_bases.h
-#cd mpf
-#make CFLAGS="$RPM_OPT_FLAGS -fno-cse-follow-jumps -Wall" cmp_si.o cmp_si.lo
-#cd ..
-#%endif
-make CFLAGS="$RPM_OPT_FLAGS -Wall" CC=gcc %{?jobs:-j%jobs}
-#%ifnarch alpha
-#make CFLAGS="$RPM_OPT_FLAGS -Wall" CC=gcc check %{?jobs:-j%jobs}
-#%endif
+make CFLAGS="$RPM_OPT_FLAGS -fexceptions -Wall" %{?jobs:-j%jobs}

 %check
 # do not disable "make check", FIX THE BUGS!
@ -118,14 +145,16 @@ rm $RPM_BUILD_ROOT%{_libdir}/libgmp.la
 rm $RPM_BUILD_ROOT%{_libdir}/libgmpxx.la
 rm $RPM_BUILD_ROOT%{_libdir}/libgmpxx.a

-%post
-%run_ldconfig
+%post -n libgmp3 -p /sbin/ldconfig
+
+%post -n libgmpxx4 -p /sbin/ldconfig

 %post devel
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz

-%postun
-%run_ldconfig
+%postun -n libgmp3 -p /sbin/ldconfig
+
+%postun -n libgmpxx4 -p /sbin/ldconfig

 %postun devel
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
@ -135,12 +164,19 @@ rm -rf $RPM_BUILD_ROOT

 %files
 %defattr(-,root,root)
-%doc AUTHORS README NEWS
-%{_libdir}/libgmp.so.*
-%{_libdir}/libgmpxx.so.*
+%doc COPYING*
+
+%files -n libgmp3
+%defattr(-,root,root)
+%{_libdir}/libgmp.so.3*
+
+%files -n libgmpxx4
+%defattr(-,root,root)
+%{_libdir}/libgmpxx.so.4*

 %files devel
 %defattr(-,root,root)
+%doc AUTHORS README NEWS
 %doc demos
 %doc %{_infodir}/gmp.info*.gz
 %{_libdir}/libgmp.a
@ -150,6 +186,13 @@ rm -rf $RPM_BUILD_ROOT
 /usr/include/gmpxx.h

 %changelog
+* Thu Apr 23 2009 mrueckert@suse.de
+- added small workaround for easier transition
+* Wed Apr 15 2009 rguenther@suse.de
+- Update to version 4.3.0.
+  * Speedups all over the board
+  * Fat binaries on x86_64
+- Split shared libraries according to policy.
 * Wed Dec 10 2008 olh@suse.de
 - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade
  (bnc#437293)
@ -202,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT
 - update to 4.1.4
 * Thu Nov 18 2004 ro@suse.de
 - fixed file list
-* Sun Sep 05 2004 schwab@suse.de
+* Mon Sep 06 2004 schwab@suse.de
 - Use autoreconf.
 - Fix read-only section check.
 * Tue Aug 10 2004 tcrhak@suse.cz