raphgro pushed to kdocker (master). "5.0-1"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed May 6 19:34:42 UTC 2015


From 3631b534a849ca0d99ad134d715ee8b05aac42e2 Mon Sep 17 00:00:00 2001
From: Raphael Groner <projects.rg at smart.ms>
Date: Wed, 6 May 2015 21:34:28 +0200
Subject: 5.0-1


diff --git a/kdocker.spec b/kdocker.spec
index 88f5d0c..118fa03 100644
--- a/kdocker.spec
+++ b/kdocker.spec
@@ -1,10 +1,12 @@
 %global project KDocker
 
-# Not ready yet, maybe next release -- rex
-# Fedora 21 should keep the legacy Qt4 for now.
-%if 0%{?fedora} >= 22
+# Check if Qt5 is available: Not ready yet, maybe next release -- rex
+%if 0%{?fedora}
+# Fedora 21 and before should keep the legacy Qt4 for now.
+%if %{?fedora} >= 22
 %global with_qt5 1
 %endif
+%endif
 
 Name:    kdocker
 Summary: Dock any application in the system tray
@@ -16,11 +18,16 @@ URL:     https://github.com/user-none/%{project}
 Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 %if 0%{?with_qt5}
-BuildRequires: qt5-qtbase-devel qtsingleapplication-qt5-devel
+BuildRequires: pkgconfig(Qt5)
+BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: qtsingleapplication-qt5-devel
 %else
-BuildRequires: qt4-devel qtsingleapplication-devel
+BuildRequires: qt4-devel
+BuildRequires: qtsingleapplication-devel
 %endif
-BuildRequires: libXpm-devel libXmu-devel
+
+BuildRequires: libXmu-devel
+BuildRequires: libXpm-devel
 BuildRequires: desktop-file-utils
 
 Requires:      hicolor-icon-theme
@@ -84,19 +91,23 @@ fi
 %files
 %license COPYING
 %doc AUTHORS BUGS CREDITS ChangeLog README.md TODO VERSION
-%{_mandir}/man*/%{name}*
-%{_bindir}/%{name}
-%{_datadir}/%{name}/
-%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
+%{_mandir}/man*/*
+%{_bindir}/*
+%config(noreplace) %{_sysconfdir}/bash_completion.d/*
 %{_datadir}/icons/hicolor/128x128/apps/*.png
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/*.desktop
+%{_datadir}/appdata/*.appdata.xml
 
 
 %changelog
 * Wed May 06 2015 Raphael Groner <projects.rg at smart.ms> - 5.0-1
 - bump to version 5.0
 - build for Qt5 where applicable (currently F22+ only)
+- add special BR: pkgconfig(Qt5X11Extras)
 - remove future man patch cause included now in new upstream version
+- remove dedicated datadir folder, not provided any more from latest upstream
+- include appdata file
+- make files section to be more generical
 
 * Tue May 05 2015 Raphael Groner <projects.rg at smart.ms> - 4.9-4
 - update changelog with my correct e-mail address
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdocker.git/commit/?h=master&id=3631b534a849ca0d99ad134d715ee8b05aac42e2


More information about the scm-commits mailing list