From 99ab0893e4fa063f3a1535a9d5f6bc65c58bad87 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 17 Apr 2008 16:46:47 +0000 Subject: [PATCH] Update to 2.4.8, sync to F-9 --- .cvsignore | 2 +- cmake-2.4.6-soexe.patch | 121 ---------------------------------------- cmake-init-fedora | 2 - cmake.spec | 66 ++++++++++++++++++---- sources | 2 +- 5 files changed, 56 insertions(+), 137 deletions(-) delete mode 100644 cmake-2.4.6-soexe.patch delete mode 100644 cmake-init-fedora diff --git a/.cvsignore b/.cvsignore index 074ca83..dcdb5f8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cmake-2.4.6.tar.gz +cmake-2.4.8.tar.gz diff --git a/cmake-2.4.6-soexe.patch b/cmake-2.4.6-soexe.patch deleted file mode 100644 index 057c03c..0000000 --- a/cmake-2.4.6-soexe.patch +++ /dev/null @@ -1,121 +0,0 @@ -Index: CMake/Source/cmFileCommand.cxx -=================================================================== -RCS file: /cvsroot/CMake/CMake/Source/cmFileCommand.cxx,v -retrieving revision 1.75 -retrieving revision 1.76 -diff -u -r1.75 -r1.76 ---- CMake/Source/cmFileCommand.cxx 12 Mar 2007 18:15:25 -0000 1.75 -+++ CMake/Source/cmFileCommand.cxx 10 Apr 2007 15:22:15 -0000 1.76 -@@ -1184,6 +1184,9 @@ - } - } - -+ // Choose a default for shared library permissions. -+ bool install_so_no_exe = this->Makefile->IsOn("CMAKE_INSTALL_SO_NO_EXE"); -+ - // If file permissions were not specified set default permissions - // for this target type. - if(!use_given_permissions_file && !use_source_permissions) -@@ -1192,15 +1195,16 @@ - { - case cmTarget::SHARED_LIBRARY: - case cmTarget::MODULE_LIBRARY: --#if defined(__linux__) -- // Use read/write permissions. -- permissions_file = 0; -- permissions_file |= mode_owner_read; -- permissions_file |= mode_owner_write; -- permissions_file |= mode_group_read; -- permissions_file |= mode_world_read; -- break; --#endif -+ if(install_so_no_exe) -+ { -+ // Use read/write permissions. -+ permissions_file = 0; -+ permissions_file |= mode_owner_read; -+ permissions_file |= mode_owner_write; -+ permissions_file |= mode_group_read; -+ permissions_file |= mode_world_read; -+ break; -+ } - case cmTarget::EXECUTABLE: - case cmTarget::INSTALL_PROGRAMS: - // Use read/write/executable permissions. -Index: CMake/Source/cmLocalGenerator.cxx -=================================================================== -RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v -retrieving revision 1.207 -retrieving revision 1.208 -diff -u -r1.207 -r1.208 ---- CMake/Source/cmLocalGenerator.cxx 30 Mar 2007 14:53:02 -0000 1.207 -+++ CMake/Source/cmLocalGenerator.cxx 10 Apr 2007 15:22:15 -0000 1.208 -@@ -393,6 +393,18 @@ - "ENDIF(NOT CMAKE_INSTALL_COMPONENT)\n" - "\n"; - -+ // Copy user-specified install options to the install code. -+ if(const char* so_no_exe = -+ this->Makefile->GetDefinition("CMAKE_INSTALL_SO_NO_EXE")) -+ { -+ fout << -+ "# Install shared libraries without execute permission?\n" -+ "IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)\n" -+ " SET(CMAKE_INSTALL_SO_NO_EXE \"" << so_no_exe << "\")\n" -+ "ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)\n" -+ "\n"; -+ } -+ - // Ask each install generator to write its code. - std::vector const& installers = - this->Makefile->GetInstallGenerators(); -Index: CMake/Modules/Platform/Linux.cmake -=================================================================== -RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux.cmake,v -retrieving revision 1.11 -retrieving revision 1.12 -diff -u -r1.11 -r1.12 ---- CMake/Modules/Platform/Linux.cmake 15 Sep 2006 18:08:39 -0000 1.11 -+++ CMake/Modules/Platform/Linux.cmake 10 Apr 2007 15:22:15 -0000 1.12 -@@ -18,4 +18,41 @@ - SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic") - ENDFOREACH(type) - -+# Debian policy requires that shared libraries be installed without -+# executable permission. Fedora policy requires that shared libraries -+# be installed with the executable permission. Since the native tools -+# create shared libraries with execute permission in the first place a -+# reasonable policy seems to be to install with execute permission by -+# default. In order to support debian packages we provide an option -+# here. The option default is based on the current distribution, but -+# packagers can set it explicitly on the command line. -+IF(DEFINED CMAKE_INSTALL_SO_NO_EXE) -+ # Store the decision variable in the cache. This preserves any -+ # setting the user provides on the command line. -+ SET(CMAKE_INSTALL_SO_NO_EXE "${CMAKE_INSTALL_SO_NO_EXE}" CACHE INTERNAL -+ "Install .so files without execute permission.") -+ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE) -+ # Detect the linux distribution. -+ SET(CMAKE_LINUX_DISTRO) -+ IF(EXISTS "/proc/version") -+ FILE(READ "/proc/version" CMAKE_LINUX_DISTRO) -+ ENDIF(EXISTS "/proc/version") -+ -+ # List the distributions that require shared libraries to not have -+ # execute permission. -+ SET(CMAKE_INSTALL_SO_NO_EXE_DISTRO "(Debian|Ubuntu)") -+ -+ # Store the decision variable as an internal cache entry to avoid -+ # checking the platform every time. This option is advanced enough -+ # that only package maintainers should need to adjust it. They are -+ # capable of providing a setting on the command line. -+ IF("${CMAKE_LINUX_DISTRO}" MATCHES "${CMAKE_INSTALL_SO_NO_EXE_DISTRO}") -+ SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL -+ "Install .so files without execute permission.") -+ ELSE("${CMAKE_LINUX_DISTRO}" MATCHES "${CMAKE_INSTALL_SO_NO_EXE_DISTRO}") -+ SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL -+ "Install .so files without execute permission.") -+ ENDIF("${CMAKE_LINUX_DISTRO}" MATCHES "${CMAKE_INSTALL_SO_NO_EXE_DISTRO}") -+ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE) -+ - INCLUDE(Platform/UnixPaths) diff --git a/cmake-init-fedora b/cmake-init-fedora deleted file mode 100644 index 18ec334..0000000 --- a/cmake-init-fedora +++ /dev/null @@ -1,2 +0,0 @@ -SET (CMAKE_SKIP_RPATH "YES" CACHE BOOL - "If set, runtime paths are not added when using shared libraries.") diff --git a/cmake.spec b/cmake.spec index 59b2d4e..402598a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,20 +1,23 @@ +# Set to bcond_without or use --with bootstrap if bootstrapping a new release +# or architecture +%bcond_with bootstrap + Name: cmake -Version: 2.4.6 -Release: 2%{?dist} +Version: 2.4.8 +Release: 3%{?dist} Summary: Cross-platform make system Group: Development/Tools License: BSD URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz -Source1: cmake-init-fedora Source2: macros.cmake Patch0: cmake-2.4.2-fedora.patch Patch1: cmake-2.4.5-xmlrpc.patch -Patch2: cmake-2.4.6-soexe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, libX11-devel BuildRequires: curl-devel, expat-devel, zlib-devel +%{?!with_bootstrap:BuildRequires: xmlrpc-c-devel} Requires: rpm @@ -31,15 +34,14 @@ generation, code generation, and template instantiation. %setup -q %patch -p1 -b .fedora %patch1 -p1 -b .xmlrpc -%patch2 -p1 -b .soexe %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" -./bootstrap --init=%SOURCE1 --prefix=%{_prefix} --datadir=/share/%{name} \ +./bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \ --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \ - --no-system-libs + --%{?with_bootstrap:no-}system-libs make VERBOSE=1 %{?_smp_mflags} @@ -55,6 +57,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +%check +ctest -V + + %clean rm -rf $RPM_BUILD_ROOT @@ -73,21 +79,57 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Apr 23 2007 Orion Poplawski - 2.4.6-2 -- Use bundled libraries for initial EPEL build +* Fri Mar 7 2008 Orion Poplawski - 2.4.8-3 +- Add macro for bootstrapping new release/architecture +- Add %%check section -* Thu Apr 19 2007 Orion Poplawski - 2.4.6-1 -- Update to 2.4.6 +* Tue Feb 19 2008 Fedora Release Engineering - 2.4.8-2 +- Autorebuild for GCC 4.3 + +* Tue Jan 22 2008 Orion Poplawski - 2.4.8-1 +- Update to 2.4.8 + +* Wed Jan 16 2008 Orion Poplawski - 2.4.8-0.rc12 +- Update to 2.4.8 RC-12 + +* Fri Dec 14 2007 Orion Poplawski - 2.4.8-0.rc4 +- Update to 2.4.8 RC-4 + +* Mon Nov 12 2007 Orion Poplawski - 2.4.7-4 +- No longer set CMAKE_SKIP_RPATH + +* Tue Aug 28 2007 Orion Poplawski - 2.4.7-3 +- Rebuild for new expat + +* Wed Aug 22 2007 Orion Poplawski - 2.4.7-2 +- Rebuild for BuildID + +* Mon Jul 23 2007 Orion Poplawski - 2.4.7-1 +- Update to 2.4.7 + +* Fri Jun 29 2007 Orion Poplawski - 2.4.7-0.rc11 +- Update to 2.4.7 RC-11 + +* Wed Jun 27 2007 Orion Poplawski - 2.4.6-4 +- Update macros.cmake to add CMAKE_INSTALL_LIBDIR, INCLUDE_INSTALL_DIR, + LIB_INSTALL_DIR, SYSCONF_INSTALL_DIR, and SHARE_INSTALL_PREFIX + +* Mon Apr 16 2007 Orion Poplawski - 2.4.6-3 - Apply patch from upstream CVS to fix .so install permissions (bug #235673) + +* Fri Apr 06 2007 Orion Poplawski - 2.4.6-2 - Add rpm macros +* Thu Jan 11 2007 Orion Poplawski - 2.4.6-1 +- Update to 2.4.6 + * Mon Dec 18 2006 Orion Poplawski - 2.4.5-2 - Use system libraries (bootstrap --system-libs) * Tue Dec 5 2006 Orion Poplawski - 2.4.5-1 - Update to 2.4.5 -* Mon Nov 27 2006 Orion Poplawski - 2.4.4-1 +* Tue Nov 21 2006 Orion Poplawski - 2.4.4-1 - Update to 2.4.4 * Tue Oct 31 2006 Orion Poplawski - 2.4.3-4 diff --git a/sources b/sources index 2504278..c69a3f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c99c747ad8e9bfb3bef9cca875a52129 cmake-2.4.6.tar.gz +f5dd061c31765a49dc17ae8bdc986779 cmake-2.4.8.tar.gz