raphgro pushed to kdocker (f21). "v4.9"

Sun Mar 29 00:29:06 UTC 2015

>From a34f30aea0be96c3773254b970013958747c3abc Mon Sep 17 00:00:00 2001
From: Raphael Groner <projects.rg at smart.ms>
Date: Sun, 29 Mar 2015 01:09:20 +0100
Subject: v4.9

diff --git a/.gitignore b/.gitignore
index d60edad..0b1b041 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 kdocker-4.3.tar.gz
 /kdocker-4.8.tar.gz
+/kdocker-4.9.tar.gz
+/b7653a59160a5043d57a9fbc815479a1ea03f70e.patch
diff --git a/kdocker.spec b/kdocker.spec
index 955ec4d..ab72d04 100644
--- a/kdocker.spec
+++ b/kdocker.spec
@@ -1,38 +1,41 @@
+%global project KDocker
+
 Name:    kdocker
 Summary: Dock any application in the system tray
-Version: 4.8
-Release: 2%{?dist}
+Version: 4.9
+Release: 1%{?dist}
 
 License: GPLv2+
-URL:     https://launchpad.net/%{name}
-Source0: %{url}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+URL:     https://github.com/user-none/%{project}
+Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+# Provide project manual "man page"
+Patch0:  %{url}/commit/b7653a59160a5043d57a9fbc815479a1ea03f70e.patch
 
 BuildRequires: qt4-devel qtsingleapplication-devel
 BuildRequires: libXpm-devel libXmu-devel
-BuildRequires: desktop-file-utils help2man
+BuildRequires: desktop-file-utils
 
 Requires:      hicolor-icon-theme
 
 
 %description
-KDocker will help you dock any application in the system tray. This means you
+%{project} 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 LXQT/KDE and GTK/GNOME (In fact it should work for most
 modern window managers that support NET WM Specification for instance).
 
-All you need to do is start KDocker and select an application using the mouse
+All you need to do is start %{project} and select an application using the mouse
 and lo! the application gets docked into the system tray. The application can
 also be made to disappear from the task bar.
 
 
 %prep
-%setup -q
+%setup -qn%{project}-%{version}
+%patch0 -p1
 
-# use system-copy of qtsingleapplication
-rm -fr solutions/qtsingleapplication
-
-# upstream forgot to bump version: source still has 4.7
-sed -i 's,\(APP_VERSION = "\)4.7,\1%{version},' src/constants.cpp
+# unbundle qtsingleapplication
+rm -fr 3rdparty
 
 
 %build
@@ -40,15 +43,12 @@ sed -i 's,\(APP_VERSION = "\)4.7,\1%{version},' src/constants.cpp
 %{?qmake_qt4:%{qmake_qt4}}%{!?qmake_qt4:%{_qt4_qmake}} CONFIG+=qtsingleapplication
 make %{?_smp_mflags}
 
-# generate manpage
-help2man -o %{name}.1 --no-info --no-discard-stderr --help-option=-h --version-string='%{version}' ./%{name}
-
 
 %install
 make install INSTALL_ROOT=%{buildroot}
 
 mkdir -p %{buildroot}%{_mandir}/man1
-cp -a %{name}.1 %{buildroot}%{_mandir}/man1
+cp -a helpers/%{name}.1 %{buildroot}%{_mandir}/man1
 
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
 mv %{buildroot}%{_datadir}/pixmaps/*.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
@@ -74,7 +74,7 @@ fi
 
 %files
 %license COPYING
-%doc AUTHORS BUGS CREDITS ChangeLog README TODO VERSION
+%doc AUTHORS BUGS CREDITS ChangeLog README.md TODO VERSION
 %{_mandir}/man*/%{name}*
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
@@ -84,35 +84,42 @@ fi
 
 
 %changelog
-* Wed Feb 25 2015 Raphael Groner <projects.rg (AT) smart.ms> - 4.8-2
+* Sat Mar 28 2015 Raphael Groner <%{project}s.rg at smart.ms> - 4.9-1
+- upstream moved to GitHub
+- new version v4.9
+- still use Qt4
+- but support for Qt5 conflicts with our qtsingleapplication R: qt4 (rhbz#)
+- remove help2man in favor of upstream manpage
+
+* Wed Feb 25 2015 Raphael Groner <%{project}s.rg (AT) smart.ms> - 4.8-2
 - fix review issues
 
-* Sun Feb 22 2015 Raphael Groner <projects.rg (AT) smart.ms> - 4.8-1
+* Sun Feb 22 2015 Raphael Groner <%{project}s.rg (AT) smart.ms> - 4.8-1
 - unretire package
 - new upstream release v4.8
 
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedora%{project}.org> - 4.3-3
+- Rebuilt for https://fedora%{project}.org/wiki/Fedora_15_Mass_Rebuild
 
-* Mon Jan 25 2010 Thomas Janssen <thomasj at fedoraproject.org> 4.3-2
+* Mon Jan 25 2010 Thomas Janssen <thomasj at fedora%{project}.org> 4.3-2
 - added BRs
 
-* Wed Jan 20 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3-1
+* Wed Jan 20 2010 Rex Dieter <rdieter at fedora%{project}.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
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedora%{project}.org> - 1.3-13
+- Rebuilt for https://fedora%{project}.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
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedora%{project}.org> - 1.3-12
+- Rebuilt for https://fedora%{project}.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 1.3-11
+* Wed Apr 02 2008 Rex Dieter <rdieter at fedora%{project}.org> 1.3-11
 - BR: qt3-devel
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3-10
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedora%{project}.org> - 1.3-10
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.3-9
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedora%{project}.org> 1.3-9
 - License: GPLv2+
 - respin (BuildID)
 
diff --git a/sources b/sources
index d183219..e19444f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-19bc0a6c9435f57e407c381d7bb2b220  kdocker-4.8.tar.gz
+2460aeb3071d618b0597d2c839e2e932  kdocker-4.9.tar.gz
+87ec1473bbf998814b4372c4912a98cd  b7653a59160a5043d57a9fbc815479a1ea03f70e.patch
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdocker.git/commit/?h=f21&id=a34f30aea0be96c3773254b970013958747c3abc
