rpms/kdocker/FC-3 kdocker.spec,1.3,1.4

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23635

Modified Files:
	kdocker.spec 
Log Message:
* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
- --vendor=""



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-3/kdocker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdocker.spec	22 Jan 2006 02:49:26 -0000	1.3
+++ kdocker.spec	14 Apr 2006 12:33:08 -0000	1.4
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
@@ -14,6 +14,10 @@
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
+%if "%{?fedora}" > "4"
+BuildRequires: libXmu-devel
+BuildRequires: libXpm-devel
+%endif
 
 %description
 KDocker will help you dock any application in the system tray. This means you
@@ -56,15 +60,17 @@
 %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 
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Qt \
-  --delete-original \
+  --add-category="X-Fedora" --vendor="" \
+  --add-category="Qt" \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # remove dup'd docs
@@ -87,7 +93,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING CREDITS ChangeLog HACKING README TODO VERSION
 %{_bindir}/*
 %dir %{_datadir}/kdocker/
@@ -97,6 +103,15 @@
 
 
 %changelog 
+* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
+- --vendor=""
+
+* Fri Mar 10 2006 Rex Dieter <rexdieer[AT]users.sf.net> 1.3-5
+- build failure, useless -debuginfo (#180103)
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
+- fc5: gcc/glibc respin
+
 * Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
 - .desktop: fix path to app-icon (#178531)