[givaro] New upstream release. Add BRs for TeXLive 2012. Make sure the library doesn't have an rpath. Link wi

Jerry James jjames at fedoraproject.org
Fri Feb 8 17:01:38 UTC 2013


commit f2c90fce75b4d5926e3240ed2297037a4ed2101e
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Fri Feb 8 10:01:00 2013 -0700

    New upstream release.
    Add BRs for TeXLive 2012.
    Make sure the library doesn't have an rpath.
    Link with --as-needed.
    Add AUTHORS and COPYING to doc.

 .gitignore  |    2 +-
 givaro.spec |   36 ++++++++++++++++++++++++++----------
 sources     |    2 +-
 3 files changed, 28 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d2cdef..bcbc3e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/givaro-3.7.1.tar.gz
+/givaro-3.7.2.tar.gz
diff --git a/givaro.spec b/givaro.spec
index 8dfc2e9..b14bf89 100644
--- a/givaro.spec
+++ b/givaro.spec
@@ -1,17 +1,20 @@
 Name:		givaro
-Version:	3.7.1
+Version:	3.7.2
 Release:	1%{?dist}
 Summary:	C++ library for arithmetic and algebraic computations
 Group:		Development/Libraries
 
 License:	CeCILL-B
 URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
-Source0:	https://forge.imag.fr/frs/download.php/250/%{name}-%{version}.tar.gz
+Source0:	https://forge.imag.fr/frs/download.php/370/%{name}-%{version}.tar.gz
+# Avoid a spurious newline when configuring with both --cflags and --libs
 Patch0:		givaro-config-script.patch
 
 BuildRequires:	doxygen
+BuildRequires:  ghostscript
 BuildRequires:	gmp-devel
 BuildRequires:	tex(latex)
+BuildRequires:  tex(stmaryrd.sty)
 
 
 %description
@@ -51,10 +54,10 @@ The static libraries for using %{name} for development.
 %patch0
 
 # Fix file encodings
-for i in Licence_CeCILL-B_V1-fr.txt Licence_CeCILL-B_V1-en.txt;
+for i in Licence_CeCILL-B_V1-fr.txt Licence_CeCILL-B_V1-en.txt COPYING AUTHORS;
 do
-	iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
-	touch -r $i $i.new && \
+	iconv -f iso8859-1 -t utf-8 $i > $i.new
+	touch -r $i $i.new
 	mv $i.new $i
 done
 
@@ -63,10 +66,15 @@ find examples -name Makefile.am -perm /0111 | xargs chmod a-x
 
 %build
 %configure --enable-shared --enable-doc \
-  --docdir=%{_docdir}/%{name}-devel-%{version}
+  --docdir=%{_docdir}/%{name}-devel-%{version} CPPFLAGS="-D__int64=__int64_t"
 
-# Fix an unused direct library dependency
-sed -i 's/-lm -lgcc_s/-lgcc_s/' libtool
+# Get rid of undesirable hardcoded rpaths, and workaround libtool reordering
+# -Wl,--as-needed after all the libraries.
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    -e 's|^LTCC="gcc"|LTCC="gcc -Wl,--as-needed"|' \
+    -e 's|^CC="\(g..\)"|CC="\1 -Wl,--as-needed"|' \
+    -i libtool
 
 make %{?_smp_mflags}
 
@@ -99,7 +107,8 @@ make check
 
 
 %files
-%doc COPYRIGHT Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt
+%doc AUTHORS COPYRIGHT COPYING
+%doc Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt
 %{_libdir}/lib%{name}.so.*
 
 
@@ -118,6 +127,13 @@ make check
 
 
 %changelog
+* Fri Feb  8 2013 Jerry James <loganjerry at gmail.com> - 3.7.2-1
+- New upstream release
+- Add BRs for TeXLive 2012
+- Make sure the library doesn't have an rpath
+- Link with --as-needed
+- Add AUTHORS and COPYING to doc
+
 * Wed Sep 26 2012 Jerry James <loganjerry at gmail.com> - 3.7.1-1
 - New upstream release
 
@@ -157,7 +173,7 @@ make check
 - Update to 3.3.0
 - Relicence per CeCILL-B
 
-* Sun Sep 12 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.2.rc1
+* Sat Sep 12 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.2.rc1
 - Change to GPL+ from GPL2 per bugzilla comment
 
 * Sun Aug 23 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.1.rc1
diff --git a/sources b/sources
index fcc5629..37ec914 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba0981377ef4737018f0b295ac5bbb01  givaro-3.7.1.tar.gz
+bd920698936de6ed7df1d248cc273b2b  givaro-3.7.2.tar.gz


More information about the scm-commits mailing list