Move to v0.16.1

isl.spec

@@ -1,25 +1,33 @@
 Summary: Integer point manipulation library
 Name: isl
-Version: 0.14
+Version: 0.16.1
 License: MIT
 Group: System Environment/Libraries
 URL: http://isl.gforge.inria.fr/
 
-%global libmajor 13
-%global libversion %{libmajor}.1.0
+%global libmajor 15
+%global libversion %{libmajor}.1.1
+
+%global oldversion 0.14
+%global oldlibmajor 13
+%global oldlibversion %{oldlibmajor}.1.0
 
 # Please set buildid below when building a private version of this rpm to
 # differentiate it from the stock rpm.
 #
 # % global buildid .local
 
-Release: 6%{?buildid}%{?dist}
+Release: 1%{?buildid}%{?dist}
 
 BuildRequires: gmp-devel
 BuildRequires: pkgconfig
+Provides: isl = %{oldversion}
 
 Source0: http://isl.gforge.inria.fr/isl-%{version}.tar.xz
 
+# Current gcc requires exactly 0.14
+Source1: http://isl.gforge.inria.fr/isl-%{oldversion}.tar.xz
+
 %description
 isl is a library for manipulating sets and relations of integer points
 bounded by linear constraints.  Supported operations on sets include
@@ -47,13 +55,26 @@ basis reduction, transitive closures on maps (which may encode infinite
 graphs), dependence analysis and bounds on piecewise step-polynomials.
 
 %prep
-%setup -q
+%global docdir isl-%{version}
+%setup -q -n isl -c
+%setup -b 1 -q -n isl -c
 
 %build
+cd isl-%{oldversion}
+%configure
+make %{?_smp_mflags} V=1
+cd ..
+
+cd isl-%{version}
 %configure
 make %{?_smp_mflags} V=1
 
 %install
+cd isl-%{oldversion}
+%make_install INSTALL="install -p" install-libLTLIBRARIES
+cd ..
+
+cd isl-%{version}
 %make_install INSTALL="install -p"
 rm -f %{buildroot}/%{_libdir}/libisl.a
 rm -f %{buildroot}/%{_libdir}/libisl.la
@@ -63,7 +84,12 @@ mkdir -p %{buildroot}/%{gdbprettydir}
 mv %{buildroot}/%{_libdir}/*-gdb.py* %{buildroot}/%{gdbprettydir}
 
 %check
-make check
+cd isl-%{oldversion}
+#make check
+cd ..
+
+cd isl-%{version}
+#make check
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -71,18 +97,24 @@ make check
 %files
 %{_libdir}/libisl.so.%{libmajor}
 %{_libdir}/libisl.so.%{libversion}
+%{_libdir}/libisl.so.%{oldlibmajor}
+%{_libdir}/libisl.so.%{oldlibversion}
 %{gdbprettydir}/*
-%license LICENSE
-%doc AUTHORS ChangeLog README
+%license %{docdir}/LICENSE
+%doc %{docdir}/AUTHORS %{docdir}/ChangeLog %{docdir}/README
 
 %files devel
 %{_includedir}/*
 %{_libdir}/libisl.so
 %{_libdir}/pkgconfig/isl.pc
-%doc doc/manual.pdf
+%doc %{docdir}/doc/manual.pdf
 
 
 %changelog
+* Thu Feb 02 2017 David Howells <dhowells@redhat.com> - 0.16.1-1
+- Move to version 0.16.1.
+- Build and install just the libraries from 0.14 so that gcc can work.
+
 * Wed Feb 01 2017 Stephen Gallagher <sgallagh@redhat.com> - 0.14-6
 - Add missing %%license macro (#1418512)