Update to 3.0.0-rc5

- Drop icon patch applied upstream
This commit is contained in:
Orion Poplawski 2014-05-14 21:33:02 -06:00
parent 24519e8481
commit 727224fd82
4 changed files with 8 additions and 21 deletions

1
.gitignore vendored
View File

@ -19,3 +19,4 @@
/cmake-3.0.0-rc1.tar.gz /cmake-3.0.0-rc1.tar.gz
/cmake-3.0.0-rc3.tar.gz /cmake-3.0.0-rc3.tar.gz
/cmake-3.0.0-rc4.tar.gz /cmake-3.0.0-rc4.tar.gz
/cmake-3.0.0-rc5.tar.gz

View File

@ -1,14 +0,0 @@
diff -up cmake-2.8.10.1/Source/QtDialog/CMake.desktop\~ cmake-2.8.10.1/Source/QtDialog/CMake.desktop
--- cmake-2.8.10.1/Source/QtDialog/CMake.desktop~ 2012-11-06 20:41:36.000000000 +0100
+++ cmake-2.8.10.1/Source/QtDialog/CMake.desktop 2012-12-06 01:02:51.054110499 +0100
@@ -3,7 +3,7 @@ Version=1.0
Name=CMake
Comment=Cross-platform buildsystem
Exec=cmake-gui %f
-Icon=CMakeSetup32.png
+Icon=CMakeSetup32
Terminal=false
X-MultipleArgs=false
Type=Application
Diff finished. Thu Dec 6 01:03:01 2012

View File

@ -4,7 +4,7 @@
# Set to bcond_with or use --without gui to disable qt4 gui build # Set to bcond_with or use --without gui to disable qt4 gui build
%bcond_without gui %bcond_without gui
# Set to RC version if building RC, else %{nil} # Set to RC version if building RC, else %{nil}
%define rcver -rc4 %define rcver -rc5
%define rpm_macros_dir %{_sysconfdir}/rpm %define rpm_macros_dir %{_sysconfdir}/rpm
%if 0%{?fedora} > 18 %if 0%{?fedora} > 18
@ -13,7 +13,7 @@
Name: cmake Name: cmake
Version: 3.0.0 Version: 3.0.0
Release: 0.8.rc4%{?dist} Release: 0.9.rc5%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
Group: Development/Tools Group: Development/Tools
@ -48,9 +48,6 @@ Patch5: cmake-2.8.11-rc4-lua-5.2.patch
# Add -fno-strict-aliasing when compiling cm_sha2.c # Add -fno-strict-aliasing when compiling cm_sha2.c
# http://www.cmake.org/Bug/view.php?id=14314 # http://www.cmake.org/Bug/view.php?id=14314
Patch6: cmake-strict_aliasing.patch Patch6: cmake-strict_aliasing.patch
# Patch away .png extension in icon name in desktop file.
# http://www.cmake.org/Bug/view.php?id=14315
Patch7: cmake-desktop_icon.patch
# Remove automatic Qt module dep adding # Remove automatic Qt module dep adding
# http://public.kitware.com/Bug/view.php?id=14750 # http://public.kitware.com/Bug/view.php?id=14750
Patch8: cmake-qtdeps.patch Patch8: cmake-qtdeps.patch
@ -127,7 +124,6 @@ The %{name}-gui package contains the Qt based GUI for CMake.
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 -b .strict_aliasing %patch6 -p1 -b .strict_aliasing
%patch7 -p1 -b .desktop_icon
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
@ -246,6 +242,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Wed May 14 2014 Orion Poplawski <orion@cora.nwra.com> - 3.0.0-0.9.rc5
- Update to 3.0.0-rc5
- Drop icon patch applied upstream
* Tue Apr 22 2014 Orion Poplawski <orion@cora.nwra.com> - 3.0.0-0.8.rc4 * Tue Apr 22 2014 Orion Poplawski <orion@cora.nwra.com> - 3.0.0-0.8.rc4
- Update to 3.0.0-rc4 - Update to 3.0.0-rc4

View File

@ -1 +1 @@
906f64ab04b6034e5f78aff60a453884 cmake-3.0.0-rc4.tar.gz 7adb325c9bcdcd4a01f203e21497b913 cmake-3.0.0-rc5.tar.gz