From 2273177e808ed808197103d3632021032e283bf4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 21 Feb 2012 15:27:33 -0700 Subject: [PATCH 01/10] Strip CMAKE_INSTALL_LIBDIR and others from %cmake macro (bug 795542) --- cmake.spec | 5 ++++- macros.cmake | 8 -------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cmake.spec b/cmake.spec index c33cc99..ebb5fd4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ Name: cmake Version: 2.8.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -160,6 +160,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Tue Feb 21 2012 Orion Poplawski - 2.8.7-5 +- Strip CMAKE_INSTALL_LIBDIR and others from %%cmake macro (bug 795542) + * Thu Jan 26 2012 Tomas Bzatek - 2.8.7-4 - Rebuilt for new libarchive diff --git a/macros.cmake b/macros.cmake index cc4df56..69f4b5e 100644 --- a/macros.cmake +++ b/macros.cmake @@ -14,12 +14,4 @@ %__cmake \\\ -DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ - -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ - -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ - -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ - -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -%if "%{?_lib}" == "lib64" \ - %{?_cmake_lib_suffix64} \\\ -%endif \ -DBUILD_SHARED_LIBS:BOOL=ON From b3da378d4ff7e622c51db8e3d1868035ff2ccff2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 21 Feb 2012 16:11:17 -0700 Subject: [PATCH 02/10] Just strip CMAKE_INSTALL_LIBDIR from %cmake macro --- cmake.spec | 5 ++++- macros.cmake | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index ebb5fd4..be43655 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ Name: cmake Version: 2.8.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -160,6 +160,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Tue Feb 21 2012 Orion Poplawski - 2.8.7-6 +- Just strip CMAKE_INSTALL_LIBDIR from %%cmake macro + * Tue Feb 21 2012 Orion Poplawski - 2.8.7-5 - Strip CMAKE_INSTALL_LIBDIR and others from %%cmake macro (bug 795542) diff --git a/macros.cmake b/macros.cmake index 69f4b5e..2592371 100644 --- a/macros.cmake +++ b/macros.cmake @@ -14,4 +14,11 @@ %__cmake \\\ -DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ +%if "%{?_lib}" == "lib64" \ + %{?_cmake_lib_suffix64} \\\ +%endif \ -DBUILD_SHARED_LIBS:BOOL=ON From cab065983ed60bb6606eb254deab8687d10d51dc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 23 Mar 2012 10:58:45 -0600 Subject: [PATCH 03/10] Update to 2.8.8 RC 1 --- .gitignore | 1 + cmake.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 428c885..f0b614f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.7-rc1.tar.gz /cmake-2.8.7-rc2.tar.gz /cmake-2.8.7.tar.gz +/cmake-2.8.8-rc1.tar.gz diff --git a/cmake.spec b/cmake.spec index be43655..ad3069c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver %{nil} +%define rcver -rc1 Name: cmake -Version: 2.8.7 -Release: 6%{?dist} +Version: 2.8.8 +Release: 0.1.rc1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -160,6 +160,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Fri Mar 23 2012 Orion Poplawski - 2.8.8-0.1.rc1 +- Update to 2.8.8 RC 1 + * Tue Feb 21 2012 Orion Poplawski - 2.8.7-6 - Just strip CMAKE_INSTALL_LIBDIR from %%cmake macro diff --git a/sources b/sources index 477c70c..21200c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1b237aeaed880f65dec9c20602452f6 cmake-2.8.7.tar.gz +c5f9c1cebc884827fb346eee7ab56af7 cmake-2.8.8-rc1.tar.gz From ca74f7116c2a0747a2936c666f4bb1c272ed9d97 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 30 Mar 2012 13:14:37 +0200 Subject: [PATCH 04/10] Project nits that RHEL review yielded - escape a macro in a comment - fix a typo in description - mark documentation with %doc --- cmake.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index ad3069c..4173630 100644 --- a/cmake.spec +++ b/cmake.spec @@ -3,7 +3,7 @@ %bcond_with bootstrap # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui -# Set to RC version if building RC, else %{nil} +# Set to RC version if building RC, else %%{nil} %define rcver -rc1 Name: cmake @@ -43,7 +43,7 @@ CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice. CMake is quite sophisticated: it is possible -to support complex environments requiring system configuration, pre-processor +to support complex environments requiring system configuration, preprocessor generation, code generation, and template instantiation. @@ -124,7 +124,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/rpm/macros.cmake -%{_datadir}/doc/%{name}-%{version}/ +%doc %{_datadir}/doc/%{name}-%{version}/ %if %{with gui} %exclude %{_datadir}/doc/%{name}-%{version}/cmake-gui.* %endif From 5f4f466a0339088b7b36e1560d8699905aa30dca Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 3 Apr 2012 15:00:48 -0600 Subject: [PATCH 05/10] - Use %{_docdir} - Don't escape %%{nil} in comment for clarity --- cmake.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake.spec b/cmake.spec index 4173630..9fcf4d7 100644 --- a/cmake.spec +++ b/cmake.spec @@ -3,7 +3,7 @@ %bcond_with bootstrap # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui -# Set to RC version if building RC, else %%{nil} +# Set to RC version if building RC, else %{nil} %define rcver -rc1 Name: cmake @@ -80,7 +80,7 @@ pushd build make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT/%{_datadir}/%{name}/Modules -type f | xargs chmod -x popd -cp -a Example $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/ +cp -a Example $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ # RPM macros @@ -124,9 +124,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/rpm/macros.cmake -%doc %{_datadir}/doc/%{name}-%{version}/ +%{_docdir}/%{name}-%{version}/ %if %{with gui} -%exclude %{_datadir}/doc/%{name}-%{version}/cmake-gui.* +%exclude %{_docdir}/doc/%{name}-%{version}/cmake-gui.* %endif %{_bindir}/ccmake %{_bindir}/cmake @@ -150,7 +150,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %if %{with gui} %files gui %defattr(-,root,root,-) -%{_datadir}/doc/%{name}-%{version}/cmake-gui.* +%{_docdir}/%{name}-%{version}/cmake-gui.* %{_bindir}/cmake-gui %{_datadir}/applications/CMake.desktop %{_datadir}/mime/packages/cmakecache.xml From 04165732ed79f71d2a7ddac7a13ec6892d1f1565 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Apr 2012 16:34:43 -0600 Subject: [PATCH 06/10] Update to 2.8.8 RC 2 --- .gitignore | 1 + cmake.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f0b614f..2386ebd 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.7-rc2.tar.gz /cmake-2.8.7.tar.gz /cmake-2.8.8-rc1.tar.gz +/cmake-2.8.8-rc2.tar.gz diff --git a/cmake.spec b/cmake.spec index 9fcf4d7..cf2ba0d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver -rc1 +%define rcver -rc2 Name: cmake Version: 2.8.8 -Release: 0.1.rc1%{?dist} +Release: 0.2.rc2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -160,6 +160,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Mon Apr 9 2012 Orion Poplawski - 2.8.8-0.2.rc2 +- Update to 2.8.8 RC 2 + * Fri Mar 23 2012 Orion Poplawski - 2.8.8-0.1.rc1 - Update to 2.8.8 RC 1 diff --git a/sources b/sources index 21200c6..c9e2884 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5f9c1cebc884827fb346eee7ab56af7 cmake-2.8.8-rc1.tar.gz +0afeb7aca05f48048fe7a520e21d52a7 cmake-2.8.8-rc2.tar.gz From 8960a49bdbb6ef6fa526aa9165a5019e569a12c0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 13 Apr 2012 21:52:58 -0600 Subject: [PATCH 07/10] Add upstream patch to set PKG_CONFIG_FOUND (bug #812188) --- cmake-pkgconfig.patch | 55 +++++++++++++++++++++++++++++++++++++++++++ cmake.spec | 9 ++++++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 cmake-pkgconfig.patch diff --git a/cmake-pkgconfig.patch b/cmake-pkgconfig.patch new file mode 100644 index 0000000..ded5a92 --- /dev/null +++ b/cmake-pkgconfig.patch @@ -0,0 +1,55 @@ +commit 8bd38d7070b1cec6ed27b71d0359f1b2ccd1e1c8 +Author: Rolf Eike Beer +Date: Fri Apr 13 08:50:49 2012 +0200 + + FindPkgConfig.cmake: fix documented output variable no longer set (#13125) + + The real fix is from Yury G. Kudryashov while I added the surrounding cleanups. + +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index 5d93ab1..30aab45 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -13,11 +13,10 @@ + # When the 'QUIET' argument is set, no status messages will be printed. + # + # It sets the following variables: +-# PKG_CONFIG_FOUND ... true if pkg-config works on the system ++# PKG_CONFIG_FOUND ... if pkg-config executable was found + # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program + # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found + # (since CMake 2.8.8) +-# PKG_CONFIG_FOUND ... if pkg-config executable was found + # + # For the following variables two sets of values exist; first one is the + # common one and has the given PREFIX. The second set contains flags +@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig + REQUIRED_VARS PKG_CONFIG_EXECUTABLE + VERSION_VAR PKG_CONFIG_VERSION_STRING) + ++# This is needed because the module name is "PkgConfig" but the name of ++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically ++# handled by FPHSA. ++set(PKG_CONFIG_FOUND "${PkgConfig_FOUND}") ++ + # Unsets the given variables + macro(_pkgconfig_unset var) + set(${var} "" CACHE INTERNAL "") +diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +index 6604208..fc65e58 100644 +--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt ++++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +@@ -71,7 +71,7 @@ endmacro(check_version_string) + # reported. + + foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL +- JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB) ++ JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB) + check_version_string(${VTEST} ${VTEST}_VERSION_STRING) + endforeach(VTEST) + +@@ -82,4 +82,3 @@ endforeach(VTEST) + + check_version_string(PYTHONINTERP PYTHON_VERSION_STRING) + check_version_string(SUBVERSION Subversion_VERSION_SVN) +-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING) diff --git a/cmake.spec b/cmake.spec index cf2ba0d..91070d9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ Name: cmake Version: 2.8.8 -Release: 0.2.rc2%{?dist} +Release: 0.3.rc2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -18,6 +18,9 @@ Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source2: macros.cmake # Patch to find DCMTK in Fedora (bug #720140) Patch0: cmake-dcmtk.patch +# Upstream patch to fix setting PKG_CONFIG_FOUND (bug #812188) +Patch1: cmake-pkgconfig.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +62,7 @@ The %{name}-gui package contains the Qt based GUI for CMake. %prep %setup -q -n %{name}-%{version}%{?rcver} %patch0 -p1 -b .dcmtk +%patch1 -p1 -b .pkgconfig %build @@ -160,6 +164,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Fri Apr 13 2012 Orion Poplawski - 2.8.8-0.3.rc2 +- Add upstream patch to set PKG_CONFIG_FOUND (bug #812188) + * Mon Apr 9 2012 Orion Poplawski - 2.8.8-0.2.rc2 - Update to 2.8.8 RC 2 From 564f6003a0bd665b942ab5ae5a5706e194e334de Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 14 Apr 2012 15:26:09 -0500 Subject: [PATCH 08/10] minor fixes --- cmake.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 91070d9..4bc1551 100644 --- a/cmake.spec +++ b/cmake.spec @@ -108,6 +108,7 @@ pushd build #CMake.HTML currently requires internet access #CTestTestUpload requires internet access bin/ctest -V -E ModuleNotices -E CMake.HTML -E CTestTestUpload %{?_smp_mflags} +popd %clean @@ -130,7 +131,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %config(noreplace) %{_sysconfdir}/rpm/macros.cmake %{_docdir}/%{name}-%{version}/ %if %{with gui} -%exclude %{_docdir}/doc/%{name}-%{version}/cmake-gui.* +%exclude %{_docdir}/%{name}-%{version}/cmake-gui.* %endif %{_bindir}/ccmake %{_bindir}/cmake From bee44432a9d141af218aa3bfd0a3ae4243142074 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 14 Apr 2012 16:31:01 -0500 Subject: [PATCH 09/10] adjust pkgconfig patch (#812188) --- cmake-pkgconfig.patch | 2 +- cmake.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake-pkgconfig.patch b/cmake-pkgconfig.patch index ded5a92..5dfea69 100644 --- a/cmake-pkgconfig.patch +++ b/cmake-pkgconfig.patch @@ -30,7 +30,7 @@ index 5d93ab1..30aab45 100644 +# This is needed because the module name is "PkgConfig" but the name of +# this variable has always been PKG_CONFIG_FOUND so this isn't automatically +# handled by FPHSA. -+set(PKG_CONFIG_FOUND "${PkgConfig_FOUND}") ++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}") + # Unsets the given variables macro(_pkgconfig_unset var) diff --git a/cmake.spec b/cmake.spec index 4bc1551..f79dda3 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ Name: cmake Version: 2.8.8 -Release: 0.3.rc2%{?dist} +Release: 0.4.rc2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -18,7 +18,7 @@ Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source2: macros.cmake # Patch to find DCMTK in Fedora (bug #720140) Patch0: cmake-dcmtk.patch -# Upstream patch to fix setting PKG_CONFIG_FOUND (bug #812188) +# (modified) Upstream patch to fix setting PKG_CONFIG_FOUND (bug #812188) Patch1: cmake-pkgconfig.patch @@ -165,6 +165,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Sat Apr 14 2012 Rex Dieter 2.8.8-0.4.rc2 +- adjust pkgconfig patch (#812188) + * Fri Apr 13 2012 Orion Poplawski - 2.8.8-0.3.rc2 - Add upstream patch to set PKG_CONFIG_FOUND (bug #812188) From 4333cee6b4b3de31d4ab31f32a4f116933e062c2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 19 Apr 2012 14:12:55 -0600 Subject: [PATCH 10/10] Update to 2.8.8 final --- .gitignore | 1 + cmake.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2386ebd..81daa6c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.7.tar.gz /cmake-2.8.8-rc1.tar.gz /cmake-2.8.8-rc2.tar.gz +/cmake-2.8.8.tar.gz diff --git a/cmake.spec b/cmake.spec index f79dda3..29fa2c6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver -rc2 +%define rcver %{nil} Name: cmake Version: 2.8.8 -Release: 0.4.rc2%{?dist} +Release: 1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -165,6 +165,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Thu Apr 19 2012 Orion Poplawski - 2.8.8-1 +- Update to 2.8.8 final + * Sat Apr 14 2012 Rex Dieter 2.8.8-0.4.rc2 - adjust pkgconfig patch (#812188) diff --git a/sources b/sources index c9e2884..d4a3eb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0afeb7aca05f48048fe7a520e21d52a7 cmake-2.8.8-rc2.tar.gz +ba74b22c788a0c8547976b880cd02b17 cmake-2.8.8.tar.gz