Update to 0.15.1

- removed obsolete -libexec.patch

diff --git a/shotwell-libexec.patch b/shotwell-libexec.patch
deleted file mode 100644 (file)
index a4a24c7..0000000
--- a/shotwell-libexec.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -dur -x '*~' shotwell-0.13.1.orig/Makefile shotwell-0.13.1/Makefile
---- shotwell-0.13.1.orig/Makefile      2012-10-08 11:15:07.000000000 +0200
-+++ shotwell-0.13.1/Makefile   2012-10-08 11:17:13.000000000 +0200
-@@ -558,8 +558,8 @@
-       mkdir -p $(DESTDIR)$(PREFIX)/bin
-       $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
-       $(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(PREFIX)/bin
--      mkdir -p $(DESTDIR)$(PREFIX)/libexec/shotwell
--      $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/libexec/shotwell
-+      mkdir -p $(DESTDIR)$(PREFIX)/${LIB}/shotwell
-+      $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/${LIB}/shotwell
-       mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
-       $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
-       mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
-diff -dur -x '*~' shotwell-0.13.1.orig/src/AppDirs.vala shotwell-0.13.1/src/AppDirs.vala
---- shotwell-0.13.1.orig/src/AppDirs.vala      2012-10-05 19:56:07.000000000 +0200
-+++ shotwell-0.13.1/src/AppDirs.vala   2012-10-08 11:18:23.000000000 +0200
-@@ -109,7 +109,7 @@
-                 // not installed yet - use wherever we were run from
-                 libexec_dir = get_exec_dir();
-             } else {
--                libexec_dir = File.new_for_path(Resources.PREFIX + "/libexec/shotwell");
-+                libexec_dir = File.new_for_path(Resources.PREFIX + "/" + Resources.LIB + "/libexec/shotwell");
-             }
-         }
- 

diff --git a/shotwell.spec b/shotwell.spec
index 253950d89a6ef82aa7680a7756d8793c4b8fcfa6..68f77376bffa314d766264e0cbd7bd0c0faf5a6c 100644 (file)
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,31 +1,30 @@
 Summary:       Photo manager for GNOME
 Name:          shotwell
-Version:       0.14.0
+Version:       0.15.1
 Release:       1
 License:       LGPL v2+ and CC-BY-SA
 Group:         X11/Applications
-Source0:       http://yorba.org/download/shotwell/0.14/%{name}-%{version}.tar.xz
-# Source0-md5: 14b8e02091376fa69ac0a04ba61ea608
+Source0:       http://yorba.org/download/shotwell/0.15/%{name}-%{version}.tar.xz
+# Source0-md5: 5af4cfb819249a879a4649a9c7d089e5
 Patch0:                %{name}-cflags.patch
-Patch1:                %{name}-libexec.patch
-Patch2:                %{name}-format_string.patch
+Patch1:                %{name}-format_string.patch
 URL:           http://yorba.org/shotwell/
 # The dependencies are listed in Makefile
+BuildRequires: atk-devel
 BuildRequires: bash
 BuildRequires: gettext-devel
 BuildRequires: gexiv2-devel
 BuildRequires: glib2-devel >= 2.30.0
-BuildRequires: gstreamer-devel >= 0.10.28
-BuildRequires: gstreamer-plugins-base-devel >= 0.10.32
-BuildRequires: gtk+3-devel >= 3.4
+BuildRequires: gstreamer-devel >= 1.0.0
+BuildRequires: gstreamer-plugins-base-devel >= 1.0.0
+BuildRequires: gtk+3-devel >= 3.6
 BuildRequires: gtk-webkit3-devel >= 1.4.0
 BuildRequires: json-glib-devel >= 0.6.16
 BuildRequires: libexif-devel >= 0.6.16
+BuildRequires: libgee-devel >= 0.8.5
 BuildRequires: libgphoto2-devel >= 2.4.2
 BuildRequires: libraw-devel >= 0.14.7-2
 BuildRequires: libsoup-devel >= 2.26.0
-BuildRequires: libunique3-devel >= 3.0.0
-BuildRequires: libusb-compat-devel
 BuildRequires: libxml2-devel >= 1:2.6.32
 BuildRequires: m4
 BuildRequires: pkgconfig
@@ -33,9 +32,9 @@ BuildRequires:        rest-devel >= 0.7
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: sqlite3-devel >= 3.5.9
 BuildRequires: udev-glib-devel >= 145
-BuildRequires: vala >= 1:0.17.2
+BuildRequires: vala >= 1:0.20.1
 BuildRequires: vala-gexiv2 >= 0.4.90
-BuildRequires: vala-libgee0.6 >= 0.6.8
+BuildRequires: vala-libgee >= 0.8.5
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): glib2 >= 1:2.26.0
 Requires(post,postun): gtk-update-icon-cache
@@ -53,13 +52,13 @@ mode, and export them to share with others.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 # this is not autoconf generated
 ./configure \
        --prefix=%{_prefix} \
        --lib=%{_lib} \
+       --libexec=%{_libexecdir} \
        --disable-desktop-update \
        --disable-icon-update
 
@@ -73,9 +72,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/nn{_NO,}
+
+# af_ZA is a duplicate of af
+# id_ID is a duplicate of id
 # ta_IN is a duplicate of ta
 # te_IN is incomplete duplicate of te
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ta_IN,te_IN}
+# tr_TR is incomplete duplicate of tr
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{af_ZA,id_ID,ta_IN,te_IN,tr_TR}
 
 %find_lang shotwell --with-gnome
 %find_lang shotwell-extras
@@ -103,7 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/shotwell*
 %{_desktopdir}/%{name}-viewer.desktop
 %{_desktopdir}/%{name}.desktop
-%attr(755,root,root) %{_libdir}/%{name}/shotwell-settings-migrator
+%attr(755,root,root) %{_libexecdir}/shotwell-settings-migrator
+%attr(755,root,root) %{_libexecdir}/shotwell-video-thumbnailer
+%{_datadir}/appdata/shotwell.appdata.xml
 %{_datadir}/%{name}
 %{_datadir}/GConf/gsettings/*.convert
 %{_datadir}/glib-2.0/schemas/*.gschema.xml