[digikam] make dngconverter app icons to hicolor so usable outside of kde (#682055)
Rex Dieter
rdieter at fedoraproject.org
Fri Dec 9 20:36:13 UTC 2011
commit 05abfa626b2c775f454b5552307eec5f606032aa
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Dec 9 14:36:12 2011 -0600
make dngconverter app icons to hicolor so usable outside of kde (#682055)
digikam-2.4.1-dngconverter_hicolor_icons.patch | 18 ++++++++++++++++++
digikam.spec | 12 +++++++++++-
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/digikam-2.4.1-dngconverter_hicolor_icons.patch b/digikam-2.4.1-dngconverter_hicolor_icons.patch
new file mode 100644
index 0000000..51609e2
--- /dev/null
+++ b/digikam-2.4.1-dngconverter_hicolor_icons.patch
@@ -0,0 +1,18 @@
+diff -up digikam-2.4.1/extra/kipi-plugins/dngconverter/icons/CMakeLists.txt.hicolor digikam-2.4.1/extra/kipi-plugins/dngconverter/icons/CMakeLists.txt
+--- digikam-2.4.1/extra/kipi-plugins/dngconverter/icons/CMakeLists.txt.hicolor 2011-12-04 15:39:58.000000000 -0600
++++ digikam-2.4.1/extra/kipi-plugins/dngconverter/icons/CMakeLists.txt 2011-12-09 14:32:20.799450247 -0600
+@@ -1,2 +1,2 @@
+-# Install Oxygen icons.
+-add_subdirectory(oxygen)
++# Install icons.
++add_subdirectory(hicolor)
+diff -up digikam-2.4.1/extra/kipi-plugins/dngconverter/icons/hicolor/CMakeLists.txt.hicolor digikam-2.4.1/extra/kipi-plugins/dngconverter/icons/hicolor/CMakeLists.txt
+--- digikam-2.4.1/extra/kipi-plugins/dngconverter/icons/hicolor/CMakeLists.txt.hicolor 2011-12-04 15:39:58.000000000 -0600
++++ digikam-2.4.1/extra/kipi-plugins/dngconverter/icons/hicolor/CMakeLists.txt 2011-12-09 14:33:30.811574973 -0600
+@@ -1,4 +1,4 @@
+
+-set(oxygen_icon_dirs 128x128 16x16 22x22 32x32 48x48 64x64 scalable)
++set(dngconverter_icon_dirs 128x128 16x16 22x22 32x32 48x48 64x64 scalable)
+
+-install(DIRECTORY ${oxygen_icon_dirs} DESTINATION ${ICON_INSTALL_DIR}/oxygen)
++install(DIRECTORY ${dngconverter_icon_dirs} DESTINATION ${ICON_INSTALL_DIR}/hicolor)
diff --git a/digikam.spec b/digikam.spec
index 5a8ed7e..40bbebc 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,7 +1,7 @@
Name: digikam
Version: 2.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A digital camera accessing & photo management application
License: GPLv2+
@@ -20,6 +20,8 @@ Source1: digikam-import.desktop
Patch0: digikam-2.1.1-clapack-atlas.patch
## upstreamable patches
+# move dngconverter icons oxygen->hicolor so visible outside of kde
+Patch50: digikam-2.4.1-dngconverter_hicolor_icons.patch
## upstream patches
@@ -196,6 +198,11 @@ Requires: kipi-plugins = %{version}-%{release}
%patch0 -p1 -b .clapack-atlas
+mv extra/kipi-plugins/dngconverter/icons/oxygen \
+ extra/kipi-plugins/dngconverter/icons/hicolor
+%patch50 -p1 -b .dngconverter_hicolor_icons
+
+
%build
mkdir -p %{_target_platform}
@@ -465,6 +472,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Fri Dec 09 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.1-2
+- make dngconverter app icons to hicolor so usable outside of kde (#682055)
+
* Mon Dec 5 2011 Alexey Kurov <nucleo at fedoraproject.org> - 2.4.1-1
- digikam-2.4.1
- drop icons and tooltips patches (in upstream now)
More information about the scm-commits
mailing list