From 98b0c1cb6600ed203d72f9251ebca922084fcc77db995aed7085eda4e0a68707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 1 Jul 2014 11:10:57 +0000 Subject: [PATCH 1/6] Accepting request 239140 from home:k0da:ppc - Change java libarch to ppc64 for ppc64le, and keep ppc64le for backward compatibility (make-ppc64le-jni.patch) OBS-URL: https://build.opensuse.org/request/show/239140 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=159 --- cmake-ppc64le-jni.patch | 28 ++++++++++++++++++++++++++++ cmake.changes | 6 ++++++ cmake.spec | 3 +++ 3 files changed, 37 insertions(+) create mode 100644 cmake-ppc64le-jni.patch diff --git a/cmake-ppc64le-jni.patch b/cmake-ppc64le-jni.patch new file mode 100644 index 0000000..e9a7774 --- /dev/null +++ b/cmake-ppc64le-jni.patch @@ -0,0 +1,28 @@ +From 18ac6713e8657cca8fc791bcd581a47a7be6ebce Mon Sep 17 00:00:00 2001 +From: Dinar Valeev +Date: Mon, 30 Jun 2014 18:29:20 +0200 +Subject: [PATCH] FindJNI: search for ppc64 on ppc64le as well + +IcedTea 2.5 have changed libarch for ppc64le to ppc64. Adjust FindJNI +to look for both for backward compatibility. + +Signed-off-by: Dinar Valeev +--- + Modules/FindJNI.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake +index 6a496af..3dcb0d0 100644 +--- a/Modules/FindJNI.cmake ++++ b/Modules/FindJNI.cmake +@@ -55,7 +55,7 @@ macro(java_append_library_directories _var) + # 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") ++ set(_java_libarch "ppc64" "ppc64le") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") + set(_java_libarch "ppc64" "ppc") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") +-- +1.9.3 diff --git a/cmake.changes b/cmake.changes index 986ecb8..52adc5a 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 1 10:52:47 UTC 2014 - dvaleev@suse.com + +- Change java libarch to ppc64 for ppc64le, and keep ppc64le for + backward compatibility (make-ppc64le-jni.patch) + ------------------------------------------------------------------- Sat Jun 21 10:40:48 UTC 2014 - tchvatal@suse.com diff --git a/cmake.spec b/cmake.spec index 736e912..2276b88 100644 --- a/cmake.spec +++ b/cmake.spec @@ -27,6 +27,8 @@ Source0: http://www.cmake.org/files/v3.0/%{name}-%{version}.tar.gz Source1: cmake.macros Source2: opensuse_rules.cmake Patch2: cmake-fix-ruby-test.patch +#PATCH-FIX-UPSTREAM dvaleev@suse.com https://github.com/Kitware/CMake/pull/111.patch +Patch3: cmake-ppc64le-jni.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libexpat-devel @@ -45,6 +47,7 @@ CMake is a cross-platform, open-source build system %prep %setup -q %patch2 -p1 +%patch3 -p1 %build export CXXFLAGS="%{optflags}" From 1e4fbe2b0df1baae1a68619fc0b0863a9dcc8482657f2c571e80b6842ba8f485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 1 Jul 2014 11:17:02 +0000 Subject: [PATCH 2/6] backward compatibility (cmake-ppc64le-jni.patch) OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=160 --- cmake.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.changes b/cmake.changes index 52adc5a..73951db 100644 --- a/cmake.changes +++ b/cmake.changes @@ -2,7 +2,7 @@ Tue Jul 1 10:52:47 UTC 2014 - dvaleev@suse.com - Change java libarch to ppc64 for ppc64le, and keep ppc64le for - backward compatibility (make-ppc64le-jni.patch) + backward compatibility (cmake-ppc64le-jni.patch) ------------------------------------------------------------------- Sat Jun 21 10:40:48 UTC 2014 - tchvatal@suse.com From 19a8bafd89e29bff5eeb8f2ab571228ffb2464c03ced1593eb26f961a7e49315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 2 Jul 2014 08:57:25 +0000 Subject: [PATCH 3/6] Accepting request 239256 from home:sleep_walker:branches:devel:tools:building - reduce number of sed calls in %cmake RPM macro OBS-URL: https://build.opensuse.org/request/show/239256 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=161 --- cmake.changes | 5 +++++ cmake.macros | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake.changes b/cmake.changes index 73951db..78478e7 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 2 08:25:13 UTC 2014 - sleep_walker@suse.cz + +- reduce number of sed calls in %cmake RPM macro + ------------------------------------------------------------------- Tue Jul 1 10:52:47 UTC 2014 - dvaleev@suse.com diff --git a/cmake.macros b/cmake.macros index 60f0c3f..969ee66 100644 --- a/cmake.macros +++ b/cmake.macros @@ -9,10 +9,7 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ find . -name CMakeLists.txt \\\ - -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE.*)/{s/^/#IGNORE /g}' {} + \\\ - -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \\\ - -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX.*)/{s/^/#IGNORE /g}' {} + \\\ - -exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \ + -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\\\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\\\)/{s/^/#IGNORE /}' {} + \ mkdir -p build \ cd build \ %define enable_debug 1 \ From 7e88e30e7ee4cac5cab1d084de0e1ce3c7ba4a6f0345d169c91077ccd9ab5ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 2 Jul 2014 13:04:50 +0000 Subject: [PATCH 4/6] =?UTF-8?q?-=20Install=20manpages.=20Patch=20idea=20by?= =?UTF-8?q?=20Christoph=20Gr=C3=BCninger.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Install manpages. Patch idea by Christoph Grüninger. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=162 --- cmake-gui.changes | 5 +++++ cmake-gui.spec | 5 +++++ cmake.changes | 5 +++++ cmake.spec | 9 +++++++++ 4 files changed, 24 insertions(+) diff --git a/cmake-gui.changes b/cmake-gui.changes index 56b14d9..438ef4b 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 2 13:04:33 UTC 2014 - tchvatal@suse.com + +- Install manpages. Patch idea by Christoph Grüninger. + ------------------------------------------------------------------- Sat Jun 21 12:59:23 UTC 2014 - tchvatal@suse.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 4b2a5a8..0bebbc7 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -30,6 +30,7 @@ BuildRequires: gcc-c++ BuildRequires: libarchive-devel BuildRequires: libexpat-devel BuildRequires: openssl-devel +BuildRequires: python-sphinx BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(bzip2) @@ -57,6 +58,7 @@ export CFLAGS="$CXXFLAGS" --datadir=/share/cmake \ --docdir=/share/doc/packages/cmake \ --mandir=/share/man \ + --sphinx-man \ %if 0%{?suse_version} && !0%{?sles_version} --system-libs \ %else @@ -79,6 +81,8 @@ rm -rf %{buildroot}%{_bindir}/{cpack,cmake,ctest} rm -rf %{buildroot}%{_datadir}/cmake rm -rf %{buildroot}%{_datadir}/aclocal/cmake.m4 rm -rf %{buildroot}%{_docdir}/cmake +rm -rf %{buildroot}%{_mandir}/man7/ +rm -rf %{buildroot}%{_mandir}/man1/{ccmake,cmake,cpack,ctest}.* %files %defattr(-,root,root) @@ -86,5 +90,6 @@ rm -rf %{buildroot}%{_docdir}/cmake %{_datadir}/applications/CMake.desktop %{_datadir}/mime/packages/cmakecache.xml %{_datadir}/pixmaps/CMakeSetup32.png +%{_mandir}/man1/cmake-gui.1.* %changelog diff --git a/cmake.changes b/cmake.changes index 78478e7..e9fe1e6 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 2 13:03:54 UTC 2014 - tchvatal@suse.com + +- Install manpages. Patch idea by Christoph Grüninger. + ------------------------------------------------------------------- Wed Jul 2 08:25:13 UTC 2014 - sleep_walker@suse.cz diff --git a/cmake.spec b/cmake.spec index 2276b88..4ae4a7f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -33,6 +33,7 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libexpat-devel BuildRequires: ncurses-devel +BuildRequires: python-sphinx BuildRequires: zlib-devel Requires: make BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,6 +58,7 @@ export CFLAGS="$CXXFLAGS" --datadir=/share/%{name} \ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ + --sphinx-man \ --system-libs \ --no-system-curl \ %if 0%{?suse_version} <= 1110 @@ -78,6 +80,8 @@ install -m644 %{SOURCE2} -D %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules sed -i \ -e 's:OPTFLAGS:%{optflags}:g' \ %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake +# manpage for gui is in different spec +rm %{buildroot}%{_mandir}/man1/cmake-gui.* %fdupes %{buildroot}%{_datadir}/cmake @@ -93,5 +97,10 @@ sed -i \ %dir %{_datadir}/aclocal %{_datadir}/aclocal/cmake.m4 %doc %{_docdir}/%{name} +%{_mandir}/man1/ccmake.1.* +%{_mandir}/man1/cmake.1.* +%{_mandir}/man1/cpack.1.* +%{_mandir}/man1/ctest.1.* +%{_mandir}/man7/*.7.* %changelog From 1e7bc5e598442ef6a8fe93bcd70c79f3a0d99967f52e9d47088de66ae53fd9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 3 Jul 2014 08:00:27 +0000 Subject: [PATCH 5/6] - Provide cmake-mans subpackage and use it to avoid buildcycle - Move manpages building to -gui part to avoid buildcycle. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=163 --- cmake-gui.changes | 5 +++++ cmake-gui.spec | 16 +++++++++++++--- cmake.changes | 5 +++++ cmake.spec | 3 +-- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index 438ef4b..09c9ba6 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 3 07:57:47 UTC 2014 - tchvatal@suse.com + +- Provide cmake-mans subpackage and use it to avoid buildcycle + ------------------------------------------------------------------- Wed Jul 2 13:04:33 UTC 2014 - tchvatal@suse.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 0bebbc7..504b788 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -35,6 +35,7 @@ BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(bzip2) Requires: cmake +Recommends: cmake-man BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1320 BuildRequires: pkgconfig(Qt5Widgets) @@ -46,6 +47,13 @@ BuildRequires: libqt4-devel This is a Graphical User Interface for CMake, a cross-platform, open-source build system. +%package -n cmake-man +Summary: Cross-platform, open-source make system - manual pages +Group: Development/Tools/Building + +%description -n cmake-man +Manual pages for cmake, Cross-platform, open-source make system + %prep %setup -q -n cmake-%{version} @@ -81,8 +89,6 @@ rm -rf %{buildroot}%{_bindir}/{cpack,cmake,ctest} rm -rf %{buildroot}%{_datadir}/cmake rm -rf %{buildroot}%{_datadir}/aclocal/cmake.m4 rm -rf %{buildroot}%{_docdir}/cmake -rm -rf %{buildroot}%{_mandir}/man7/ -rm -rf %{buildroot}%{_mandir}/man1/{ccmake,cmake,cpack,ctest}.* %files %defattr(-,root,root) @@ -90,6 +96,10 @@ rm -rf %{buildroot}%{_mandir}/man1/{ccmake,cmake,cpack,ctest}.* %{_datadir}/applications/CMake.desktop %{_datadir}/mime/packages/cmakecache.xml %{_datadir}/pixmaps/CMakeSetup32.png -%{_mandir}/man1/cmake-gui.1.* + +%files -n cmake-man +%defattr(-,root,root) +%{_mandir}/man7/* +%{_mandir}/man1/* %changelog diff --git a/cmake.changes b/cmake.changes index e9fe1e6..2fbad5c 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 3 07:57:26 UTC 2014 - tchvatal@suse.com + +- Move manpages building to -gui part to avoid buildcycle. + ------------------------------------------------------------------- Wed Jul 2 13:03:54 UTC 2014 - tchvatal@suse.com diff --git a/cmake.spec b/cmake.spec index 4ae4a7f..227fe8e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -33,9 +33,9 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libexpat-devel BuildRequires: ncurses-devel -BuildRequires: python-sphinx BuildRequires: zlib-devel Requires: make +Recommends: cmake-mans BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1110 BuildRequires: libarchive-devel @@ -58,7 +58,6 @@ export CFLAGS="$CXXFLAGS" --datadir=/share/%{name} \ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ - --sphinx-man \ --system-libs \ --no-system-curl \ %if 0%{?suse_version} <= 1110 From d548a18ebf61bd04372091b51a1638495cb06a2c7fb616d4fa18137fb706d314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 3 Jul 2014 08:01:08 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=164 --- cmake.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cmake.spec b/cmake.spec index 227fe8e..fd7cf9e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -79,8 +79,6 @@ install -m644 %{SOURCE2} -D %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules sed -i \ -e 's:OPTFLAGS:%{optflags}:g' \ %{buildroot}%{_datadir}/cmake/Modules/opensuse_rules.cmake -# manpage for gui is in different spec -rm %{buildroot}%{_mandir}/man1/cmake-gui.* %fdupes %{buildroot}%{_datadir}/cmake @@ -96,10 +94,5 @@ rm %{buildroot}%{_mandir}/man1/cmake-gui.* %dir %{_datadir}/aclocal %{_datadir}/aclocal/cmake.m4 %doc %{_docdir}/%{name} -%{_mandir}/man1/ccmake.1.* -%{_mandir}/man1/cmake.1.* -%{_mandir}/man1/cpack.1.* -%{_mandir}/man1/ctest.1.* -%{_mandir}/man7/*.7.* %changelog