From ba5c0f0076be1c0f44a4bb3f1563248e44a48fb1c1e31f8b1c7f08cb8a137c80 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 6 Mar 2014 09:36:53 +0000 Subject: [PATCH] Accepting request 224366 from KDE:Unstable:Frameworks Update to 3.0.0~rc1 (i'm guessing this one will need a staging for sure ;-) OBS-URL: https://build.opensuse.org/request/show/224366 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=141 --- cmake-2.8.12.2.tar.gz | 3 --- cmake-3.0.0-rc1.tar.gz | 3 +++ cmake-fix-ruby-test.patch | 6 ++--- cmake-gui.changes | 14 ++++++++++++ cmake-gui.spec | 11 +++++---- cmake-jni-ppc64le.patch | 13 ----------- cmake.changes | 14 ++++++++++++ cmake.spec | 27 +++++----------------- fix-check-for-freetype251.patch | 40 --------------------------------- 9 files changed, 45 insertions(+), 86 deletions(-) delete mode 100644 cmake-2.8.12.2.tar.gz create mode 100644 cmake-3.0.0-rc1.tar.gz delete mode 100644 cmake-jni-ppc64le.patch delete mode 100644 fix-check-for-freetype251.patch diff --git a/cmake-2.8.12.2.tar.gz b/cmake-2.8.12.2.tar.gz deleted file mode 100644 index 95b2e98..0000000 --- a/cmake-2.8.12.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e -size 6068231 diff --git a/cmake-3.0.0-rc1.tar.gz b/cmake-3.0.0-rc1.tar.gz new file mode 100644 index 0000000..a595d57 --- /dev/null +++ b/cmake-3.0.0-rc1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f13ac75c2440cb81aa1c193cf4f3898092f72a0c2d43b7b02f8476a8e5e1d1e6 +size 5485992 diff --git a/cmake-fix-ruby-test.patch b/cmake-fix-ruby-test.patch index d84529a..cf2421d 100644 --- a/cmake-fix-ruby-test.patch +++ b/cmake-fix-ruby-test.patch @@ -1,6 +1,6 @@ ---- Modules/FindRuby.cmake.orig 2013-05-18 15:29:53.805033064 +0200 -+++ Modules/FindRuby.cmake 2013-05-18 15:30:21.605683563 +0200 -@@ -102,7 +102,7 @@ +--- cmake-3.0.0-rc1.orig/Modules/FindRuby.cmake 2014-02-26 16:41:21.000000000 +0100 ++++ cmake-3.0.0-rc1/Modules/FindRuby.cmake 2014-03-01 02:17:02.602227025 +0100 +@@ -113,7 +113,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) # vendor_ruby available ? diff --git a/cmake-gui.changes b/cmake-gui.changes index 9fe93a6..02c6b02 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Mar 1 00:22:54 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 3.0.0~rc1 + * First release candidate of 3.0.0 release, for more details, please + see http://www.cmake.org/cmake/help/v3.0/release/3.0.0.html +- Drop cmake-jni-ppc64le.patch and fix-check-for-freetype251.patch, + merged upstream +- Added pkgconfig(bzip2) BuildRequires for bzip2 support +- Rebase cmake-fix-ruby-test.patch to current release +- All documentation is now available in rst format, and in + /usr/share/cmake/Help directory (including former man files), + see mentioned online changelog + ------------------------------------------------------------------- Tue Jan 28 19:46:59 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 5341310..4ec63be 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -17,10 +17,11 @@ Name: cmake-gui -Version: 2.8.12.2 +Version: 3.0.0~rc1 Release: 0 +%define rversion 3.0.0-rc1 Url: http://www.cmake.org/ -Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz +Source0: http://www.cmake.org/files/v3.0/cmake-%{rversion}.tar.gz Summary: CMake graphical user interface License: BSD-3-Clause Group: Development/Tools/Building @@ -40,6 +41,7 @@ BuildRequires: libqt4-devel BuildRequires: openssl-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel +BuildRequires: pkgconfig(bzip2) Requires: cmake @@ -48,7 +50,7 @@ This is a Graphical User Interface for CMake, a cross-platform, open-source make system. %prep -%setup -q -n cmake-%{version} +%setup -q -n cmake-%{rversion} %build EXTRA_FLAGS="--qt-gui" @@ -81,8 +83,6 @@ rm -rf %{buildroot}/usr/bin/{cpack,cmake,ctest} rm -rf %{buildroot}/usr/share/cmake rm -rf %{buildroot}/usr/share/aclocal/cmake.m4 rm -rf %{buildroot}/usr/share/doc/packages/cmake -rm -rf %{buildroot}/usr/share/man/man1/{cmake,cmakecommands,cmakecompat}.1 -rm -rf %{buildroot}/usr/share/man/man1/{cmakemodules,cmakepolicies,cmakeprops,cmakevars,cpack,ctest}.1 %files %defattr(-,root,root) @@ -90,6 +90,5 @@ rm -rf %{buildroot}/usr/share/man/man1/{cmakemodules,cmakepolicies,cmakeprops,cm %{_datadir}/applications/CMake.desktop %{_datadir}/mime/packages/cmakecache.xml %{_datadir}/pixmaps/CMakeSetup32.png -%doc %{_mandir}/man1/cmake-gui.1.* %changelog diff --git a/cmake-jni-ppc64le.patch b/cmake-jni-ppc64le.patch deleted file mode 100644 index 90f110e..0000000 --- a/cmake-jni-ppc64le.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: cmake-2.8.12.1/Modules/FindJNI.cmake -=================================================================== ---- cmake-2.8.12.1.orig/Modules/FindJNI.cmake -+++ cmake-2.8.12.1/Modules/FindJNI.cmake -@@ -45,6 +45,8 @@ macro(java_append_library_directories _v - # mips* machines are bi-endian mostly so processor does not tell - # endianess of the underlying system. - set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb") -+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le") -+ set(_java_libarch "ppc64le") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") - set(_java_libarch "ppc64") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") diff --git a/cmake.changes b/cmake.changes index d3a48c1..8d1c61d 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Mar 1 00:22:54 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 3.0.0~rc1 + * First release candidate of 3.0.0 release, for more details, please + see http://www.cmake.org/cmake/help/v3.0/release/3.0.0.html +- Drop cmake-jni-ppc64le.patch and fix-check-for-freetype251.patch, + merged upstream +- Added pkgconfig(bzip2) BuildRequires for bzip2 support +- Rebase cmake-fix-ruby-test.patch to current release +- All documentation is now available in rst format, and in + /usr/share/cmake/Help directory (including former man files), + see mentioned online changelog + ------------------------------------------------------------------- Tue Feb 18 00:30:04 UTC 2014 - dvaleev@suse.com diff --git a/cmake.spec b/cmake.spec index ea731d3..35673db 100644 --- a/cmake.spec +++ b/cmake.spec @@ -17,17 +17,14 @@ Name: cmake -Version: 2.8.12.2 +Version: 3.0.0~rc1 Release: 0 +%define rversion 3.0.0-rc1 Url: http://www.cmake.org/ -Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz +Source0: http://www.cmake.org/files/v3.0/%{name}-%{rversion}.tar.gz Source1: cmake.macros Source2: opensuse_rules.cmake Patch2: cmake-fix-ruby-test.patch -# PATCH-FIX-UPSTREAM fix-check-for-freetype251.patch -- http://www.cmake.org/Bug/view.php?id=13959, http://www.cmake.org/Bug/view.php?id=14601 -Patch3: fix-check-for-freetype251.patch -# PATCH-FIX-UPSTREAM cmake-jni-ppc64le.patch -- https://github.com/Kitware/CMake/pull/90 -Patch4: cmake-jni-ppc64le.patch Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building @@ -48,6 +45,7 @@ BuildRequires: gcc-c++ BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig(bzip2) Requires: make @@ -55,10 +53,8 @@ Requires: make CMake is a cross-platform, open-source make system %prep -%setup -q -n %{name}-%{version} -%patch2 -%patch3 -p1 -%patch4 -p1 +%setup -q -n %{name}-%{rversion} +%patch2 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" @@ -85,7 +81,6 @@ make VERBOSE=1 %{?_smp_mflags} make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_libdir}/cmake find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644 -cp ChangeLog.manual %{buildroot}/usr/share/doc/packages/%{name}/Changelog # rpm macros install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.cmake # buildrules @@ -109,15 +104,5 @@ sed -i \ %{_libdir}/cmake %{_datadir}/aclocal/cmake.m4 %doc %{_datadir}/doc/packages/%{name} -%doc %{_mandir}/man1/cmakepolicies.1.* -%doc %{_mandir}/man1/cmake.1.* -%doc %{_mandir}/man1/ctest.1.* -%doc %{_mandir}/man1/ccmake.1.* -%doc %{_mandir}/man1/cmakecommands.1.* -%doc %{_mandir}/man1/cmakecompat.1.* -%doc %{_mandir}/man1/cmakemodules.1.* -%doc %{_mandir}/man1/cmakeprops.1.* -%doc %{_mandir}/man1/cmakevars.1.* -%doc %{_mandir}/man1/cpack.1.* %changelog diff --git a/fix-check-for-freetype251.patch b/fix-check-for-freetype251.patch deleted file mode 100644 index 7f0c74b..0000000 --- a/fix-check-for-freetype251.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur cmake-2.8.12.1.orig/Modules/FindFreetype.cmake cmake-2.8.12.1/Modules/FindFreetype.cmake ---- cmake-2.8.12.1.orig/Modules/FindFreetype.cmake 2013-11-05 20:07:22.000000000 +0100 -+++ cmake-2.8.12.1/Modules/FindFreetype.cmake 2013-12-09 01:12:02.967856671 +0100 -@@ -70,6 +70,19 @@ - PATH_SUFFIXES include/freetype2 include - ) - -+if(NOT FREETYPE_INCLUDE_DIR_freetype2) -+ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h -+ HINTS -+ ENV FREETYPE_DIR -+ PATHS -+ /usr/X11R6 -+ /usr/local/X11R6 -+ /usr/local/X11 -+ /usr/freeware -+ PATH_SUFFIXES include/freetype2 include -+ ) -+endif() -+ - find_library(FREETYPE_LIBRARY - NAMES freetype libfreetype freetype219 - HINTS -@@ -91,8 +104,14 @@ - endif() - set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") - --if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") -- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str -+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") -+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") -+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") -+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") -+endif() -+ -+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) -+ file(STRINGS "${FREETYPE_H}" freetype_version_str - REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") - - unset(FREETYPE_VERSION_STRING)