rpms/kdocker/F-11 kdocker-4.3-qmake_saner_defaults.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdocker.spec, 1.15, 1.16 sources, 1.2, 1.3

Mon Jan 25 22:06:40 UTC 2010

Author: thomasj

Update of /cvs/pkgs/rpms/kdocker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6372

Modified Files:
	.cvsignore kdocker.spec sources 
Added Files:
	kdocker-4.3-qmake_saner_defaults.patch 
Log Message:
New source 4.3


kdocker-4.3-qmake_saner_defaults.patch:
 kdocker.pro |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kdocker-4.3-qmake_saner_defaults.patch ---
diff -up kdocker-4.3/kdocker.pro.qmake kdocker-4.3/kdocker.pro
--- kdocker-4.3/kdocker.pro.qmake	2009-11-10 16:10:08.000000000 -0600
+++ kdocker-4.3/kdocker.pro	2010-01-20 13:08:40.910649567 -0600
@@ -9,7 +9,8 @@ INCLUDEPATH += . src  /usr/include/X11
 LIBPATH += /usr/X11/lib
 LIBS = -lX11 -lXpm -lXmu
 
-INSTALL_PATH = /usr/local/share/kdocker
+INSTALL_PREFIX = /usr
+INSTALL_PATH = $$INSTALL_PREFIX/share/kdocker
 
 TRANSLATIONS += i18n/kdocker_it_IT.ts
 
@@ -39,7 +40,7 @@ desktop.files = helpers/kdocker.desktop
 completion.path = /etc/bash_completion.d
 completion.files = helpers/kdocker
 
-target.path = /usr/local/bin
+target.path = $$INSTALL_PREFIX/bin
 
 INSTALLS += target icons desktop completion translations
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdocker/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 14:14:40 -0000	1.2
+++ .cvsignore	25 Jan 2010 22:06:39 -0000	1.3
@@ -1 +1 @@
-kdocker-1.3.tar.gz
+kdocker-4.3.tar.gz


Index: kdocker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdocker/F-11/kdocker.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kdocker.spec	25 Feb 2009 11:01:42 -0000	1.15
+++ kdocker.spec	25 Jan 2010 22:06:39 -0000	1.16
@@ -1,103 +1,80 @@
 
 Name:	 kdocker
 Summary: Dock any application in the system tray
-Version: 1.3
-Release: 12%{?dist}
+Version: 4.3 
+Release: 2%{?dist}
 
 Group:   User Interface/Desktops
 License: GPLv2+
-URL:	 http://kdocker.sourceforge.net/
-Source0: http://downloads.sourceforge.net/sourceforge/kdocker/kdocker-%{version}.tar.gz
+URL:	 https://launchpad.net/kdocker 
+Source0: http://launchpad.net/kdocker/trunk/%{version}/+download/kdocker-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdocker-1.3-paths.patch 
+## upstreamable patches
+# use an adjustable install prefix, default to /usr (vs /usr/local)
+Patch50: kdocker-4.3-qmake_saner_defaults.patch
 
-BuildRequires: desktop-file-utils
-BuildRequires: qt3-devel 
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libXmu-devel
-BuildRequires: libXpm-devel
-%endif
+BuildRequires: qt4-devel, libXpm-devel, libXmu-devel, desktop-file-utils
 
 %description
 KDocker will help you dock any application in the system tray. This means you
 can dock openoffice, xmms, firefox, thunderbolt, eclipse, anything! Just point
 and click. Works for both KDE and GNOME (In fact it should work for most modern
-window managers that support NET WM Specification. I believe it works for XFCE,
-for instance)
+window managers that support NET WM Specification for instance)
 
 All you need to do is start KDocker and select an application using the mouse
-and lo! the application gets docked into the system tray. The application can 
+and lo! the application gets docked into the system tray. The application can
 also be made to dissappear from the task bar.
 
-KDocker supports the KDE System Tray Protocol and the System Tray Protocol from
-freedesktop.org
-
-Very few apps have docking capabilities (e.g. Yahoo! and XMMS don't have any). 
-Even if they do, sometimes they are specific to desktops (working on KDE but 
-not on GNOME, and vice versa). KDocker will help you dock any application in 
-the system tray. This means you can dock OpenOffice.org, XMMS, Firefox, 
-Thunderbird, etc. Just point and click. It works for KDE, GNOME, XFCE, and 
-probably many more.
-
 
 %prep
-%setup -q -n kdocker 
+%setup -q 
 
-%patch1 -p1 -b .paths
+%patch50 -p1 -b .qmake_saner_defaults
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+%{_qt4_qmake}
 
-qmake 
-sed -i -e '/^\s*-\?strip /d' Makefile # naughty qmake
-
-# Not smp safe
-make 
+make  %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install INSTALL_ROOT=%{buildroot}
 
 desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir=%{buildroot}%{_datadir}/applications \
   --vendor="" \
   --add-category="Qt" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
-
-# remove dup'd docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/kdocker/docs
-ln -s %{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/kdocker/docs
-
-# %lang'ify i18n bits
-echo "%dir %{_datadir}/kdocker/i18n/" >> %{name}.lang
-for lang_bit in $RPM_BUILD_ROOT%{_datadir}/kdocker/i18n/*.qm ; do
-  if [ -f $lang_bit ]; then
-    lang_file=$(basename $lang_bit)
-    lang=$(echo $lang_file .qm | cut -d_ -f2)
-    echo "%lang($lang) %{_datadir}/kdocker/i18n/$lang_file" >> %{name}.lang
-  fi
-done
+  helpers/kdocker.desktop 
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT 
+rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS COPYING CREDITS ChangeLog HACKING README TODO VERSION
-%{_bindir}/*
-%dir %{_datadir}/kdocker/
-%{_datadir}/kdocker/docs
-%{_datadir}/kdocker/icons/
-%{_datadir}/applications/*.desktop
+%doc AUTHORS BUGS COPYING CREDITS ChangeLog README TODO VERSION
+%{_bindir}/kdocker
+%{_datadir}/kdocker/
+%{_datadir}/applications/kdocker.desktop
+# wary of owning this dir, but seems like what most other packages do
+%{_sysconfdir}/bash_completion.d/
 
 
 %changelog
+* Mon Jan 25 2010 Thomas Janssen <thomasj at fedoraproject.org> 4.3-2
+- added BRs
+
+* Wed Jan 20 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3-1
+- kdocker-4.3
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdocker/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Nov 2005 14:14:40 -0000	1.2
+++ sources	25 Jan 2010 22:06:39 -0000	1.3
@@ -1 +1 @@
-c6900fc87c6c48cd106457ed9c6f924f  kdocker-1.3.tar.gz
+51bd0a29e58edc6c93fe19f9c5acaaea  kdocker-4.3.tar.gz

