diff --git a/cmake-gui.spec b/cmake-gui.spec index 28e9a51..a7de3f5 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -39,10 +39,12 @@ BuildRequires: expat-devel BuildRequires: curl-devel BuildRequires: gcc-c++ BuildRequires: libqt4-devel -BuildRequires: libarchive-devel BuildRequires: openssl-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel +%if 0%{?suse_version} > 1130 +BuildRequires: libarchive-devel +%endif Requires: cmake %description @@ -66,7 +68,15 @@ export CFLAGS="$CXXFLAGS" --datadir=/share/cmake \ --docdir=/share/doc/packages/cmake \ --mandir=/share/man \ +%if 0%{?suse_version} > 1130 --system-libs \ +%else + --system-curl \ + --system-expat \ + --system-zlib \ + --system-bzip2 \ + --no-system-libarchive \ +%endif --parallel=0%jobs \ --qt-gui make VERBOSE=1 %{?jobs:-j %jobs} diff --git a/cmake.changes b/cmake.changes index 74f4956..956db2e 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 5 10:49:54 UTC 2011 - puzel@novell.com + +- use --no-system-libarchive for openSUSE < 11.3 + ------------------------------------------------------------------- Mon Apr 4 14:17:43 UTC 2011 - puzel@novell.com diff --git a/cmake.spec b/cmake.spec index 7d8d5b2..d53810d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -39,10 +39,12 @@ BuildRequires: expat-devel %endif BuildRequires: curl-devel BuildRequires: gcc-c++ -BuildRequires: libarchive-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: zlib-devel +%if 0%{?suse_version} > 1130 +BuildRequires: libarchive-devel +%endif Requires: make %description @@ -64,7 +66,15 @@ export CFLAGS="$CXXFLAGS" --datadir=/share/%{name} \ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ +%if 0%{?suse_version} > 1130 --system-libs \ +%else + --system-curl \ + --system-expat \ + --system-zlib \ + --system-bzip2 \ + --no-system-libarchive \ +%endif --parallel=0%jobs \ --no-qt-gui make VERBOSE=1 %{?jobs:-j %jobs}