From d1cd94fc530469b4ef64eeaaf3d19a65ee4ddd7b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 12 Jul 2014 11:19:11 -0400 Subject: [PATCH 1/4] fix license handling --- gmp.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gmp.spec b/gmp.spec index 4408fbd..dabf043 100644 --- a/gmp.spec +++ b/gmp.spec @@ -6,7 +6,7 @@ Summary: A GNU arbitrary precision library Name: gmp Version: 6.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 URL: http://gmplib.org/ Source0: ftp://ftp.gmplib.org/pub/gmp-%{version}/gmp-%{version}a.tar.bz2 @@ -210,7 +210,9 @@ exit 0 %files %defattr(-,root,root,-) -%doc COPYING COPYING.LESSERv3 COPYINGv2 COPYINGv3 NEWS README +%{!?_licensedir:%global license %%doc} +%license COPYING COPYING.LESSERv3 COPYINGv2 COPYINGv3 +%doc NEWS README %{_libdir}/libgmp.so.* %{_libdir}/libgmpxx.so.* %ifarch %{ix86} @@ -230,6 +232,9 @@ exit 0 %{_libdir}/libgmpxx.a %changelog +* Sat Jul 12 2014 Tom Callaway - 1:6.0.0-6 +- fix license handling + * Thu Jul 10 2014 Brent Baude - 1:6.0.0-5 - Fix gmp headers for ppc64le (#1083429) From 67404b366327b049dab144f50b01ec585d711a09 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 17:26:53 +0000 Subject: [PATCH 2/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- gmp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmp.spec b/gmp.spec index dabf043..7297694 100644 --- a/gmp.spec +++ b/gmp.spec @@ -6,7 +6,7 @@ Summary: A GNU arbitrary precision library Name: gmp Version: 6.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 URL: http://gmplib.org/ Source0: ftp://ftp.gmplib.org/pub/gmp-%{version}/gmp-%{version}a.tar.bz2 @@ -232,6 +232,9 @@ exit 0 %{_libdir}/libgmpxx.a %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1:6.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jul 12 2014 Tom Callaway - 1:6.0.0-6 - fix license handling From f30e98f78ea58a4932750c020c27172fcd1ac762 Mon Sep 17 00:00:00 2001 From: Frantisek Kluknavsky Date: Thu, 2 Apr 2015 17:06:58 +0200 Subject: [PATCH 3/4] bug965318 - improve debuginfo of assembler sources --- gmp-6.0.0-debuginfo.patch | 21 +++++++++++++++++++++ gmp.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gmp-6.0.0-debuginfo.patch diff --git a/gmp-6.0.0-debuginfo.patch b/gmp-6.0.0-debuginfo.patch new file mode 100644 index 0000000..bb72839 --- /dev/null +++ b/gmp-6.0.0-debuginfo.patch @@ -0,0 +1,21 @@ +diff -up wrk/mpn/m4-ccas.wrk wrk/mpn/m4-ccas +--- wrk/mpn/m4-ccas.wrk 2015-04-02 16:44:03.645305407 +0200 ++++ wrk/mpn/m4-ccas 2015-04-02 16:21:57.893870969 +0200 +@@ -104,4 +104,4 @@ echo "$CC" + $CC || exit + + # Comment this out to preserve .s intermediates +-rm -f $TMP ++#rm -f $TMP +diff -up wrk/mpn/Makeasm.am.wrk wrk/mpn/Makeasm.am +--- wrk/mpn/Makeasm.am.wrk 2015-04-02 16:42:41.692278742 +0200 ++++ wrk/mpn/Makeasm.am 2015-04-02 16:21:57.891870945 +0200 +@@ -66,7 +66,7 @@ SUFFIXES = .s .S .asm + + + # can be overridden during development, eg. "make RM_TMP=: mul_1.lo" +-RM_TMP = rm -f ++RM_TMP = true + + + # .S assembler, preprocessed with cpp. diff --git a/gmp.spec b/gmp.spec index 43740c3..08351f4 100644 --- a/gmp.spec +++ b/gmp.spec @@ -6,7 +6,7 @@ Summary: A GNU arbitrary precision library Name: gmp Version: 6.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 URL: http://gmplib.org/ Source0: ftp://ftp.gmplib.org/pub/gmp-%{version}/gmp-%{version}a.tar.bz2 @@ -14,6 +14,7 @@ Source0: ftp://ftp.gmplib.org/pub/gmp-%{version}/gmp-%{version}a.tar.bz2 Source2: gmp.h Source3: gmp-mparam.h Patch1: gmp-6.0.0-ppc64.patch +Patch2: gmp-6.0.0-debuginfo.patch License: LGPLv3+ or GPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,6 +61,7 @@ in applications. %prep %setup -q %patch1 -p1 -b .ppc64 +%patch2 -p1 -b .debuginfo # switch the defaults to new cpus on s390x %ifarch s390x @@ -235,6 +237,9 @@ exit 0 %{_libdir}/libgmpxx.a %changelog +* Thu Apr 02 2015 Frantisek Kluknavsky - 1:6.0.0-9 +- bug965318 - improve debuginfo of assembler sources + * Thu Sep 04 2014 Dan Horák - 1:6.0.0-8 - drop s390x patch, support is already in upstream From ba5742d4377340a08824b2e2528050c297ad8cb4 Mon Sep 17 00:00:00 2001 From: Frantisek Kluknavsky Date: Thu, 2 Apr 2015 17:06:58 +0200 Subject: [PATCH 4/4] bug965318 - improve debuginfo of assembler sources --- gmp-6.0.0-debuginfo.patch | 21 +++++++++++++++++++++ gmp.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gmp-6.0.0-debuginfo.patch diff --git a/gmp-6.0.0-debuginfo.patch b/gmp-6.0.0-debuginfo.patch new file mode 100644 index 0000000..bb72839 --- /dev/null +++ b/gmp-6.0.0-debuginfo.patch @@ -0,0 +1,21 @@ +diff -up wrk/mpn/m4-ccas.wrk wrk/mpn/m4-ccas +--- wrk/mpn/m4-ccas.wrk 2015-04-02 16:44:03.645305407 +0200 ++++ wrk/mpn/m4-ccas 2015-04-02 16:21:57.893870969 +0200 +@@ -104,4 +104,4 @@ echo "$CC" + $CC || exit + + # Comment this out to preserve .s intermediates +-rm -f $TMP ++#rm -f $TMP +diff -up wrk/mpn/Makeasm.am.wrk wrk/mpn/Makeasm.am +--- wrk/mpn/Makeasm.am.wrk 2015-04-02 16:42:41.692278742 +0200 ++++ wrk/mpn/Makeasm.am 2015-04-02 16:21:57.891870945 +0200 +@@ -66,7 +66,7 @@ SUFFIXES = .s .S .asm + + + # can be overridden during development, eg. "make RM_TMP=: mul_1.lo" +-RM_TMP = rm -f ++RM_TMP = true + + + # .S assembler, preprocessed with cpp. diff --git a/gmp.spec b/gmp.spec index 7297694..85b17ac 100644 --- a/gmp.spec +++ b/gmp.spec @@ -6,7 +6,7 @@ Summary: A GNU arbitrary precision library Name: gmp Version: 6.0.0 -Release: 7%{?dist} +Release: 9%{?dist} Epoch: 1 URL: http://gmplib.org/ Source0: ftp://ftp.gmplib.org/pub/gmp-%{version}/gmp-%{version}a.tar.bz2 @@ -15,6 +15,7 @@ Source2: gmp.h Source3: gmp-mparam.h Patch0: gmp-4.0.1-s390.patch Patch1: gmp-6.0.0-ppc64.patch +Patch2: gmp-6.0.0-debuginfo.patch License: LGPLv3+ or GPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,6 +63,7 @@ in applications. %setup -q %patch0 -p1 -b .s390 %patch1 -p1 -b .ppc64 +%patch2 -p1 -b .debuginfo %build autoreconf -ifv @@ -232,6 +234,9 @@ exit 0 %{_libdir}/libgmpxx.a %changelog +* Thu Apr 02 2015 Frantisek Kluknavsky - 1:6.0.0-9 +- bug965318 - improve debuginfo of assembler sources + * Sat Aug 16 2014 Fedora Release Engineering - 1:6.0.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild