- updated to recent 0.6.3 release; release 2

[packages/candl.git] / candl.spec

diff --git a/candl.spec b/candl.spec
index 0b6b37f78da007be99db77ba0649cfcbbbba98db..729cc7bf7bc484f047e8afe1297c039f3e17dd03 100644 (file)
--- a/candl.spec
+++ b/candl.spec
@@ -2,22 +2,16 @@ Summary:      Candl - Data Dependence Analysis Tool in the Polyhedral Model
 Summary(pl.UTF-8):     Candl - narzędzie do analizy zależności danych w modelu wielościennym
 Name:          candl
 Version:       0.6.3
-%define        snap    20140806
-%define        rel     1
-Release:       1.%{snap}.%{rel}
+Release:       2
 License:       LGPL v3+
 Group:         Libraries
-#Source0:      http://web.cse.ohio-state.edu/~pouchet/software/pocc/download/modules/%{name}-0.6.3.tar.gz
-Source0:       http://web.cse.ohio-state.edu/~pouchet/software/pocc/download/modules/%{name}-0.6.2.tar.gz
-# Source0-md5: 4e86392fa46a514b03532f93d9c83f8d
-# git clone git://repo.or.cz/candl.git
-# git diff 0.6.2
-Patch0:                %{name}-git.patch
+#Source0:      http://web.cse.ohio-state.edu/~pouchet/software/pocc/download/modules/%{name}-0.6.2.tar.gz
+#Source0Download: https://github.com/periscop/candl/tags
+Source0:       https://github.com/periscop/candl/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 392176a94ee0c99cdb45797568cda786
+Patch0:                %{name}-piplib.patch
 Patch1:                %{name}-isl.patch
 Patch2:                %{name}-info.patch
-Patch3:                %{name}-system-libs.patch
-# diff -Nur candl-0.6.2 candl-0.6.3 ; with autogenerated files removed, updated to apply on top of git patch
-Patch4:                %{name}-0.6.3.patch
 URL:           http://icps.u-strasbg.fr/people/bastoul/public_html/development/candl/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.9
@@ -25,8 +19,8 @@ BuildRequires:        gmp-devel
 # 0.12.x originally, 0.13 with isl patch
 BuildRequires: isl-devel >= 0.13
 BuildRequires: libtool
-BuildRequires: osl-devel
-BuildRequires: piplib-devel
+BuildRequires: osl-devel >= 0.9.4
+BuildRequires: piplib-devel >= 1.4.0
 BuildRequires: texinfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,8 +40,8 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      gmp-devel
 Requires:      isl-devel >= 0.13
-Requires:      osl-devel
-Requires:      piplib-devel
+Requires:      osl-devel >= 0.9.4
+Requires:      piplib-devel >= 1.4.0
 
 %description devel
 Header files for Candl library.
@@ -68,20 +62,10 @@ Static Candl library.
 Statyczna biblioteka Candl.
 
 %prep
-%setup -q -n %{name}-0.6.2
-# clean after make dist to allow git patch
-%{__rm} include/candl/candl.h
+%setup -q
 %patch0 -p1
-%patch4 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
-# because of tests subdir stripped from git patch
-> tests/Makefile.am
-
-%{__rm} osl piplib
-install -d osl piplib
 
 %build
 %{__libtoolize}
@@ -124,6 +108,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libcandl.so
 %{_libdir}/libcandl.la
 %{_includedir}/candl
+%dir %{_libdir}/candl
+%{_libdir}/candl/candl-config.cmake
 %{_infodir}/candl.info*
 
 %files static