[packages/shotwell] Update to 0.24.1

Fri Oct 21 22:46:38 CEST 2016

commit feaaf12837adb9bcb78edee1d01920b9bb80c23d
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Fri Oct 21 22:45:23 2016 +0200

    Update to 0.24.1
    
    - added link patch to fix build
    - removed obsolete -cflags and -plugins patches

 shotwell-cflags.patch  | 13 ---------
 shotwell-link.patch    | 10 +++++++
 shotwell-plugins.patch | 11 --------
 shotwell.spec          | 75 +++++++++++++++++++++++---------------------------
 4 files changed, 45 insertions(+), 64 deletions(-)
---

diff --git a/shotwell.spec b/shotwell.spec
index d567417..6d3f0a8 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,52 +1,52 @@
 Summary:	Photo manager for GNOME
 Summary(pl.UTF-8):	Zarządca zdjęć dla GNOME
 Name:		shotwell
-Version:	0.22.1
-Release:	2
+Version:	0.24.1
+Release:	1
 License:	LGPL v2+ and CC-BY-SA
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/shotwell/0.22/%{name}-%{version}.tar.xz
-# Source0-md5:	5e7a2849f1ef600036e557848c42401f
-Patch0:		%{name}-cflags.patch
-Patch1:		%{name}-plugins.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/shotwell/0.24/%{name}-%{version}.tar.xz
+# Source0-md5:	b53b86424564d2f94d56621b1a10a8a4
+Patch0:		%{name}-link.patch
 URL:		https://wiki.gnome.org/Apps/Shotwell
-# The dependencies are listed in Makefile
+BuildRequires:	appstream-glib-devel
 BuildRequires:	atk-devel
-BuildRequires:	bash
-BuildRequires:	gettext-tools
+BuildRequires:	autoconf >= 2.69
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	gettext-tools >= 0.19.7
 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.12.2
-BuildRequires:	gtk-webkit3-devel >= 1.4.0
+BuildRequires:	gtk-webkit4-devel
 BuildRequires:	json-glib-devel >= 0.6.16
 BuildRequires:	libexif-devel >= 1:0.6.16
 BuildRequires:	libgee-devel >= 0.8.5
-BuildRequires:	libgphoto2-devel >= 2.4.2
+BuildRequires:	libgphoto2-devel >= 2.5.0
 BuildRequires:	libraw-devel >= 0.14.7-2
 BuildRequires:	libsoup-devel >= 2.26.0
 BuildRequires:	libxml2-devel >= 1:2.6.32
-BuildRequires:	m4
-BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig >= 1:0.22
 BuildRequires:	rest-devel >= 0.7
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	sqlite3-devel >= 3.5.9
 BuildRequires:	udev-glib-devel >= 1:145
-BuildRequires:	vala >= 1:0.20.1
+BuildRequires:	vala >= 1:0.28.0
 BuildRequires:	vala-gexiv2 >= 0.4.90
 BuildRequires:	vala-libgee >= 0.8.5
+BuildRequires:	yelp-tools
 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:	gtk-webkit4
 Requires:	hicolor-icon-theme
 Requires:	libexif >= 1:0.6.16
-Requires:	libgphoto2 >= 2.4.2
+Requires:	libgphoto2 >= 2.5.0
 Requires:	libraw >= 0.14.7-2
 Requires:	libsoup >= 2.26.0
 Requires:	libxml2 >= 1:2.6.32
@@ -69,21 +69,16 @@ pełnoekranowym oraz eksportować, aby podzielić się nimi z innymi.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-# this is not autoconf generated
-./configure \
-	--prefix=%{_prefix} \
-	--lib=%{_lib} \
-	--libexec=%{_libexecdir} \
-	--disable-desktop-update \
-	--disable-icon-update
-
-%{__make} \
-	CC="%{__cc}" \
-	LDFLAGS="%{rpmldflags}"
-	RPMCFLAGS="%{rpmcflags} %{rpmcppflags}"
+%{__aclocal} -I m4
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+%configure \
+	--disable-schemas-compile \
+	--disable-silent-rules
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -91,9 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang shotwell --with-gnome
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/builtin/*.la
 
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/gschemas.compiled
+%find_lang shotwell --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,22 +106,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f shotwell.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING MAINTAINERS NEWS README THANKS
+%doc AUTHORS COPYING NEWS README THANKS
 %attr(755,root,root) %{_bindir}/shotwell
+%attr(755,root,root) %{_libdir}/libshotwell-plugin-common.so*
 %{_desktopdir}/%{name}-viewer.desktop
 %{_desktopdir}/%{name}.desktop
-%attr(755,root,root) %{_libexecdir}/shotwell-settings-migrator
-%attr(755,root,root) %{_libexecdir}/shotwell-video-thumbnailer
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/shotwell/shotwell-settings-migrator
+%attr(755,root,root) %{_libdir}/shotwell/shotwell-video-thumbnailer
 %{_datadir}/appdata/shotwell.appdata.xml
 %{_datadir}/%{name}
-%{_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/*x*/apps/shotwell.svg
-%{_iconsdir}/hicolor/scalable/apps/shotwell.svg
+%{_iconsdir}/hicolor/*x*/apps/shotwell.png
+%{_iconsdir}/hicolor/symbolic/apps/shotwell-symbolic.svg
+%{_mandir}/man1/shotwell.1*
diff --git a/shotwell-cflags.patch b/shotwell-cflags.patch
deleted file mode 100644
index c2f4640..0000000
--- a/shotwell-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- shotwell-0.12.0/Makefile.orig	2012-03-27 22:59:45.000000000 +0200
-+++ shotwell-0.12.0/Makefile	2012-03-28 09:23:30.000000000 +0200
-@@ -424,8 +424,8 @@
- CFLAGS = -O0 -g -pipe
- PLUGIN_CFLAGS = -O0 -g -pipe
- else
--CFLAGS = -O2 -g -pipe
--PLUGIN_CFLAGS = -O2 -g -pipe
-+CFLAGS = $(RPMCFLAGS)
-+PLUGIN_CFLAGS = $(RPMCFLAGS)
- endif
- endif
- 
diff --git a/shotwell-link.patch b/shotwell-link.patch
new file mode 100644
index 0000000..e1547b9
--- /dev/null
+++ b/shotwell-link.patch
@@ -0,0 +1,10 @@
+--- shotwell-0.24.1/Makefile.am.linkfix	2016-10-19 22:21:49.397872380 +0200
++++ shotwell-0.24.1/Makefile.am	2016-10-19 22:22:12.748310043 +0200
+@@ -77,6 +77,7 @@ plugins_common_libshotwell_plugin_common
+ 	-I $(top_srcdir)/plugins -I$(top_builddir)/plugins
+ 
+ plugins_common_libshotwell_plugin_common_la_LIBADD = \
++	src/plugins/libplugin.la \
+ 	$(PLUGIN_LIBS)
+ 
+ plugins/shotwell-plugin-dev-1.0.vapi plugins/shotwell-plugin-dev-1.0.h: src_plugins_libplugin_la_vala.stamp
diff --git a/shotwell-plugins.patch b/shotwell-plugins.patch
deleted file mode 100644
index 6d04728..0000000
--- a/shotwell-plugins.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/feaaf12837adb9bcb78edee1d01920b9bb80c23d

