rpms/kdocker/devel kdocker-1.3-paths.patch, 1.1, 1.2 kdocker.spec, 1.9, 1.10

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kdocker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5426

Modified Files:
	kdocker-1.3-paths.patch kdocker.spec 
Log Message:
* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-8
- fc6 respin


kdocker-1.3-paths.patch:

Index: kdocker-1.3-paths.patch
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker-1.3-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdocker-1.3-paths.patch	22 Jan 2006 02:45:07 -0000	1.1
+++ kdocker-1.3-paths.patch	29 Aug 2006 18:31:14 -0000	1.2
@@ -1,16 +1,5 @@
---- 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
+--- kdocker/kdocker.pro.paths	2005-04-04 22:14:58.000000000 -0500
++++ kdocker/kdocker.pro	2006-05-10 12:29:45.000000000 -0500
 @@ -1,10 +1,10 @@
  TEMPLATE = app
  DEPENDPATH += i18n src
@@ -20,7 +9,7 @@
  LIBS = -lX11 -lXpm -lXmu
  TARGET = kdocker
 -INSTALL_PATH = /usr/local/share/kdocker
-+INSTALL_PATH = $$DESTDIR/usr/share/kdocker
++INSTALL_PATH = $(DESTDIR)/usr/share/kdocker
  DOCS_PATH = $$INSTALL_PATH/docs
  
  # Defines
@@ -29,11 +18,22 @@
  docs.files = README
  
 -desktop.path = /usr/share/applications
-+desktop.path = $$DESTDIR/usr/share/applications
++desktop.path = $(DESTDIR)/usr/share/applications
  desktop.files = kdocker.desktop
  
 -target.path = /usr/local/bin
-+target.path = $$DESTDIR/usr/bin
++target.path = $(DESTDIR)/usr/bin
  
  INSTALLS += target icons docs translations desktop
  
+--- kdocker/kdocker.desktop.paths	2004-11-22 10:11:49.000000000 -0600
++++ kdocker/kdocker.desktop	2006-05-10 12:29:14.000000000 -0500
+@@ -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;


Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdocker.spec	14 Apr 2006 12:31:43 -0000	1.9
+++ kdocker.spec	29 Aug 2006 18:31:14 -0000	1.10
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 6%{?dist}
+Release: 8%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
@@ -13,8 +13,8 @@
 Patch1: kdocker-1.3-paths.patch 
 
 BuildRequires: desktop-file-utils
-BuildRequires: qt-devel >= 1:3.3
-%if "%{?fedora}" > "4"
+BuildRequires: qt-devel 
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
 BuildRequires: libXmu-devel
 BuildRequires: libXpm-devel
 %endif
@@ -49,9 +49,9 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 qmake 
+sed -i -e '/^\s*-\?strip /d' Makefile # naughty qmake
 
 # Not smp safe
 make 
@@ -60,12 +60,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-qmake DESTDIR=$RPM_BUILD_ROOT 
-sed -i -e '/^\s*-\?strip /d' Makefile # naughty qmake
-
-make install 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -103,6 +98,12 @@
 
 
 %changelog 
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-8
+- fc6 respin
+
+* Wed May 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-7
+- rework -paths patch
+
 * Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
 - --vendor=""