[shotwell] Update to 0.15.0pr3
Kalev Lember
kalev at fedoraproject.org
Sun Sep 29 11:46:14 UTC 2013
commit e7eafafc557e8a72fe04ac118a7ab43fce439343
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sun Sep 29 13:43:25 2013 +0200
Update to 0.15.0pr3
.gitignore | 1 +
shotwell-0.14.1-LibRaw.patch | 26 --------------------------
shotwell-0.14.1-video-thumbnailer.patch | 13 -------------
shotwell-usrmove.patch | 13 -------------
shotwell.spec | 26 ++++++++++----------------
sources | 2 +-
6 files changed, 12 insertions(+), 69 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 544454b..bf5be3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/shotwell-0.13.1.tar.xz
/shotwell-0.14.0.tar.xz
/shotwell-0.14.1.tar.xz
+/shotwell-0.15.0pr3.tar.xz
diff --git a/shotwell.spec b/shotwell.spec
index ee6a225..1c4bbfd 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,6 +1,8 @@
+%define pre pr3
+
Name: shotwell
-Version: 0.14.1
-Release: 5%{?dist}
+Version: 0.15.0
+Release: 0.1%{?pre:.%{pre}}%{?dist}
Summary: A photo organizer for the GNOME desktop
Group: Applications/Multimedia
@@ -9,17 +11,9 @@ Group: Applications/Multimedia
License: LGPLv2+ and CC-BY-SA
URL: http://www.yorba.org/shotwell/
#VCS: git:git://yorba.org/shotwell
-Source0: http://www.yorba.org/download/shotwell/0.14/shotwell-%{version}.tar.xz
+Source0: http://www.yorba.org/download/shotwell/0.15/shotwell-%{version}%{?pre}.tar.xz
# http://redmine.yorba.org/issues/3379
Source1: shotwell-icons.tar.bz2
-# Fix installed prefix detection when invoked as /bin/shotwell
-# https://bugzilla.redhat.com/show_bug.cgi?id=812652 and
-# http://redmine.yorba.org/issues/5181
-Patch0: shotwell-usrmove.patch
-Patch1: shotwell-0.14.1-LibRaw.patch
-# See https://bugzilla.redhat.com/show_bug.cgi?id=986574 and
-# http://redmine.yorba.org/issues/7258
-Patch2: shotwell-0.14.1-video-thumbnailer.patch
BuildRequires: vala-devel >= 0.18.0
BuildRequires: desktop-file-utils
@@ -60,10 +54,7 @@ them, and share them with others.
%prep
-%setup -q
-%patch0 -p1 -b .usrmove
-%patch1 -p0 -b .LibRaw
-%patch2 -p1 -b .thumbnailer
+%setup -q -n shotwell-%{version}%{?pre}
%build
@@ -119,7 +110,6 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%doc README COPYING MAINTAINERS NEWS THANKS AUTHORS
%{_bindir}/shotwell
-%{_bindir}/shotwell-video-thumbnailer
%{_libdir}/shotwell
%{_libexecdir}/shotwell
%{_datadir}/shotwell
@@ -131,6 +121,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Sep 29 2013 Kalev Lember <kalevlember at gmail.com> - 0.15.0-0.1.pr3
+- Update to 0.15.0pr3
+- Drop patches that have found their way upstream
+
* Fri Sep 20 2013 Thomas Moschny <thomas.moschny at gmx.de> - 0.14.1-5
- Add patch fixing the video-thumbnailer (rhbz#986574),
thanks to David Woodhouse.
diff --git a/sources b/sources
index ed004cb..edddf08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb5783f9265e1ce2d4c9f354987c3ab1 shotwell-0.14.1.tar.xz
+867f3fef4393b56a80ba6884f4a12ac6 shotwell-0.15.0pr3.tar.xz
More information about the scm-commits
mailing list