mattia pushed to kde-partitionmanager (master). "Update to 1.2.1, port to kf5 (..more)"

[notifications at fedoraproject.org]

>From 2f86e1fcce4da25d83e7b538f256309a0149c105 Mon Sep 17 00:00:00 2001
From: Mattia Verga <mattia.verga at tiscali.it>
Date: Sun, 5 Apr 2015 09:56:59 +0200
Subject: Update to 1.2.1, port to kf5 License changed to GPLv3


diff --git a/kde-partitionmanager.spec b/kde-partitionmanager.spec
index ab7ceee..d640a19 100644
--- a/kde-partitionmanager.spec
+++ b/kde-partitionmanager.spec
@@ -2,11 +2,11 @@
 %define _hardened_build 1
 
 Name:           kde-partitionmanager
-Version:        1.1.1
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        KDE Partition Manager
 
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://www.kde.org/applications/system/kdepartitionmanager/
 %if 0%{?svn_date}
 Source0:        %{name}-%{version}-%{svn_date}svn.tar.xz
@@ -18,10 +18,16 @@ Source0:        http://download.kde.org/stable/partitionmanager/%{version}/src/p
 Source1:        kdepm-generate-tarball.sh
 # Source built using the following commands : sh kdepm-generate-tarball.sh 20130815
 
-BuildRequires:  parted-devel, libblkid-devel, libatasmart-devel, kdelibs4-devel, gettext, cmake, desktop-file-utils
+#Patch to fix config file name, upstream KDE bug 345857
+Patch0:		partitionmanager_config.patch
+
+BuildRequires:  parted-devel, libblkid-devel, libatasmart-devel, gettext, cmake, desktop-file-utils
+BuildRequires:	kf5-rpm-macros, kf5-kconfig-devel, kf5-kcrash-devel, kf5-ki18n-devel, kf5-kxmlgui-devel, kf5-kio-devel, kf5-kdoctools-devel
+BuildRequires:	qt5-qtbase-devel
+BuildRequires:	extra-cmake-modules
+
 Requires:       parted, e2fsprogs
-# Require kde-filesystem
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+Requires:	kf5-filesystem
 
 %description
 KDE Partition Manager is a utility program to help you manage the disk devices,
@@ -39,18 +45,13 @@ to make use of all features and get full support for all file systems.
 %prep
 %setup -q -n partitionmanager-%{version}
 
-## Due to the name change
-## this is already under kde4/ subdir, no need to change further imho -- rex
-%if 0%{?fedora} && 0%{?fedora} < 21
-mv src/partitionmanager.desktop src/kde-partitionmanager.desktop
-sed -i 's,partitionmanager.desktop,kde-partitionmanager.desktop,' src/CMakeLists.txt
-%endif
+%patch0 -p1
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -61,37 +62,43 @@ make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 %find_lang partitionmanager --with-kde
 
 # Validate .desktop file
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/*partitionmanager.desktop
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/*partitionmanager.desktop
 
 
 %post
 /sbin/ldconfig
-/bin/touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %posttrans
-/usr/bin/gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f partitionmanager.lang
-%doc README COPYING CHANGES
-%{_kde4_bindir}/partitionmanager
-%{_kde4_libdir}/libpartitionmanager*.so
-%{_kde4_libdir}/kde4/pm*backendplugin.so
-%{_kde4_datadir}/applications/kde4/*partitionmanager.desktop
-%{_kde4_datadir}/kde4/services/pm*backendplugin.desktop
-%{_kde4_datadir}/kde4/servicetypes/pm*backendplugin.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/partitionmanager/
-%{_datadir}/appdata/partitionmanager.appdata.xml
+%doc README CHANGES
+%license COPYING.GPL3
+%{_kf5_bindir}/partitionmanager
+%{_kf5_libdir}/libpartitionmanager*.so
+%{_kf5_qtplugindir}/libpm*.so
+%{_kf5_datadir}/applications/*PartitionManager.desktop
+%{_kf5_datadir}/kservices5/pm*backendplugin.desktop
+%{_kf5_datadir}/kservicetypes5/pm*backendplugin.desktop
+%{_kf5_datadir}/partitionmanager/
+%{_kf5_datadir}/config.kcfg/partitionmanager.kcfg
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/appdata/PartitionManager.appdata.xml
 
 %changelog
+* Sun Apr 05 2015 Mattia Verga <mattia.verga at tiscali.it> - 1.2.1-1
+- 1.2.1 release, port to kf5
+- License changed to GPLv3
+
 * Sun Feb 22 2015 Mattia Verga <mattia.verga at tiscali.it> - 1.1.1-1
 - 1.1.1 release
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kde-partitionmanager.git/commit/?h=master&id=2f86e1fcce4da25d83e7b538f256309a0149c105