[shotwell] Update to 0.13.0.

Thomas Moschny thm at fedoraproject.org
Thu Sep 20 17:30:11 UTC 2012 

commit 10d1d1f4a977772f12e60c91cfc0c4f619a55fec
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Sep 20 19:25:50 2012 +0200

    Update to 0.13.0.
    
    - Remove patches applied upstream.
    - Add BR on json-glib.
    - Add runtime dependency on dconf.

 .gitignore                         |    1 +
 shotwell-0.12.3-libgphoto25.patch  | 1814 ------------------------------------
 shotwell-0.12.3-valac-0.17.2.patch |   39 -
 shotwell-0.13.0-po.patch           |   44 +
 shotwell.spec                      |   26 +-
 sources                            |    2 +-
 6 files changed, 63 insertions(+), 1863 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be2f0f1..0b07216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /shotwell-0.12.1.tar.bz2
 /shotwell-0.12.2.tar.bz2
 /shotwell-0.12.3.tar.bz2
+/shotwell-0.13.0.tar.xz
diff --git a/shotwell-0.13.0-po.patch b/shotwell-0.13.0-po.patch
new file mode 100644
index 0000000..f2131c9
--- /dev/null
+++ b/shotwell-0.13.0-po.patch
@@ -0,0 +1,44 @@
+--- a/po/shotwell-core/de.po	2012-09-20 15:17:29.643325659 +0200
++++ b/po/shotwell-core/de.po	2012-09-20 15:20:23.949407927 +0200
+@@ -63,7 +63,7 @@ msgstr "Shotwell Fotobetrachter"
+ 
+ # GNOME Application Keywords
+ msgid "Camera;Picture;Photo;"
+-msgstr "Kamera;Bild;Foto"
++msgstr "Kamera;Bild;Foto;"
+ 
+ #: src/AppWindow.vala:54
+ msgid "Pin Toolbar"
+--- a/po/shotwell-core/es.po	2012-09-20 15:17:39.399330665 +0200
++++ b/po/shotwell-core/es.po	2012-09-20 15:20:43.014415975 +0200
+@@ -56,7 +56,7 @@ msgstr "Visor de fotos Shotwell"
+ 
+ # GNOME Application Keywords
+ msgid "Camera;Picture;Photo;"
+-msgstr "Cámara;Imagen;Foto"
++msgstr "Cámara;Imagen;Foto;"
+ 
+ #: src/AppWindow.vala:54
+ msgid "Pin Toolbar"
+--- a/po/shotwell-core/ar.po	2012-09-20 15:17:34.671328264 +0200
++++ b/po/shotwell-core/ar.po	2012-09-20 15:20:35.297412707 +0200
+@@ -57,7 +57,7 @@ msgstr "عارض الصور شُتْ‌Ù
+ 
+ # GNOME Application Keywords
+ msgid "Camera;Picture;Photo;"
+-msgstr "كاميرا;صورة;صور"
++msgstr "كاميرا;صورة;صور;"
+ 
+ #: src/AppWindow.vala:54
+ msgid "Pin Toolbar"
+--- a/po/shotwell-core/zh_TW.po	2012-09-20 15:18:02.161342289 +0200
++++ b/po/shotwell-core/zh_TW.po	2012-09-20 15:20:56.816421703 +0200
+@@ -50,7 +50,7 @@ msgstr "Shotwell 相片檢視器"
+ 
+ # GNOME Application Keywords
+ msgid "Camera;Picture;Photo;"
+-msgstr "相機;圖片;相片;攝影"
++msgstr "相機;圖片;相片;攝影;"
+ 
+ #: src/AppWindow.vala:54
+ msgid "Pin Toolbar"
diff --git a/shotwell.spec b/shotwell.spec
index 34a0349..c926266 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,6 +1,6 @@
 Name:           shotwell
-Version:        0.12.3
-Release:        5%{?dist}
+Version:        0.13.0
+Release:        1%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -9,17 +9,15 @@ 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.12/shotwell-%{version}.tar.bz2
+Source0:        http://www.yorba.org/download/shotwell/0.13/shotwell-%{version}.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
-# Allow compilation with (and require) Vala 0.17.2
-# http://redmine.yorba.org/issues/5453
-Patch1:         shotwell-0.12.3-valac-0.17.2.patch
-Patch2:         shotwell-0.12.3-libgphoto25.patch
+# http://redmine.yorba.org/issues/5860
+Patch1:         shotwell-0.13.0-po.patch
 
 BuildRequires:  vala-devel >= 0.17.2
 BuildRequires:  LibRaw-devel
@@ -33,6 +31,7 @@ BuildRequires:  pkgconfig(gstreamer-base-0.10)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libgphoto2)
 BuildRequires:  pkgconfig(libsoup-2.4)
@@ -42,6 +41,9 @@ BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(unique-3.0)
 BuildRequires:  pkgconfig(webkitgtk-3.0)
 
+# used by shotwell-settings-migrator
+Requires:       dconf
+
 %description
 Shotwell is a new open source photo organizer designed for the GNOME desktop
 environment. It allows you to import photos from your camera, view and edit
@@ -50,8 +52,7 @@ them, and share them with others.
 %prep
 %setup -q
 %patch0 -p1 -b .usrmove
-%patch1 -p1 -b .vala-0.17.2
-%patch2 -p1 -b .libgphoto25
+%patch1 -p1
 
 %build
 ./configure \
@@ -103,6 +104,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 %doc README COPYING MAINTAINERS NEWS THANKS AUTHORS
 %{_bindir}/shotwell
 %{_bindir}/shotwell-video-thumbnailer
+%{_bindir}/shotwell-settings-migrator
 %{_libdir}/shotwell
 %{_datadir}/shotwell
 %{_datadir}/applications/shotwell.desktop
@@ -113,6 +115,12 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Sep 20 2012 Thomas Moschny <thomas.moschny at gmx.de> - 0.13.0-1
+- Update to 0.13.0.
+- Remove patches applied upstream.
+- Add BR on json-glib.
+- Add runtime dependency on dconf.
+
 * Tue Aug 21 2012 Jindrich Novy <jnovy at redhat.com> - 0.12.3-5
 - add patch to fix build against libgphoto2-2.5.0, thanks to Clinton Rogers
   (http://redmine.yorba.org/issues/5553)
diff --git a/sources b/sources
index bfbea09..9863dc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de0e05350f8a7d557092489baf14d039  shotwell-0.12.3.tar.bz2
+c1c3e6744e830b4db38219bb470ade4e  shotwell-0.13.0.tar.xz

More information about the scm-commits mailing list