[packages/shotwell] - updated to 0.22.0 - added plugins patch (don't use -nostdlib when linking plugins)
qboosh
qboosh at pld-linux.org
Sat Nov 14 14:54:58 CET 2015
commit 4124c1b6a4bce4b366133371f966ea5c74e8f9fd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Nov 14 14:55:19 2015 +0100
- updated to 0.22.0
- added plugins patch (don't use -nostdlib when linking plugins)
shotwell-plugins.patch | 11 +++++++++++
shotwell.spec | 49 +++++++++++++++++++++++++++++++++++--------------
2 files changed, 46 insertions(+), 14 deletions(-)
---
diff --git a/shotwell.spec b/shotwell.spec
index 0fd32b0..91de09d 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,25 +1,28 @@
Summary: Photo manager for GNOME
+Summary(pl.UTF-8): Zarządca zdjęć dla GNOME
Name: shotwell
-Version: 0.20.2
-Release: 2
+Version: 0.22.0
+Release: 1
License: LGPL v2+ and CC-BY-SA
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/shotwell/0.20/%{name}-%{version}.tar.xz
-# Source0-md5: 0adb93edba5832c6572e2c851c5c920f
+Source0: http://ftp.gnome.org/pub/GNOME/sources/shotwell/0.22/%{name}-%{version}.tar.xz
+# Source0-md5: 18421a67a1b859caf8542777a42b9ce3
Patch0: %{name}-cflags.patch
-URL: http://www.yorba.org/projects/shotwell/
+Patch1: %{name}-plugins.patch
+URL: https://wiki.gnome.org/Apps/Shotwell
# The dependencies are listed in Makefile
BuildRequires: atk-devel
BuildRequires: bash
BuildRequires: gettext-tools
-BuildRequires: gexiv2-devel
-BuildRequires: glib2-devel >= 2.32.0
+BuildRequires: gexiv2-devel >= 0.4.90
+BuildRequires: glib2-devel >= 1:2.32.0
+BuildRequires: gnome-doc-utils
BuildRequires: gstreamer-devel >= 1.0.0
BuildRequires: gstreamer-plugins-base-devel >= 1.0.0
-BuildRequires: gtk+3-devel >= 3.6
+BuildRequires: gtk+3-devel >= 3.12.2
BuildRequires: gtk-webkit3-devel >= 1.4.0
BuildRequires: json-glib-devel >= 0.6.16
-BuildRequires: libexif-devel >= 0.6.16
+BuildRequires: libexif-devel >= 1:0.6.16
BuildRequires: libgee-devel >= 0.8.5
BuildRequires: libgphoto2-devel >= 2.4.2
BuildRequires: libraw-devel >= 0.14.7-2
@@ -30,7 +33,7 @@ BuildRequires: pkgconfig
BuildRequires: rest-devel >= 0.7
BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: sqlite3-devel >= 3.5.9
-BuildRequires: udev-glib-devel >= 145
+BuildRequires: udev-glib-devel >= 1:145
BuildRequires: vala >= 1:0.20.1
BuildRequires: vala-gexiv2 >= 0.4.90
BuildRequires: vala-libgee >= 0.8.5
@@ -38,7 +41,17 @@ Requires(post,postun): desktop-file-utils
Requires(post,postun): glib2 >= 1:2.26.0
Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
+Requires: glib2 >= 1:2.32.0
+Requires: gtk+3 >= 3.12.2
+Requires: gtk-webkit3 >= 1.4.0
Requires: hicolor-icon-theme
+Requires: libexif >= 1:0.6.16
+Requires: libgphoto2 >= 2.4.2
+Requires: libraw >= 0.14.7-2
+Requires: libsoup >= 2.26.0
+Requires: libxml2 >= 1:2.6.32
+Requires: sqlite3 >= 3.5.9
+Requires: udev-glib >= 1:145
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -47,9 +60,16 @@ environment. It allows you to import photos from disk or camera,
organize them in various ways, view them in full-window or fullscreen
mode, and export them to share with others.
+%description -l pl.UTF-8
+Shotwell to organizator zdjęć cyfrowych, zaprojektowany dla środowiska
+graficznego GNOME. Pozwala importować zdjęcia z dysku lub aparatu,
+organizować je na różne sposoby, przeglądać w trybie okienkowym lub
+pełnoekranowym oraz eksportować, aby podzielić się nimi z innymi.
+
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
# this is not autoconf generated
@@ -90,19 +110,20 @@ rm -rf $RPM_BUILD_ROOT
%files -f shotwell.lang
%defattr(644,root,root,755)
%doc AUTHORS COPYING MAINTAINERS NEWS README THANKS
-%attr(755,root,root) %{_bindir}/shotwell*
+%attr(755,root,root) %{_bindir}/shotwell
%{_desktopdir}/%{name}-viewer.desktop
%{_desktopdir}/%{name}.desktop
%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
+%{_datadir}/GConf/gsettings/shotwell.convert
+%{_datadir}/glib-2.0/schemas/org.yorba.shotwell.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
%dir %{_libdir}/%{name}/plugins/builtin
%{_libdir}/%{name}/plugins/builtin/*.png
%{_libdir}/%{name}/plugins/builtin/*.glade
%attr(755,root,root) %{_libdir}/%{name}/plugins/builtin/*.so
-%{_iconsdir}/hicolor/*/*/*.svg
+%{_iconsdir}/hicolor/*/apps/shotwell.svg
diff --git a/shotwell-plugins.patch b/shotwell-plugins.patch
new file mode 100644
index 0000000..6d04728
--- /dev/null
+++ b/shotwell-plugins.patch
@@ -0,0 +1,11 @@
+--- shotwell-0.22.0/plugins/Makefile.plugin.mk.orig 2014-03-04 23:54:12.000000000 +0100
++++ shotwell-0.22.0/plugins/Makefile.plugin.mk 2015-11-14 13:16:28.847457997 +0100
+@@ -34,7 +34,7 @@
+ CFILES := $(notdir $(SRC_FILES:.vala=.c))
+ OFILES := $(notdir $(SRC_FILES:.vala=.o))
+
+-CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
++CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)` -export-dynamic $(PLUGIN_CFLAGS)
+ LIBS := `pkg-config --print-errors --libs $(EXT_PKGS) $(PLUGIN_PKGS)`
+ DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/shotwell.git/commitdiff/4124c1b6a4bce4b366133371f966ea5c74e8f9fd
More information about the pld-cvs-commit
mailing list