- updated to 0.21.1; isl 0.26, osl 0.9.7

[packages/cloog-isl.git] / cloog-isl.spec

diff --git a/cloog-isl.spec b/cloog-isl.spec
index a60af86e6d31fbffd74a17d930cbe5858c6908d4..b0280e2f201506f3a289f61abc1aa72b8b471960 100644 (file)
--- a/cloog-isl.spec
+++ b/cloog-isl.spec
@@ -2,30 +2,32 @@
 # Conditional build:
 %bcond_without osl     # OpenScop support
 #
-%define        isl_ver 0.13
+%define        isl_ver 0.26
 Summary:       The Chunky Loop Generator
 Summary(pl.UTF-8):     Chunky Loop Generator - generator pętli cząstkowych
 Name:          cloog-isl
-Version:       0.18.2
-Release:       3
+Version:       0.21.1
+Release:       1
 License:       LGPL v2.1+
 Group:         Development/Tools
-Source0:       http://www.bastoul.net/cloog/pages/download/cloog-%{version}.tar.gz
-# Source0-md5: 69116aa6cd5e73f6b688d871875e1292
-Patch0:                cloog-missing.patch
-Patch1:                cloog-isl-git.patch
+# older?
+#Source0:      http://www.bastoul.net/cloog/pages/download/cloog-%{version}.tar.gz
+#Source0Download: https://github.com/periscop/cloog/releases
+Source0:       https://github.com/periscop/cloog/releases/download/cloog-%{version}/cloog-%{version}.tar.gz
+# Source0-md5: cbd2fd43b3421ce466bd638bf90b326d
+Patch0:                cflags.patch
 URL:           http://www.cloog.org/
-BuildRequires: autoconf >= 2.13
+BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 BuildRequires: gmp-devel >= 5.0.2
 BuildRequires: gmp-c++-devel >= 5.0.2
 BuildRequires: isl-devel >= %{isl_ver}
-BuildRequires: libtool
-%{?with_osl:BuildRequires:     osl-devel}
+BuildRequires: libtool >= 2:2
+%{?with_osl:BuildRequires:     osl-devel >= 0.9.7}
 BuildRequires: texinfo-texi2dvi
 Requires:      %{name}-libs = %{version}-%{release}
 Provides:      cloog = %{version}
-Obsoletes:     cloog
+Obsoletes:     cloog < 0.16
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,6 +54,7 @@ Summary:      Chunky Loop Generator shared library - isl based version
 Summary(pl.UTF-8):     Biblioteka współdzielona Chunky Loop Generatora - wersja oparta na isl
 Group:         Libraries
 Requires:      isl >= %{isl_ver}
+%{?with_osl:Requires:  osl >= 0.9.7}
 
 %description libs
 Chunky Loop Generator shared library - isl based version.
@@ -68,8 +71,10 @@ Requires:    %{name}-libs = %{version}-%{release}
 Requires:      gmp-devel >= 5.0.2
 Requires:      gmp-c++-devel >= 5.0.2
 Requires:      isl-devel >= %{isl_ver}
-%{?with_osl:Requires:  osl-devel}
+%{?with_osl:Requires:  osl-devel >= 0.9.7}
 Provides:      cloog-devel = %{version}
+Conflicts:     cloog-polylib-devel
+Conflicts:     cloog-ppl-devel
 
 %description devel
 The header files for Chunky Loop Generator library.
@@ -92,9 +97,12 @@ Statyczna biblioteka opartej na isl wersji Chunky Loop Generatora.
 %prep
 %setup -q -n cloog-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
 # with_gmp_exec_prefix=yes avoids adding -L/lib to LDFLAGS
 %configure \
        --disable-silent-rules \
@@ -112,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcloog-isl.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -132,7 +143,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc/cloog.pdf
 %attr(755,root,root) %{_libdir}/libcloog-isl.so
-%{_libdir}/libcloog-isl.la
 %dir %{_includedir}/cloog
 %{_includedir}/cloog/*.h
 %{_includedir}/cloog/isl