Merge branch 'master' of git://git.pld-linux.org/packages/cloog-isl

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

diff --git a/cloog-isl.spec b/cloog-isl.spec
index 66bb39c354e3aae14d129463c012a2d0a3667b99..a60af86e6d31fbffd74a17d930cbe5858c6908d4 100644 (file)
--- a/cloog-isl.spec
+++ b/cloog-isl.spec
@@ -2,21 +2,24 @@
 # Conditional build:
 %bcond_without osl     # OpenScop support
 #
+%define        isl_ver 0.13
 Summary:       The Chunky Loop Generator
 Summary(pl.UTF-8):     Chunky Loop Generator - generator pętli cząstkowych
 Name:          cloog-isl
-Version:       0.18.0
-Release:       1
+Version:       0.18.2
+Release:       3
 License:       LGPL v2.1+
 Group:         Development/Tools
 Source0:       http://www.bastoul.net/cloog/pages/download/cloog-%{version}.tar.gz
-# Source0-md5: be78a47bd82523250eb3e91646db5b3d
+# Source0-md5: 69116aa6cd5e73f6b688d871875e1292
+Patch0:                cloog-missing.patch
+Patch1:                cloog-isl-git.patch
 URL:           http://www.cloog.org/
 BuildRequires: autoconf >= 2.13
 BuildRequires: automake
 BuildRequires: gmp-devel >= 5.0.2
 BuildRequires: gmp-c++-devel >= 5.0.2
-BuildRequires: isl-devel >= 0.08
+BuildRequires: isl-devel >= %{isl_ver}
 BuildRequires: libtool
 %{?with_osl:BuildRequires:     osl-devel}
 BuildRequires: texinfo-texi2dvi
@@ -48,7 +51,7 @@ Ta wersja jest oparta na bibliotece isl.
 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 >= 0.08
+Requires:      isl >= %{isl_ver}
 
 %description libs
 Chunky Loop Generator shared library - isl based version.
@@ -64,7 +67,7 @@ Group:                Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      gmp-devel >= 5.0.2
 Requires:      gmp-c++-devel >= 5.0.2
-Requires:      isl-devel >= 0.08
+Requires:      isl-devel >= %{isl_ver}
 %{?with_osl:Requires:  osl-devel}
 Provides:      cloog-devel = %{version}
 
@@ -88,6 +91,8 @@ Statyczna biblioteka opartej na isl wersji Chunky Loop Generatora.
 
 %prep
 %setup -q -n cloog-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 # with_gmp_exec_prefix=yes avoids adding -L/lib to LDFLAGS
@@ -132,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cloog/*.h
 %{_includedir}/cloog/isl
 %{_includedir}/cloog/matrix
+%dir %{_libdir}/cloog-isl
+%{_libdir}/cloog-isl/cloog-isl-config.cmake
+%dir %{_libdir}/isl
+%{_libdir}/isl/isl-config.cmake
 %{_pkgconfigdir}/cloog-isl.pc
 
 %files static