[cmake] Icon name in desktop file should be sans .png extension.
Petr Machata
pmachata at fedoraproject.org
Thu Jul 25 16:53:21 UTC 2013
commit d48ae7c8e06df2b7288a7065e981d745f4c75b35
Author: Petr Machata <pmachata at redhat.com>
Date: Thu Jul 25 18:52:52 2013 +0200
Icon name in desktop file should be sans .png extension.
cmake-desktop_icon.patch | 14 ++++++++++++++
cmake.spec | 10 +++++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/cmake-desktop_icon.patch b/cmake-desktop_icon.patch
new file mode 100644
index 0000000..89f202c
--- /dev/null
+++ b/cmake-desktop_icon.patch
@@ -0,0 +1,14 @@
+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
diff --git a/cmake.spec b/cmake.spec
index cd044ad..2a5177c 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -13,7 +13,7 @@
Name: cmake
Version: 2.8.11.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Cross-platform make system
Group: Development/Tools
@@ -44,7 +44,11 @@ Patch4: cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
# Add FindLua52.cmake
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran
@@ -100,6 +104,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
@@ -196,6 +201,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Thu Jul 25 2013 Petr Machata <pmachata at redhat.com> - 2.8.11.2-3
+- Icon name in desktop file should be sans .png extension.
+
* Thu Jul 25 2013 Petr Machata <pmachata at redhat.com> - 2.8.11.2-2
- Pass -fno-strict-aliasing to cm_sha2.c to avoid strict aliasing
problems that GCC warns about.
More information about the scm-commits
mailing list