[linbox] Update to snapshot with fixes for Fedora. Drop all patches, now upstream. Remove unnecessary spec fi
Jerry James
jjames at fedoraproject.org
Tue Jul 5 17:23:37 UTC 2011
commit 767d773d1c1221e87a43d747b3f6af16bf66abe8
Author: Jerry James <loganjerry at gmail.com>
Date: Tue Jul 5 11:22:49 2011 -0600
Update to snapshot with fixes for Fedora.
Drop all patches, now upstream.
Remove unnecessary spec file elements (%defattr, etc.).
.gitignore | 2 +-
linbox-cflags-lflags.patch | 23 -----------
linbox-double-named.diff | 20 ----------
linbox-respect-destdir.diff | 19 ---------
linbox.spec | 86 +++++++++++++++++++-----------------------
sources | 2 +-
6 files changed, 41 insertions(+), 111 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c40b837..0ba1354 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-linbox-1.1.7.svn3214.tar.gz
+/linbox-1.2.1.svn3901.tar.gz
diff --git a/linbox.spec b/linbox.spec
index f688495..abce898 100644
--- a/linbox.spec
+++ b/linbox.spec
@@ -1,35 +1,27 @@
-%global svnrel 3214
+%global svnrel 3901
Name: linbox
-Version: 1.1.7
-Release: 0.3.svn%{svnrel}%{?dist}
+Version: 1.2.1
+Release: 0.1.svn%{svnrel}%{?dist}
Summary: C++ Library for High-Performance Exact Linear Algebra
Group: Development/Libraries
-License: LGPLv2
+License: LGPLv2+
URL: http://www.linalg.org/
# current version does not build in rawhide -> fetch newer version from svn
-# svn co -r 3214 svn://linalg.org/linalg/trunk/linbox/ linbox-1.1.7
-# tar cvzf linbox-1.1.7.svn3214.tar.gz linbox-1.1.7
+# svn co -r 3901 svn://linalg.org/linalg/trunk/linbox/ linbox-1.2.1
+# tar cvzf linbox-1.2.1.svn3901.tar.gz linbox-1.2.1
Source0: http://www.linalg.org/linbox-%{version}.svn%{svnrel}.tar.gz
-# send upstream via mail Oct 17 2009
-# Patch0 for respecting destdir, when installing the docs
-Patch0: %{name}-respect-destdir.diff
-# send upstream via mail Oct 17 2009
-# Patch1 for deleting double named headers in Makefiles
-# if not applied 'install' will complain and break 'make install'
-Patch1: %{name}-double-named.diff
-# Patch2 for emitting --cflags --lflags in one command
-# if not applied only one command can be used at the same time
-Patch2: %{name}-cflags-lflags.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: atlas-devel
+BuildRequires: fflas-ffpack-devel
BuildRequires: givaro-devel
BuildRequires: gmp-devel
+BuildRequires: iml-devel
BuildRequires: ntl-devel
-BuildRequires: automake
BuildRequires: doxygen
+BuildRequires: ghostscript
+BuildRequires: gnuplot
BuildRequires: libtool
BuildRequires: tex(latex)
@@ -42,7 +34,8 @@ the integers and over finite fields.
%package devel
Summary: Development libraries/headers for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: fflas-ffpack-devel%{?_isa}
%description devel
@@ -62,35 +55,36 @@ Documentation for %{name}.
%prep
%setup -q
-%patch0
-%patch1
-%patch2
-find . -type f -name '*.C' | xargs chmod 0644
-find . -type f -name '*.h' | xargs chmod 0644
-#./autogen.sh --with-blas="%{_libdir}/atlas"
-NOCONFIGURE=yes ./autogen.sh
-# FIXME: look for *.so and not for *.a
-# should be done better :(
-sed -i "s|libcblas.a|libcblas.so|g" configure
+
+# Fix up missing and extraneous library linkage
+sed -e "s|\$(GMP_LIBS) \$(NTL_LIBS) \$(BLAS_LIBS)|-L%{_libdir}/atlas \$(NTL_LIBS) -lcblas|" \
+ -i interfaces/driver/Makefile.am
+sed -e "s|\$(GIVARO_LIBS) \$(GMP_LIBS) \$(NTL_LIBS) \$(BLAS_LIBS)|-L%{_libdir}/atlas ../../linbox/liblinbox.la \$(GIVARO_LIBS) \$(NTL_LIBS) -lcblas|" \
+ -i interfaces/sage/Makefile.am
+
+# Fix up an obsolete usage that causes us trouble
+sed -i "s|AC_CONFIG_HEADER|AC_CONFIG_HEADERS|" macros/config-header.m4
+
+# The snapshot doesn't come with a configure script
+autoreconf -I macros -i
%build
-# --enable-sage currently does not work, try with any new version !!!
+%configure --enable-shared --disable-static --enable-optimization \
+ --enable-drivers --enable-doc --with-doxygen --enable-sage --with-ntl
-%configure --enable-doc --with-givaro=yes --with-ntl=yes \
- --with-blas="%{_libdir}/atlas" --enable-shared \
- --enable-optimization --enable-drivers \
- --with-doxygen=yes --disable-rpath --disable-static \
+# Remove hardcoded rpaths
+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' \
+ -i libtool
-# Remove stupid rpaths
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make # %%{?_smp_mflags}
-make %{?_smp_mflags}
+# Don't want these files in with the HTML files
+rm -f doc/linbox-html/{AUTHORS,COPYING,INSTALL}
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_libdir}/*.la
@@ -106,26 +100,19 @@ rm -rf %{buildroot}%{_prefix}/doc
%check
# FIXME currently one test fails, disabling testsuite, till the next offical version
-#make -C tests check %{?_smp_mflags}
-
-
-%clean
-rm -rf %{buildroot}
+# make -C tests check %%{?_smp_mflags}
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/*.so.*
%files doc
-%defattr(-,root,root,-)
%doc doc/linbox-html/*
%files devel
-%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so
%{_bindir}/%{name}-config
@@ -133,6 +120,11 @@ rm -rf %{buildroot}
%changelog
+* Tue Jul 4 2011 Jerry James <loganjerry at gmail.com> - 1.2.1-0.1.svn3901
+- Update to snapshot with fixes for Fedora
+- Drop all patches, now upstream
+- Remove unnecessary spec file elements (%%defattr, etc.)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.7-0.3.svn3214
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 2e5771a..0e11eab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29e1a513d9c22ebdc1ab1a071facc694 linbox-1.1.7.svn3214.tar.gz
+3ec82b513d1bf20234fb77a5ca531561 linbox-1.2.1.svn3901.tar.gz
More information about the scm-commits
mailing list