[kphotoalbum] 4.5-1

[Rex Dieter]

commit 48555c246bcec271bd896528eed483e04ca9eb50
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Jul 16 16:18:42 2014 -0500

    4.5-1
    
    - kphotoalbum-4.5
    - trim changelog
    - update License
    - improve scriptlets

 .gitignore                             |    3 +-
 kphotoalbum-4.3-mplayer_warning.patch  |   57 --------------------------------
 kphotoalbum-4.3-xdg_picturesPath.patch |   21 ------------
 kphotoalbum.spec                       |   34 ++++++++++++-------
 sources                                |    2 +-
 5 files changed, 23 insertions(+), 94 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8789b5..7ca3d6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kphotoalbum-4.3.tar.bz2
-/kphotoalbum-4.4.tar.bz2
+/kphotoalbum-4.5.tar.xz
diff --git a/kphotoalbum.spec b/kphotoalbum.spec
index 9af218f..7c15c64 100644
--- a/kphotoalbum.spec
+++ b/kphotoalbum.spec
@@ -1,19 +1,21 @@
 
+# trim changelog included in binary rpms
+%global _changelog_trimtime %(date +%s -d "1 year ago")
 
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
-Version: 4.4
-Release: 9%{?dist}
+Version: 4.5
+Release: 1%{?dist}
+
+# KDE e.V. may determine that future GPL versions are accepted
+License: (GPLv2 or GPLv3) and GFDL
 
-License: GPLv2+
 URL:	 http://kphotoalbum.org/
-Source0: http://download.kde.org/%{?pre:un}stable/kphotoalbum/%{version}%{?pre:-%{pre}}/src/kphotoalbum-%{version}%{?pre:-%{pre}}.tar.bz2
+Source0: http://download.kde.org/%{?pre:un}stable/kphotoalbum/%{version}%{?pre:-%{pre}}/src/kphotoalbum-%{version}%{?pre:-%{pre}}.tar.xz
 
 ## upstreamable patches
 # disable mention of mplayer (which we can't ship), and needless scary warnings
-Patch50:  kphotoalbum-4.3-mplayer_warning.patch
-# default to xdg picturesPath instead of hard-coded ~/Images
-Patch51: kphotoalbum-4.3-xdg_picturesPath.patch
+Patch50:  kphotoalbum-4.5-mplayer_warning.patch
 
 ## upstream patches
 
@@ -41,7 +43,6 @@ A photo album tool. Focuses on three key points:
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 %patch50 -p1 -b .mplayer_warning
-%patch51 -p1 -b .xdg_picturesPath
 
 
 %build
@@ -66,22 +67,23 @@ done
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
 
 
 %files -f %{name}.lang
-%doc ChangeLog COPYING README TODO
+%doc COPYING COPYING.DOC
+%doc ChangeLog README
 %{_kde4_bindir}/kpa-backup.sh
 %{_kde4_bindir}/kphotoalbum
 %{_kde4_bindir}/open-raw.pl
@@ -94,6 +96,12 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Wed Jul 16 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.5-1
+- kphotoalbum-4.5
+- trim changelog
+- update License
+- improve scriptlets
+
 * Mon Jul 14 2014 Rex Dieter <rdieter at fedoraproject.org> 4.4-9
 - rebuild (marble)
 
diff --git a/sources b/sources
index 50d862e..dfb94dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84cc7741c8e8c62e097ebb5e81d40979  kphotoalbum-4.4.tar.bz2
+5947e380b490e532bdcbdb43c06640eb  kphotoalbum-4.5.tar.xz