From bdce7975e60489357e243ca8f0f84d0793b99ff76e7a519d88f738b0755d731b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 20 Sep 2010 14:31:57 +0000 Subject: [PATCH] Accepting request 48540 from devel:libraries:c_c++ checked in (request 48540) OBS-URL: https://build.opensuse.org/request/show/48540 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gmp?expand=0&rev=13 --- baselibs.conf | 6 ++--- gmp-4.3.2.tar.bz2 | 3 +++ gmp-5.0.1.tar.bz2 | 3 --- gmp-s390x.diff | 31 ++++++++++++++++++------- gmp.changes | 13 ----------- gmp.spec | 58 ++++++++++++++++++++--------------------------- 6 files changed, 52 insertions(+), 62 deletions(-) create mode 100644 gmp-4.3.2.tar.bz2 delete mode 100644 gmp-5.0.1.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index 01a8b1e..cc64d48 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,11 +1,9 @@ targettype x86 package libgmp3 obsoletes "gmp-" -libgmp10 +libgmp3 obsoletes "gmp-" libgmpxx4 -libmp3 gmp-devel requires -gmp- - requires "libgmp10- = " + requires "libgmp3- = " requires "libgmpxx4- = " - requires "libmp3- = " diff --git a/gmp-4.3.2.tar.bz2 b/gmp-4.3.2.tar.bz2 new file mode 100644 index 0000000..ef4ae24 --- /dev/null +++ b/gmp-4.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775 +size 1897483 diff --git a/gmp-5.0.1.tar.bz2 b/gmp-5.0.1.tar.bz2 deleted file mode 100644 index 0efd0ab..0000000 --- a/gmp-5.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2a610f01fd3298dc08c87bf30498c2402590e1bcb227fc40b15ee6d280939fb -size 2006109 diff --git a/gmp-s390x.diff b/gmp-s390x.diff index cf3237b..1bdfa8a 100644 --- a/gmp-s390x.diff +++ b/gmp-s390x.diff @@ -1,8 +1,8 @@ Index: configure.in =================================================================== ---- configure.in.orig 2010-02-06 13:43:13.000000000 +0100 -+++ configure.in 2010-09-06 15:46:08.000000000 +0200 -@@ -1095,6 +1095,9 @@ case $host 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 ;; @@ -12,10 +12,24 @@ Index: configure.in # IBM s/370 and similar [s3[6-9]0*-*-*]) 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 */ ++#define BITS_PER_MP_LIMB 32 ++#define BYTES_PER_MP_LIMB 4 + + + /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */ Index: mpn/s390x/gmp-mparam.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mpn/s390x/gmp-mparam.h 2010-09-06 15:48:08.000000000 +0200 ++++ 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. + @@ -38,7 +52,7 @@ Index: mpn/s390x/gmp-mparam.h +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +MA 02111-1307, USA. */ + -+#define GMP_LIMB_BITS 64 ++#define BITS_PER_MP_LIMB 64 +#define BYTES_PER_MP_LIMB 8 +#define BITS_PER_LONGINT 64 +#define BITS_PER_INT 32 @@ -46,9 +60,9 @@ Index: mpn/s390x/gmp-mparam.h +#define BITS_PER_CHAR 8 Index: configure =================================================================== ---- configure.orig 2010-02-06 13:43:19.000000000 +0100 -+++ configure 2010-09-06 15:46:08.000000000 +0200 -@@ -4833,6 +4833,9 @@ echo "include_mpn(\`mips32/mips-defs.m4' +--- configure.orig 2009-04-14 14:36:53.000000000 +0200 ++++ configure 2009-04-15 11:29:43.000000000 +0200 +@@ -3201,6 +3201,9 @@ _ACEOF ;; @@ -58,3 +72,4 @@ Index: configure # IBM s/370 and similar s3[6-9]0*-*-*) gcc_cflags="$gcc_cflags $fomit_frame_pointer" + diff --git a/gmp.changes b/gmp.changes index 3960a21..8451f27 100644 --- a/gmp.changes +++ b/gmp.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Mon Sep 13 10:20:05 UTC 2010 - rguenther@novell.com - -- Package BSB libmp bindings. [bnc#623910] - -------------------------------------------------------------------- -Mon Sep 6 13:27:34 UTC 2010 - rguenther@novell.com - -- Update to release GMP 5.0.1. - * Major performance and memory usage improvements. - * Enable fat binaries on x86. - * Bump SO version to 10. - ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de diff --git a/gmp.spec b/gmp.spec index 17e5953..0db5cc3 100644 --- a/gmp.spec +++ b/gmp.spec @@ -1,5 +1,5 @@ # -# spec file for package gmp (Version 5.0.1) +# spec file for package gmp (Version 4.3.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ AutoReqProv: on Obsoletes: gmp-64bit %endif # -Version: 5.0.1 +Version: 4.3.2 Release: 6 Summary: The GNU MP Library Url: http://gmplib.org/ @@ -42,7 +42,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build A library for calculating huge numbers (integer and floating point). -%package -n libgmp10 + +Authors: +-------- + Torbjorn Granlund + +%package -n libgmp3 License: GPLv3+ ; LGPLv3+ Summary: Shared library for the GNU MP Library Group: System/Libraries @@ -50,37 +55,36 @@ Group: System/Libraries Provides: gmp = 4.2.3 Obsoletes: gmp <= 4.2.3 -%description -n libgmp10 +%description -n libgmp3 Shared library for the GNU MP Library. + +Authors: +-------- + Torbjorn Granlund + %package -n libgmpxx4 License: GPLv3+ ; LGPLv3+ Summary: C++ bindings for the GNU MP Library Group: System/Libraries -Requires: libgmp10 = %{version} +Requires: libgmp3 = %{version} %description -n libgmpxx4 C++ bindings for the GNU MP Library. -%package -n libmp3 -License: GPLv3+ ; LGPLv3+ -Summary: BSD libmp bindings for the GNU MP Library -Group: System/Libraries -Requires: libgmp10 = %{version} - -%description -n libmp3 -BSD libmp bindings for the GNU MP Library. +Authors: +-------- + Torbjorn Granlund %package devel License: GPLv3+ ; LGPLv3+ Summary: Include Files and Libraries for Development with the GNU MP Library Group: Development/Languages/C and C++ -Requires: libgmp10 = %{version} +Requires: libgmp3 = %{version} Requires: libgmpxx4 = %{version} -Requires: libmp3 = %{version} AutoReqProv: on # bug437293 %ifarch ppc64 @@ -128,9 +132,7 @@ CFLAGS="$RPM_OPT_FLAGS -fexceptions" \ --infodir=%{_infodir} \ --build=%{sanitized_platform} \ --disable-mpfr \ - --enable-cxx \ - --enable-fat \ - --enable-mpbsd + --enable-cxx make CFLAGS="$RPM_OPT_FLAGS -fexceptions" %{?_smp_mflags} %check @@ -142,42 +144,32 @@ make install DESTDIR=${RPM_BUILD_ROOT} rm $RPM_BUILD_ROOT%{_libdir}/libgmp.la rm $RPM_BUILD_ROOT%{_libdir}/libgmpxx.la rm $RPM_BUILD_ROOT%{_libdir}/libgmpxx.a -rm $RPM_BUILD_ROOT%{_libdir}/libmp.a -rm $RPM_BUILD_ROOT%{_libdir}/libmp.la -%post -n libgmp10 -p /sbin/ldconfig +%post -n libgmp3 -p /sbin/ldconfig %post -n libgmpxx4 -p /sbin/ldconfig -%post -n libmp3 -p /sbin/ldconfig - %post devel %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%postun -n libgmp10 -p /sbin/ldconfig +%postun -n libgmp3 -p /sbin/ldconfig %postun -n libgmpxx4 -p /sbin/ldconfig -%postun -n libmp3 -p /sbin/ldconfig - %postun devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %clean rm -rf $RPM_BUILD_ROOT -%files -n libgmp10 +%files -n libgmp3 %defattr(-,root,root) -%{_libdir}/libgmp.so.10* +%{_libdir}/libgmp.so.3* %files -n libgmpxx4 %defattr(-,root,root) %{_libdir}/libgmpxx.so.4* -%files -n libmp3 -%defattr(-,root,root) -%{_libdir}/libmp.so.3* - %files devel %defattr(-,root,root) %doc AUTHORS README NEWS @@ -186,9 +178,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgmp.a %{_libdir}/libgmp.so %{_libdir}/libgmpxx.so -%{_libdir}/libmp.so /usr/include/gmp.h /usr/include/gmpxx.h -/usr/include/mp.h %changelog