raphgro pushed to kdocker (epel7). "- .desktop: fix path to app-icon (#178531)"

[notifications at fedoraproject.org]

>From 66cefaa5aed8ddbd16a0c1e11541d53b301ec846 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun, 22 Jan 2006 02:45:07 +0000
Subject: - .desktop: fix path to app-icon (#178531)


diff --git a/kdocker-1.3-paths.patch b/kdocker-1.3-paths.patch
new file mode 100644
index 0000000..261f9ae
--- /dev/null
+++ b/kdocker-1.3-paths.patch
@@ -0,0 +1,39 @@
+--- kdocker/kdocker.desktop.qmake	2004-11-22 10:11:49.000000000 -0600
++++ kdocker/kdocker.desktop	2006-01-21 20:39:14.000000000 -0600
+@@ -4,7 +4,7 @@
+ Comment=Docks any application into system tray
+ Exec=kdocker
+ TryExec=kdocker
+-Icon=/usr/local/share/kdocker/icons/kdocker.png
++Icon=/usr/share/kdocker/icons/kdocker.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Utility;
+--- kdocker/kdocker.pro.qmake	2005-04-04 22:14:58.000000000 -0500
++++ kdocker/kdocker.pro	2006-01-21 20:38:57.000000000 -0600
+@@ -1,10 +1,10 @@
+ TEMPLATE = app
+ DEPENDPATH += i18n src
+ INCLUDEPATH += . src  /usr/include/X11 /usr/include/X11R6
+-LIBPATH += /usr/X11/lib /usr/X11R6/lib
++#LIBPATH += /usr/X11/lib /usr/X11R6/lib
+ LIBS = -lX11 -lXpm -lXmu
+ TARGET = kdocker
+-INSTALL_PATH = /usr/local/share/kdocker
++INSTALL_PATH = $$DESTDIR/usr/share/kdocker
+ DOCS_PATH = $$INSTALL_PATH/docs
+ 
+ # Defines
+@@ -24,10 +24,10 @@
+ docs.path = $$DOCS_PATH
+ docs.files = README
+ 
+-desktop.path = /usr/share/applications
++desktop.path = $$DESTDIR/usr/share/applications
+ desktop.files = kdocker.desktop
+ 
+-target.path = /usr/local/bin
++target.path = $$DESTDIR/usr/bin
+ 
+ INSTALLS += target icons docs translations desktop
+ 
diff --git a/kdocker-qmake.patch b/kdocker-qmake.patch
deleted file mode 100644
index 060eb3d..0000000
--- a/kdocker-qmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- kdocker/kdocker.pro.qmake	2005-01-29 01:39:30.000000000 -0600
-+++ kdocker/kdocker.pro	2005-04-26 11:21:15.000000000 -0500
-@@ -1,10 +1,10 @@
- TEMPLATE = app
- DEPENDPATH += i18n src
- INCLUDEPATH += . src  /usr/include/X11 /usr/include/X11R6
--LIBPATH += /usr/X11/lib /usr/X11R6/lib
-+#LIBPATH += /usr/X11/lib /usr/X11R6/lib
- LIBS = -lX11 -lXpm -lXmu
- TARGET = kdocker
--INSTALL_PATH = /usr/local/share/kdocker
-+INSTALL_PATH = $$DESTDIR/usr/share/kdocker
- DOCS_PATH = $$INSTALL_PATH/docs
- 
- # Defines
-@@ -24,10 +24,10 @@
- docs.path = $$DOCS_PATH
- docs.files = README
- 
--desktop.path = /usr/share/applications
-+desktop.path = $$DESTDIR/usr/share/applications
- desktop.files = kdocker.desktop
- 
--target.path = /usr/local/bin
-+target.path = $$DESTDIR/usr/bin
- 
- INSTALLS += target icons docs translations desktop
- 
diff --git a/kdocker.spec b/kdocker.spec
index 1acf46a..6ceb1ed 100644
--- a/kdocker.spec
+++ b/kdocker.spec
@@ -2,15 +2,15 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
 URL:	 http://kdocker.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-1.3.tar.gz
+Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: kdocker-qmake.patch 
+Patch1: kdocker-1.3-paths.patch 
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
@@ -40,7 +40,7 @@ probably many more.
 %prep
 %setup -q -n kdocker 
 
-%patch0 -p1 -b .qmake
+%patch1 -p1 -b .paths
 
 
 %build
@@ -63,7 +63,7 @@ make install
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-category Application \
+  --add-category Qt \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog 
+* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
+- .desktop: fix path to app-icon (#178531)
+
 * Tue Nov 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-3
 - remove dup'd docs
 - %%lang'ify i18n bits
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdocker.git/commit/?h=epel7&id=66cefaa5aed8ddbd16a0c1e11541d53b301ec846