diff --git a/.gitignore b/.gitignore index 5e9430d..f22dd47 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,8 @@ cmake-2.8.2.tar.gz +/cmake-2.8.3-rc1.tar.gz +/cmake-2.8.3-rc3.tar.gz +/cmake-2.8.3-rc4.tar.gz +/cmake-2.8.3.tar.gz +/cmake-2.8.4-rc1.tar.gz +/cmake-2.8.4-rc2.tar.gz +/cmake-2.8.4.tar.gz diff --git a/cmake-2.8.2-FindGTK2.patch b/cmake-2.8.2-FindGTK2.patch deleted file mode 100644 index 0be898a..0000000 --- a/cmake-2.8.2-FindGTK2.patch +++ /dev/null @@ -1,123 +0,0 @@ ---- cmake-2.8.2/Modules/FindGTK2.cmake.git 2010-06-28 09:15:57.000000000 -0600 -+++ cmake-2.8.2/Modules/FindGTK2.cmake 2010-10-07 14:38:47.302203314 -0600 -@@ -28,6 +28,8 @@ - # - # GTK2_DEBUG - Enables verbose debugging of the module - # GTK2_SKIP_MARK_AS_ADVANCED - Disable marking cache variables as advanced -+# GTK2_ADDITIONAL_SUFFIXES - Allows defining additional directories to -+# search for include files - # - #================= - # Example Usage: -@@ -61,9 +63,24 @@ - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - # See the License for more information. - #============================================================================= --# (To distributed this file outside of CMake, substitute the full -+# (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# Version 1.2 (8/30/2010) (CMake 2.8.3) -+# * Merge patch for detecting gdk-pixbuf library (split off -+# from core GTK in 2.21). Thanks to Vincent Untz for the patch -+# and Ricardo Cruz for the heads up. -+# Version 1.1 (8/19/2010) (CMake 2.8.3) -+# * Add support for detecting GTK2 under macports (thanks to Gary Kramlich) -+# Version 1.0 (8/12/2010) (CMake 2.8.3) -+# * Add support for detecting new pangommconfig.h header file -+# (Thanks to Sune Vuorela & the Debian Project for the patch) -+# * Add support for detecting fontconfig.h header -+# * Call find_package(Freetype) since it's required -+# * Add support for allowing users to add additional library directories -+# via the GTK2_ADDITIONAL_SUFFIXES variable (kind of a future-kludge in -+# case the GTK developers change versions on any of the directories in the -+# future). - # Version 0.8 (1/4/2010) - # * Get module working under MacOSX fink by adding /sw/include, /sw/lib - # to PATHS and the gobject library -@@ -131,13 +148,15 @@ - endif() - - set(_relatives -- # FIXME -+ # If these ever change, things will break. -+ ${GTK2_ADDITIONAL_SUFFIXES} - glibmm-2.4 - glib-2.0 - atk-1.0 - atkmm-1.6 - cairo - cairomm-1.0 -+ gdk-pixbuf-2.0 - gdkmm-2.4 - giomm-2.4 - gtk-2.0 -@@ -172,6 +191,8 @@ - /usr/openwin/lib - /sw/include - /sw/lib -+ /opt/local/include -+ /opt/local/lib - $ENV{GTKMM_BASEPATH}/include - $ENV{GTKMM_BASEPATH}/lib - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include -@@ -390,6 +411,10 @@ - # Find all components - # - -+find_package(Freetype) -+list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS}) -+list(APPEND GTK2_LIBRARIES ${FREETYPE_LIBRARIES}) -+ - foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) - if(_GTK2_component STREQUAL "gtk") - _GTK2_FIND_INCLUDE_DIR(GTK2_GLIB_INCLUDE_DIR glib.h) -@@ -399,27 +424,32 @@ - _GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h) - _GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true) - -+ _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) -+ _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true) -+ - _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h) -- _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true) -- _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-win32 false true) -- - _GTK2_FIND_INCLUDE_DIR(GTK2_GTK_INCLUDE_DIR gtk/gtk.h) -- _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-x11 false true) -- _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-win32 false true) -+ -+ if(UNIX) -+ _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true) -+ _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-x11 false true) -+ else() -+ _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-win32 false true) -+ _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-win32 false true) -+ endif() - - _GTK2_FIND_INCLUDE_DIR(GTK2_CAIRO_INCLUDE_DIR cairo.h) - _GTK2_FIND_LIBRARY (GTK2_CAIRO_LIBRARY cairo false false) - -+ _GTK2_FIND_INCLUDE_DIR(GTK2_FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h) -+ - _GTK2_FIND_INCLUDE_DIR(GTK2_PANGO_INCLUDE_DIR pango/pango.h) - _GTK2_FIND_LIBRARY (GTK2_PANGO_LIBRARY pango false true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h) - _GTK2_FIND_LIBRARY (GTK2_ATK_LIBRARY atk false true) - -- #elseif(_GTK2_component STREQUAL "gdk_pixbuf") -- #_GTK2_FIND_INCLUDE_DIR(GTK2_GDKPIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) -- #_GTK2_FIND_LIBRARY (GTK2_GDKPIXBUF_LIBRARY gdk_pixbuf false true) - - elseif(_GTK2_component STREQUAL "gtkmm") - -@@ -439,6 +469,7 @@ - _GTK2_FIND_LIBRARY (GTK2_CAIROMM_LIBRARY cairomm true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMM_INCLUDE_DIR pangomm.h) -+ _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMMCONFIG_INCLUDE_DIR pangommconfig.h) - _GTK2_FIND_LIBRARY (GTK2_PANGOMM_LIBRARY pangomm true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_SIGC++_INCLUDE_DIR sigc++/sigc++.h) diff --git a/cmake-2.8.2-python27.patch b/cmake-2.8.2-python27.patch deleted file mode 100644 index d5be65a..0000000 --- a/cmake-2.8.2-python27.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur cmake-2.8.2/Modules/FindPythonLibs.cmake cmake-2.8.2-python27/Modules/FindPythonLibs.cmake ---- cmake-2.8.2/Modules/FindPythonLibs.cmake 2010-06-28 17:15:57.000000000 +0200 -+++ cmake-2.8.2-python27/Modules/FindPythonLibs.cmake 2010-07-23 20:42:29.000000000 +0200 -@@ -27,7 +27,7 @@ - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) - FIND_LIBRARY(PYTHON_DEBUG_LIBRARY diff --git a/cmake.spec b/cmake.spec index 6e85794..f418f8b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -7,8 +7,8 @@ %define rcver %{nil} Name: cmake -Version: 2.8.2 -Release: 3%{?dist} +Version: 2.8.4 +Release: 1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -17,16 +17,15 @@ URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source2: macros.cmake -# add support for Python 2.7 to FindPythonLibs.cmake (Orcan Ogetbil) -Patch0: cmake-2.8.2-python27.patch -# Update FindGTK2.cmake to git version to fix bug 639058 -Patch1: cmake-2.8.2-FindGTK2.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: ncurses-devel, libX11-devel -BuildRequires: curl-devel, expat-devel, zlib-devel +BuildRequires: bzip2-devel +BuildRequires: curl-devel +BuildRequires: expat-devel +BuildRequires: libarchive-devel +BuildRequires: zlib-devel %if %{without bootstrap} #BuildRequires: xmlrpc-c-devel %endif @@ -57,11 +56,6 @@ The %{name}-gui package contains the Qt based GUI for CMake. %prep %setup -q -n %{name}-%{version}%{?rcver} -# Python 2.7 patch (don't use -b as the backup would get installed) -%patch0 -p1 -%patch1 -p1 -# Fixup permissions -find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x %build @@ -127,26 +121,68 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/rpm/macros.cmake %{_datadir}/doc/%{name}-%{version}/ +%if %{with gui} +%exclude %{_datadir}/doc/%{name}-%{version}/cmake-gui.* +%endif %{_bindir}/ccmake %{_bindir}/cmake %{_bindir}/cpack %{_bindir}/ctest %{_datadir}/%{name}/ -%{_mandir}/man1/*.1* +%{_mandir}/man1/ccmake.1.gz +%{_mandir}/man1/cmake.1.gz +%{_mandir}/man1/cmakecommands.1.gz +%{_mandir}/man1/cmakecompat.1.gz +%{_mandir}/man1/cmakemodules.1.gz +%{_mandir}/man1/cmakepolicies.1.gz +%{_mandir}/man1/cmakeprops.1.gz +%{_mandir}/man1/cmakevars.1.gz +%{_mandir}/man1/cpack.1.gz +%{_mandir}/man1/ctest.1.gz %{_datadir}/emacs/ %{_libdir}/%{name}/ %if %{with gui} %files gui %defattr(-,root,root,-) +%{_datadir}/doc/%{name}-%{version}/cmake-gui.* %{_bindir}/cmake-gui %{_datadir}/applications/CMake.desktop %{_datadir}/mime/packages/cmakecache.xml %{_datadir}/pixmaps/CMakeSetup32.png +%{_mandir}/man1/cmake-gui.1.gz %endif %changelog +* Thu Feb 17 2011 Orion Poplawski - 2.8.4-1 +- Update to 2.8.4 final + +* Wed Feb 2 2011 Orion Poplawski - 2.8.4-0.2.rc2 +- Update to 2.8.4 RC 2 + +* Tue Jan 18 2011 Orion Poplawski - 2.8.4-0.1.rc1 +- Update to 2.8.4 RC 1 +- Drop qt4 patch + +* Thu Dec 16 2010 Orion Poplawski - 2.8.3-2 +- Add patch from upstream git to fix bug 652886 (qt3/qt4 detection) + +* Thu Nov 4 2010 Orion Poplawski - 2.8.3-1 +- Update to 2.8.3 final + +* Mon Nov 1 2010 Orion Poplawski - 2.8.3-0.3.rc4 +- Update to 2.8.3 RC 4 +- Drop python 2.7 patch fixed upstream +- No need to fixup source file permissions anymore + +* Fri Oct 22 2010 Orion Poplawski - 2.8.3-0.2.rc3 +- Update to 2.8.3 RC 3 + +* Thu Sep 16 2010 Orion Poplawski - 2.8.3-0.1.rc1 +- Update to 2.8.3 RC 1 +- Add BR bzip2-devel and libarchive-devel + * Thu Oct 7 2010 Orion Poplawski - 2.8.2-3 - Update FindGTK2 to latest git to fix bug 639058 - Disable ModuleNotices - barfs on fixed typo in FindGTK2 diff --git a/sources b/sources index d5d6949..65e1bf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c967d5264657a798f22ee23976ff0d9 cmake-2.8.2.tar.gz +209b7d1d04b2e00986538d74ba764fcf cmake-2.8.4.tar.gz