diff --git a/cmake-gui.changes b/cmake-gui.changes index 56b14d9..09c9ba6 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 + +- 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..504b788 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -30,10 +30,12 @@ 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) Requires: cmake +Recommends: cmake-man BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1320 BuildRequires: pkgconfig(Qt5Widgets) @@ -45,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} @@ -57,6 +66,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 @@ -87,4 +97,9 @@ rm -rf %{buildroot}%{_docdir}/cmake %{_datadir}/mime/packages/cmakecache.xml %{_datadir}/pixmaps/CMakeSetup32.png +%files -n cmake-man +%defattr(-,root,root) +%{_mandir}/man7/* +%{_mandir}/man1/* + %changelog 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..2fbad5c 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 + +- Install manpages. Patch idea by Christoph Grüninger. + +------------------------------------------------------------------- +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 + +- Change java libarch to ppc64 for ppc64le, and keep ppc64le for + backward compatibility (cmake-ppc64le-jni.patch) + ------------------------------------------------------------------- Sat Jun 21 10:40:48 UTC 2014 - tchvatal@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 \ diff --git a/cmake.spec b/cmake.spec index 736e912..fd7cf9e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -27,12 +27,15 @@ 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 BuildRequires: ncurses-devel BuildRequires: zlib-devel Requires: make +Recommends: cmake-mans BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1110 BuildRequires: libarchive-devel @@ -45,6 +48,7 @@ CMake is a cross-platform, open-source build system %prep %setup -q %patch2 -p1 +%patch3 -p1 %build export CXXFLAGS="%{optflags}"