From 8eac18542688a1ba6537d6c84e0021f9f79b8f3304ee41b613ec603f7e3c2372 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Tue, 5 Apr 2011 10:51:42 +0000 Subject: [PATCH 1/3] fix build for older distros OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=75 --- cmake-gui.spec | 12 +++++++++++- cmake.changes | 5 +++++ cmake.spec | 12 +++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) 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} From 6d4a144fdf0ebdf9984dc1e30fa0032a9f75a599682055d31c8e577a6a371d20 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 26 May 2011 13:31:30 +0000 Subject: [PATCH 2/3] Updating link to change in openSUSE:Factory/cmake revision 47.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=a8211bb22d11ceecfcb47942fa6d835c --- cmake-gui.spec | 5 +++-- cmake.spec | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake-gui.spec b/cmake-gui.spec index a7de3f5..2a9a28e 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -1,7 +1,7 @@ # -# spec file for package cmake-gui (Version 2.8.4) +# spec file for package cmake-gui # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,6 +59,7 @@ Authors: %prep %setup -q -n cmake-%{version} %patch4 + %build EXTRA_FLAGS="--qt-gui" export CXXFLAGS="$RPM_OPT_FLAGS" diff --git a/cmake.spec b/cmake.spec index d53810d..0be638e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,7 +1,7 @@ # -# spec file for package cmake (Version 2.8.4) +# spec file for package cmake # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From c3ea107f921d93df0da620e27acc82c8f41c5973cadb9c4d26b7e94d980f4cd5 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Fri, 29 Jul 2011 16:20:26 +0000 Subject: [PATCH 3/3] update to cmake-2.8.5 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=77 --- cmake-2.8.4.tar.bz2 | 3 --- cmake-2.8.5.tar.gz | 3 +++ cmake-gui.changes | 6 ++++++ cmake-gui.spec | 4 ++-- cmake.changes | 6 ++++++ cmake.spec | 4 ++-- 6 files changed, 19 insertions(+), 7 deletions(-) delete mode 100644 cmake-2.8.4.tar.bz2 create mode 100644 cmake-2.8.5.tar.gz diff --git a/cmake-2.8.4.tar.bz2 b/cmake-2.8.4.tar.bz2 deleted file mode 100644 index 2f6e2aa..0000000 --- a/cmake-2.8.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5465a243dce5a6e140a5ce49bf2b5bb07e78eee10310597abac0669c638c053f -size 4181332 diff --git a/cmake-2.8.5.tar.gz b/cmake-2.8.5.tar.gz new file mode 100644 index 0000000..5afeb90 --- /dev/null +++ b/cmake-2.8.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91 +size 5517977 diff --git a/cmake-gui.changes b/cmake-gui.changes index 99bb20e..24c52c3 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 29 16:19:45 UTC 2011 - puzel@novell.com + +- update to 2.8.5 + - see /usr/share/doc/packages/cmake/Changelog for changes + ------------------------------------------------------------------- Thu Nov 11 11:09:03 UTC 2010 - puzel@novell.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 2a9a28e..b678395 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -19,12 +19,12 @@ Name: cmake-gui -Version: 2.8.4 +Version: 2.8.5 Release: 1 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: cmake-%{version}.tar.bz2 +Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz Patch4: cmake-disable-builtin-chrpath.diff Summary: CMake graphical user interface BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/cmake.changes b/cmake.changes index 956db2e..7b5398f 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 29 16:19:27 UTC 2011 - puzel@novell.com + +- update to 2.8.5 + - see /usr/share/doc/packages/cmake/Changelog for changes + ------------------------------------------------------------------- Tue Apr 5 10:49:54 UTC 2011 - puzel@novell.com diff --git a/cmake.spec b/cmake.spec index 0be638e..d152366 100644 --- a/cmake.spec +++ b/cmake.spec @@ -19,12 +19,12 @@ Name: cmake -Version: 2.8.4 +Version: 2.8.5 Release: 1 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz Patch4: cmake-disable-builtin-chrpath.diff # Should appear in cmake-2.8.3 Summary: Cross-platform, open-source make system