[kde-partitionmanager] 1.1.0 release, improve scriptlets/kde4 macro usage, include translations

[Rex Dieter]

commit 3bd90434e43be131dd77d7084c4fbd9f4654a0f6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Jul 10 10:00:18 2014 -0500

    1.1.0 release, improve scriptlets/kde4 macro usage, include translations

 .gitignore                |    1 +
 kde-partitionmanager.spec |   57 ++++++++++++++++++++++++++------------------
 sources                   |    2 +-
 3 files changed, 36 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8ef76bd..d704c50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /*.src.rpm
 /kde-partitionmanager-*.tar.gz
 /kde-partitionmanager-1.0.3-20130815svn.tar.xz
+/partitionmanager-1.1.0.tar.xz
diff --git a/kde-partitionmanager.spec b/kde-partitionmanager.spec
index 7304e98..1edb99f 100644
--- a/kde-partitionmanager.spec
+++ b/kde-partitionmanager.spec
@@ -1,15 +1,20 @@
-%global svn_date 20130815
+#global svn_date 20130815
 %define _hardened_build 1
 
 Name:           kde-partitionmanager
-Version:        1.0.3
-Release:        14.%{svn_date}svn%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        KDE Partition Manager
 
-Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.kde.org/applications/system/kdepartitionmanager/
+%if 0%{?svn_date}
 Source0:        %{name}-%{version}-%{svn_date}svn.tar.xz
+%else
+Source0:        http://download.kde.org/stable/partitionmanager/%{version}/src/partitionmanager-%{version}.tar.xz
+%endif
+# probably better to use https://projects.kde.org/projects/playground/sdk/releaseme
+# now that it is in kde git infrastructure
 Source1:        kdepm-generate-tarball.sh
 # Source built using the following commands : sh kdepm-generate-tarball.sh 20130815
 
@@ -32,10 +37,13 @@ to make use of all features and get full support for all file systems.
 
 
 %prep
-%setup -q
+%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
 
 
 %build
@@ -48,41 +56,44 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
-# %%find_lang partitionmanager --with-kde
+%find_lang partitionmanager --with-kde
 
 # Validate .desktop file
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/*partitionmanager.desktop
 
 
 %post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/sbin/ldconfig
+/bin/touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 %postun
+/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    /bin/touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 fi
 
 %posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 
-# %%files -f partitionmanager.lang
-%files
-%defattr(-,root,root,-)
+%files -f partitionmanager.lang
 %doc README COPYING CHANGES
-%{_kde4_bindir}/partitionmanager*
-%{_kde4_libdir}/*.so
-%{_kde4_libdir}/kde4/*.so
-%{_kde4_datadir}/applications/kde4/%{name}.desktop
-%{_kde4_datadir}/kde4/services/*.desktop
-%{_kde4_datadir}/kde4/servicetypes/*.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*.png
-%{_kde4_datadir}/kde4/apps/partitionmanager
+%{_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
 
 %changelog
+* Thu Jul 10 2014 Rex Dieter <rdieter at fedoraproject.org> 1.1.0-1
+- 1.1.0 release, improve scriptlets/kde4 macro usage, include translations
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-14.20130815svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index cb1ecb5..3ad6c74 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-394bd1746c5fc3333b2adec49701b4a0  kde-partitionmanager-1.0.3-20130815svn.tar.xz
+4a752c250fc5c98e22aba1d2ea309bec  partitionmanager-1.1.0.tar.xz