[kdenetwork] restore extra krdc_icon handling
Rex Dieter
rdieter at fedoraproject.org
Sat Jun 1 21:09:13 UTC 2013
commit eb17d2faa508b6dfeece98da87e8450a2f0e4f37
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Jun 1 16:08:33 2013 -0500
restore extra krdc_icon handling
kdenetwork-4.10.4-krdc_icon.patch | 15 ++++++++++++---
kdenetwork.spec | 3 ++-
sources | 1 +
3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/kdenetwork-4.10.4-krdc_icon.patch b/kdenetwork-4.10.4-krdc_icon.patch
index 42da5e6..45876bd 100644
--- a/kdenetwork-4.10.4-krdc_icon.patch
+++ b/kdenetwork-4.10.4-krdc_icon.patch
@@ -1,6 +1,15 @@
-diff -up kdenetwork-4.10.4/krdc/CMakeLists.txt.krdc_icon kdenetwork-4.10.4/krdc/CMakeLists.txt
---- kdenetwork-4.10.4/krdc/CMakeLists.txt.krdc_icon 2013-05-30 16:49:47.000000000 -0500
-+++ kdenetwork-4.10.4/krdc/CMakeLists.txt 2013-06-01 13:41:06.968919911 -0500
+diff -up kdenetwork-4.10.4/krdc/CMakeLists.txt.icon kdenetwork-4.10.4/krdc/CMakeLists.txt
+--- kdenetwork-4.10.4/krdc/CMakeLists.txt.icon 2013-05-30 16:49:47.000000000 -0500
++++ kdenetwork-4.10.4/krdc/CMakeLists.txt 2013-06-01 13:38:17.506707887 -0500
+@@ -87,7 +87,7 @@ kde4_add_ui_files(krdc_SRCS
+ config/general.ui
+ )
+
+-kde4_add_app_icon(krdc_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/krdc.png")
++kde4_add_app_icon(krdc_SRCS "hi*-apps-krdc.png")
+
+ kde4_add_executable(krdc ${krdc_SRCS})
+
@@ -124,3 +124,5 @@ endif()
if(NOT INSIDE_KDENETWORK)
macro_display_feature_log()
diff --git a/kdenetwork.spec b/kdenetwork.spec
index e5691d2..6bfc62d 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -19,6 +19,7 @@ URL: http://www.kde.org
%global stable stable
%endif
Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
+Source1: krdc-icons.tar.bz2
Source2: kppp.console
Source3: kppp.pam
@@ -228,7 +229,7 @@ Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
%prep
-%setup -q -n kdenetwork-%{version}
+%setup -q -n kdenetwork-%{version} -a1
%patch2 -p1 -b .resolv-conf-path
%patch3 -p1 -b .fix-for-g++47
%patch4 -p1 -b .kopete_system_iris
diff --git a/sources b/sources
index 5d69392..83ee477 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+7dd360a790100c952090410c2c89937c krdc-icons.tar.bz2
066bf8caf27fd68376112e77d3b93282 kdenetwork-4.10.4.tar.xz
More information about the scm-commits
mailing list