[kphotoalbum] 4.2-rc2

[Rex Dieter]

commit d232a57074760845a67f071dc7e47a1a00ed1f37
Author: Rex Dieter <rdieter1 at localhost.localdomain>
Date:   Sat Mar 10 14:51:55 2012 -0600

    4.2-rc2

 .gitignore                          |    3 +-
 kphotoalbum-4.1.1-docbook_fix.patch |  236 -----------------------------------
 kphotoalbum-4.1.1-exiv2_021.patch   |   47 -------
 kphotoalbum.spec                    |   34 ++----
 sources                             |    2 +-
 5 files changed, 15 insertions(+), 307 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70dc0a2..fd5c77f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-kphotoalbum-4.1.1.tar.bz2
+/kphotoalbum-4.1.1.tar.bz2
+/kphotoalbum-4.2-rc2.tar.bz2
diff --git a/kphotoalbum.spec b/kphotoalbum.spec
index 4ceda19..ea341fc 100644
--- a/kphotoalbum.spec
+++ b/kphotoalbum.spec
@@ -1,32 +1,29 @@
 
+%define pre rc2
+
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
-Version: 4.1.1
-Release: 15%{?dist}
+Version: 4.2
+Release: 0.1.%{pre}%{?dist}
 
 License: GPLv2+
-Group:   Applications/Multimedia 
 URL:	 http://kphotoalbum.org/
-Source0:  http://kphotoalbum.org/data/download/kphotoalbum-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: ftp://ftp.kde.org/pub/kde/unstable/kphotoalbum/%{version}%{?pre:-%{pre}}/src/kphotoalbum-%{version}%{?pre:-%{pre}}.tar.bz2
 
 ## upstream patches
-Patch100: kphotoalbum-4.1.1-docbook_fix.patch
-# http://websvn.kde.org/?view=revision&revision=1213128
-Patch101: kphotoalbum-4.1.1-exiv2_021.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
+BuildRequires: libjpeg-devel
 BuildRequires: pkgconfig(exiv2)
 BuildRequires: pkgconfig(libkdcraw) >= 0.4.0
 BuildRequires: pkgconfig(libkexiv2) >= 0.5.0
 BuildRequires: pkgconfig(libkipi) >= 0.3.0
 BuildRequires: marble-devel
-BuildRequires: soprano-devel
 
-%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
-Requires: kdeedu-marble%{?_isa}%{?_kde4_version: >= %{_kde4_version}} 
+Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
 
 %description
 A photo album tool. Focuses on three key points:
@@ -36,10 +33,7 @@ A photo album tool. Focuses on three key points:
 
 
 %prep
-%setup -q 
-
-%patch100 -p1
-%patch101 -p4 -b exiv2_021
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 
 %build
@@ -52,8 +46,6 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot}
-
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang %{name} --with-kde
@@ -65,10 +57,6 @@ for dt_file in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
 done
 
 
-%clean
-rm -rf %{buildroot} 
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
@@ -85,7 +73,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
 %{_kde4_bindir}/kphotoalbum
 %{_kde4_appsdir}/kphotoalbum/
@@ -96,6 +83,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Sat Mar 10 2012 Rex Dieter <rdieter at fedoraproject.org> 4.2-0.1.rc2
+- 4.2-rc2
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index cc4e0c1..5039d0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c00a5f179e487ac89fccf8dfb3cd6ef0  kphotoalbum-4.1.1.tar.bz2
+5a2b7f27cffffbff81f3e8e06bb77154  kphotoalbum-4.2-rc2.tar.bz2