rdieter pushed to kphotoalbum (master). "4.6.1"

[notifications at fedoraproject.org]

>From c64b59e927c5f55f1206b52de6ec8f6b08ffa29c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 15 Apr 2015 21:58:44 -0500
Subject: 4.6.1


diff --git a/.gitignore b/.gitignore
index 7ca3d6f..90e15a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kphotoalbum-4.5.tar.xz
+/kphotoalbum-4.6.1.tar.xz
diff --git a/kphotoalbum-4.6.1-gcc5.patch b/kphotoalbum-4.6.1-gcc5.patch
new file mode 100644
index 0000000..674120e
--- /dev/null
+++ b/kphotoalbum-4.6.1-gcc5.patch
@@ -0,0 +1,12 @@
+diff -up kphotoalbum-4.6.1/ImageManager/VideoThumbnails.cpp.gcc kphotoalbum-4.6.1/ImageManager/VideoThumbnails.cpp
+--- kphotoalbum-4.6.1/ImageManager/VideoThumbnails.cpp.gcc	2015-03-17 23:28:37.000000000 -0500
++++ kphotoalbum-4.6.1/ImageManager/VideoThumbnails.cpp	2015-04-15 21:51:28.671045728 -0500
+@@ -44,7 +44,7 @@ void ImageManager::VideoThumbnails::setV
+         return;
+ 
+     cancelPreviousJobs();
+-    m_pendingRequest = nullptr;
++    m_pendingRequest = false;
+     for ( int i= 0; i < 10; ++i )
+         m_cache[i] = QImage();
+ 
diff --git a/kphotoalbum.spec b/kphotoalbum.spec
index f884db7..6335b12 100644
--- a/kphotoalbum.spec
+++ b/kphotoalbum.spec
@@ -4,8 +4,8 @@
 
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
-Version: 4.5
-Release: 4%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: (GPLv2 or GPLv3) and GFDL
@@ -16,6 +16,8 @@ Source0: http://download.kde.org/%{?pre:un}stable/kphotoalbum/%{version}%{?pre:-
 ## upstreamable patches
 # disable mention of mplayer (which we can't ship), and needless scary warnings
 Patch50:  kphotoalbum-4.5-mplayer_warning.patch
+# fix FTBFS using gcc5
+Patch51: kphotoalbum-4.6.1-gcc5.patch
 
 ## upstream patches
 
@@ -23,15 +25,15 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
 BuildRequires: libjpeg-devel
+BuildREquires: marble-widget-devel
 BuildRequires: pkgconfig(exiv2)
 BuildRequires: pkgconfig(libkdcraw) >= 0.4.0
 BuildRequires: pkgconfig(libkexiv2) >= 0.5.0
+BuildRequires: pkgconfig(libkface)
+BuildRequires: pkgconfig(libkgeomap)
 BuildRequires: pkgconfig(libkipi) >= 0.3.0
-BuildRequires: marble-devel
 
 Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
-# with kde-14.12, cannot rely on this versioned dep anymore -- rex
-#Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
 
 %description
 A photo album tool. Focuses on three key points:
@@ -41,13 +43,11 @@ A photo album tool. Focuses on three key points:
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
-
-%patch50 -p1 -b .mplayer_warning
+%autosetup -p1 %{?pre:-n %{name}-%{version}%{?pre:-%{pre}}}
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -81,7 +81,6 @@ fi
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
 
-
 %files -f %{name}.lang
 %doc COPYING COPYING.DOC
 %doc ChangeLog README
@@ -97,6 +96,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Wed Apr 15 2015 Rex Dieter <rdieter at fedoraproject.org> 4.6.1-1
+- 4.6.1
+
 * Wed Dec 10 2014 Rex Dieter <rdieter at fedoraproject.org> 4.5-4
 - rebuild (marble)
 
diff --git a/sources b/sources
index dfb94dc..a99516e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5947e380b490e532bdcbdb43c06640eb  kphotoalbum-4.5.tar.xz
+a19c90ffd0c9bb388aa056855d95a377  kphotoalbum-4.6.1.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kphotoalbum.git/commit/?h=master&id=c64b59e927c5f55f1206b52de6ec8f6b08ffa29c