[iml] New upstream release. Fix URL. Update %description from the web site. Drop BuildRoot tag, %clean scr

Jerry James jjames at fedoraproject.org
Tue Apr 26 18:02:17 UTC 2011


commit 1da5f61902cbfd21561ab49c0b9e8ffced92f302
Author: Jerry James <loganjerry at gmail.com>
Date:   Tue Apr 26 12:01:06 2011 -0600

    New upstream release.
    Fix URL.
    Update %description from the web site.
    Drop BuildRoot tag, %clean script, and clean at start of %install script.
    Move static library into a -static subpackage.
    Fix code typo in iml 1.0.3.

 .gitignore        |    2 +-
 iml-no-repl.patch |   22 +++++++++++++
 iml.spec          |   86 ++++++++++++++++++++++++++++++++++++++++------------
 sources           |    2 +-
 4 files changed, 90 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d491e2f..2c85f14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-iml-1.0.2.tar.gz
+iml-1.0.3.tar.gz
diff --git a/iml-no-repl.patch b/iml-no-repl.patch
new file mode 100644
index 0000000..ef23ee3
--- /dev/null
+++ b/iml-no-repl.patch
@@ -0,0 +1,22 @@
+--- src/Makefile.in.orig	2008-07-28 08:53:18.000000000 -0600
++++ src/Makefile.in	2011-04-26 11:53:12.571156023 -0600
+@@ -62,8 +62,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-libiml_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+-	$(top_builddir)/repl/librepl.la
++libiml_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ am_libiml_la_OBJECTS = libiml_la-basisop.lo libiml_la-certsolve.lo \
+ 	libiml_la-error.lo libiml_la-latreduce.lo \
+ 	libiml_la-memalloc.lo libiml_la-mtrans.lo \
+@@ -220,8 +219,7 @@
+ 	            nullspace.c
+ 
+ libiml_la_CFLAGS = $(AM_CFLAGS)
+-libiml_la_LIBADD = $(EXTERNLIB) \
+-	 	   $(top_builddir)/repl/librepl.la
++libiml_la_LIBADD = $(EXTERNLIB)
+ 
+ all: all-am
+ 
diff --git a/iml.spec b/iml.spec
index 9c3c37e..5ac9d01 100644
--- a/iml.spec
+++ b/iml.spec
@@ -1,70 +1,116 @@
 Name:           iml
-Version:        1.0.2
-Release:        8%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Finds solutions to systems of linear equations over integers
 Group:          Applications/Engineering
 License:        BSD
-URL:            http://www.cs.uwaterloo.ca/~z4chen/iml.html
-Source0:        http://www.cs.uwaterloo.ca/~z4chen/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            http://www.cs.uwaterloo.ca/~astorjoh/iml.html
+Source0:        http://www.cs.uwaterloo.ca/~astorjoh/iml-%{version}.tar.gz
+# This patch will not be sent upstream, as it is Fedora specific.  Configure
+# checks whether the system realloc() has either of two bugs and, if so,
+# uses a wrapper around realloc() to work around the bugs.  Glibc does not
+# have those bugs, so the wrapper is unnecessary.  However, it gets linked
+# into the final library anyway.  The wrapper code is GPLv2+ and iml is BSD.
+# Since the workaround is not used on Fedora systems anyway, this patch
+# prevents it from being linked in, allowing iml to remain straight BSD.
+Patch0:         iml-no-repl.patch
 
 BuildRequires:  atlas-devel
 BuildRequires:  gmp-devel
 
 
 %description
-IML package provides efficient routines to solve nonsingular systems of
-linear equations, certified solve any shape systems of linear equations,
-and perform mod p matrix operations, such as computing row-echelon form,
-determinant, rank profile, inverse of a mod p matrix.
+IML provides efficient routines to compute exact solutions to dense
+systems of linear equations over the integers.  The following
+functionality is provided:
+- Nonsingular rational system solving.
+- Compute the right nullspace of an integer matrix.
+- Certified linear system solving.
 
 
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Provides:       %{name}-static = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       atlas-devel%{?_isa}, gmp-devel%{?_isa}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
+%package        static
+Summary:        Static library for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
+
+%description    static
+The %{name}-static package contains a static library for %{name}.
+
+
 %prep
 %setup -q
+%patch0
+
+# Fix a typo in iml 1.0.3
+sed -i 's/mpz_init_ui/mpz_init_set_ui/' src/nullspace.c
 
 
 %build
-%configure --with-atlas-include=%{_includedir}/atlas \
+%configure --enable-shared \
+  --with-atlas-include=%{_includedir}/atlas \
   --with-atlas-lib=%{_libdir}/atlas \
-  CFLAGS="%{optflags} -L%{_libdir}/atlas"
+  LDFLAGS="-L%{_libdir}/atlas"
+
+# Remove an unnecessary direct shared library dependency
+sed -i 's/ -latlas//' src/Makefile
+
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/liblink
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/libroutines
-#cp examples $RPM_BUILD_ROOT/%{_datadir}/%{name}/
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 %check
 make check
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS README
+%{_libdir}/lib%{name}.so.*
 
 
 %files devel
 %defattr(-,root,root,-)
-%doc AUTHORS README doc/liblink doc/libroutines examples
+%doc doc/liblink doc/libroutines examples
 %{_includedir}/*
+%{_libdir}/lib%{name}.so
+
+
+%files static
+%defattr(-,root,root,-)
 %{_libdir}/lib%{name}.a
 
 
 %changelog
+* Tue Apr 26 2011 Jerry James <loganjerry at gmail.com> - 1.0.3-1
+- New upstream release
+- Fix URL
+- Update description from the web site
+- Drop BuildRoot tag, clean script, and clean at start of install script
+- Move static library into a -static subpackage
+- Fix code typo in iml 1.0.3
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 04ef85d..a40072a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03a2e361bf9574ae8d32c19a392eeb66  iml-1.0.2.tar.gz
+633a6f97718f19ae81dfb97ad728c27f  iml-1.0.3.tar.gz


More information about the scm-commits mailing list