[cmake] Update to 3.0.0-rc5
Orion Poplawski
orion at fedoraproject.org
Thu May 15 03:33:11 UTC 2014
commit 727224fd82b3a3c5e08620c42faa7e64d6794b64
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Wed May 14 21:33:02 2014 -0600
Update to 3.0.0-rc5
- Drop icon patch applied upstream
.gitignore | 1 +
cmake-desktop_icon.patch | 14 --------------
cmake.spec | 12 ++++++------
sources | 2 +-
4 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f27fe3e..38c5f1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/cmake-3.0.0-rc1.tar.gz
/cmake-3.0.0-rc3.tar.gz
/cmake-3.0.0-rc4.tar.gz
+/cmake-3.0.0-rc5.tar.gz
diff --git a/cmake.spec b/cmake.spec
index 908c1cc..9bcb958 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -4,7 +4,7 @@
# 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 -rc4
+%define rcver -rc5
%define rpm_macros_dir %{_sysconfdir}/rpm
%if 0%{?fedora} > 18
@@ -13,7 +13,7 @@
Name: cmake
Version: 3.0.0
-Release: 0.8.rc4%{?dist}
+Release: 0.9.rc5%{?dist}
Summary: Cross-platform make system
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
# http://www.cmake.org/Bug/view.php?id=14314
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
# http://public.kitware.com/Bug/view.php?id=14750
Patch8: cmake-qtdeps.patch
@@ -127,7 +124,6 @@ The %{name}-gui package contains the Qt based GUI for CMake.
%patch4 -p1
%patch5 -p1
%patch6 -p1 -b .strict_aliasing
-%patch7 -p1 -b .desktop_icon
%patch8 -p1
%patch9 -p1
%patch10 -p1
@@ -246,6 +242,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Wed May 14 2014 Orion Poplawski <orion at 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 at cora.nwra.com> - 3.0.0-0.8.rc4
- Update to 3.0.0-rc4
diff --git a/sources b/sources
index d14b477..91b3e8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-906f64ab04b6034e5f78aff60a453884 cmake-3.0.0-rc4.tar.gz
+7adb325c9bcdcd4a01f203e21497b913 cmake-3.0.0-rc5.tar.gz
More information about the scm-commits
mailing list