[genus2reduction] Rebuild for pari 2.7.1.

Jerry James jjames at fedoraproject.org
Fri May 23 17:20:39 UTC 2014


commit e2886d76c4ba849c5663d3062d03c341932206a9
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Fri May 23 11:20:09 2014 -0600

    Rebuild for pari 2.7.1.
    
    Upstream maintenance is now done by sagemath.  Switch to their tarball.
    Drop patch, it is included in the new upstream.
    Drop license clarification texts, also included in new upstream.

 .gitignore                      |    2 +-
 genus2reduction-compile.patch   |  376 ---------------------------------------
 genus2reduction-licenseinfo.txt |   42 -----
 genus2reduction.mbox            |  229 ------------------------
 genus2reduction.spec            |   36 +++--
 sources                         |    2 +-
 6 files changed, 23 insertions(+), 664 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7368c56..1cb0ca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-genus2reduction-0.3.tar.gz
+/genus2reduction-0.3.p8.spkg
diff --git a/genus2reduction.spec b/genus2reduction.spec
index 6eb3633..2825ae1 100644
--- a/genus2reduction.spec
+++ b/genus2reduction.spec
@@ -1,17 +1,14 @@
+# Sagemath patch level
+%global sagepatch .p8
+
 Name:           genus2reduction
 Version:        0.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Computes Reductions of Genus 2 Proper Smooth Curves
 Group:          Applications/Engineering
 License:        GPLv2
 URL:            http://www.math.u-bordeaux1.fr/~qliu/G2R/
-Source0:        http://www.math.u-bordeaux1.fr/~qliu/G2R/genus2reduction-%{version}.tar.gz
-# License clarification:
-Source1:        genus2reduction.mbox
-# More license clarification:
-Source2:        genus2reduction-licenseinfo.txt
-# Adapt to pari 2.5
-Patch0:         genus2reduction-compile.patch
+Source0:        http://www.sagemath.org/packages/standard/%{name}-%{version}%{sagepatch}.spkg
 
 BuildRequires:  pari-devel
 
@@ -31,23 +28,32 @@ is the special fiber X_p of X over p), and the exponent f of the
 conductor of J(C) at p.
 
 %prep
-%setup -q
-%patch0
-cp -p %{SOURCE1} .
-cp -p %{SOURCE2} .
+%setup -q -n %{name}-%{version}%{sagepatch}
+
+# Update for pari 2.7.1
+sed -i.orig 's/arither1/e_TYPE/' src/%{name}.c
+touch -r src/%{name}.c.orig src/%{name}.c
 
 %build
-make CC="%{__cc}" CFLAGS="$RPM_OPT_FLAGS -I/usr/include/pari"
+cd src
+gcc %{optflags} -I%{_includedir}/pari -o %{name} %{name}.c $RPM_LD_FLAGS -lpari
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -p -m 755 src/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %files
-%doc README %{name}.mbox %{name}-licenseinfo.txt
+%doc src/gpl-email.txt src/COPYING src/README src/SAGE.txt src/THANKS
+%doc src/WARNING
 %{_bindir}/%{name}
 
 %changelog
+* Fri May 23 2014 Jerry James <loganjerry at gmail.com> - 0.3-12
+- Rebuild for pari 2.7.1
+- Upstream maintenance is now done by sagemath.  Switch to their tarball.
+- Drop patch, it is included in the new upstream.
+- Drop license clarification texts, also included in new upstream.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index f0b4833..dab622b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46a5816f6c60edc8b3d047aa24a9f99e  genus2reduction-0.3.tar.gz
+ea9c7cc764dc17a9c84b639dfa88b42c  genus2reduction-0.3.p8.spkg


More information about the scm-commits mailing list