- updated to 0.30.7

- removed outdated patches

diff --git a/shotwell-gitversion.patch b/shotwell-gitversion.patch
deleted file mode 100644 (file)
index 0008e00..0000000
--- a/shotwell-gitversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- shotwell-0.26.1/configure.ac.gitver        2017-04-15 15:26:08.372007826 +0200
-+++ shotwell-0.26.1/configure.ac       2017-04-15 15:26:19.075341151 +0200
-@@ -13,7 +13,7 @@ m4_define([api_version],[major_version])
- 
- AX_IS_RELEASE([git-directory])
- 
--m4_define([git_version],[m4_esyscmd(git rev-parse HEAD 2>/dev/null)])
-+m4_define([git_version],[])
- 
- dnl ***********************************************************************
- dnl Initialize autoconf

diff --git a/shotwell-link.patch b/shotwell-link.patch
deleted file mode 100644 (file)
index e1547b9..0000000
--- a/shotwell-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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.spec b/shotwell.spec
index 0dbb143f2a30a58aa90bbbea94682327e46dca15..ae1838296d1c4893bd3cd6a3d4d4f2731a8bb309 100644 (file)
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -1,68 +1,68 @@
 #
 # Conditional build:
+%bcond_with    apport  # Ubuntu apport hook
+%bcond_without opencv  # faces detection using OpenCV
 %bcond_with    unity   # Ubuntu Unity integration
 #
 Summary:       Photo manager for GNOME
 Summary(pl.UTF-8):     Zarządca zdjęć dla GNOME
 Name:          shotwell
-Version:       0.26.2
+Version:       0.30.7
 Release:       1
 License:       LGPL v2+ and CC-BY-SA
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/shotwell/0.26/%{name}-%{version}.tar.xz
-# Source0-md5: 37a7b1c54242a8cbd00b85785b5941bd
-Patch0:                %{name}-link.patch
-Patch1:                %{name}-gitversion.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/shotwell/0.30/%{name}-%{version}.tar.xz
+# Source0-md5: 8aae653b07cb4661765c2a87af224587
 URL:           https://wiki.gnome.org/Apps/Shotwell
-BuildRequires: appstream-glib-devel
-BuildRequires: atk-devel
-BuildRequires: autoconf >= 2.69
-BuildRequires: automake >= 1:1.11
 BuildRequires: cairo-devel
-BuildRequires: gcr-devel
-BuildRequires: gcr-ui-devel
-BuildRequires: gdk-pixbuf2-devel
+BuildRequires: gcr-devel >= 3
+BuildRequires: gcr-ui-devel >= 3
+BuildRequires: gdk-pixbuf2-devel >= 2.0
 BuildRequires: gettext-tools >= 0.19.7
-BuildRequires: gexiv2-devel >= 0.10.4
+BuildRequires: gexiv2-devel >= 0.11
 BuildRequires: glib2-devel >= 1:2.40.0
-BuildRequires: gnome-doc-utils
 BuildRequires: gstreamer-devel >= 1.0.0
 BuildRequires: gstreamer-plugins-base-devel >= 1.0.0
-BuildRequires: gtk+3-devel >= 3.14.0
-BuildRequires: gtk-webkit4-devel
-BuildRequires: json-glib-devel >= 0.6.16
+BuildRequires: gtk+3-devel >= 3.22
+BuildRequires: gtk-webkit4-devel >= 2.4
+BuildRequires: json-glib-devel >= 1.0
 BuildRequires: libexif-devel >= 1:0.6.16
 BuildRequires: libgdata-devel
 BuildRequires: libgee-devel >= 0.8.5
 BuildRequires: libgphoto2-devel >= 2.5.0
 BuildRequires: libraw-devel >= 0.14.7-2
 BuildRequires: libsoup-devel >= 2.26.0
-BuildRequires: libtool >= 2:2.2
 %{?with_unity:BuildRequires:   libunity-devel}
 BuildRequires: libxml2-devel >= 1:2.6.32
+BuildRequires: meson >= 0.43.0
+BuildRequires: ninja >= 1.5
+%{?with_opencv:BuildRequires:  opencv-devel >= 1:2.3.0}
 BuildRequires: pkgconfig >= 1:0.22
-BuildRequires: rest-devel >= 0.7
-BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: sqlite3-devel >= 3.5.9
 BuildRequires: udev-glib-devel >= 1:145
 BuildRequires: vala >= 2:0.28.0
-BuildRequires: vala-gexiv2 >= 0.4.90
+BuildRequires: vala-gcr >= 3
+BuildRequires: vala-gexiv2 >= 0.11
 BuildRequires: vala-libgee >= 0.8.5
 BuildRequires: yelp-tools
 Requires(post,postun): desktop-file-utils
-Requires(post,postun): glib2 >= 1:2.32.0
+Requires(post,postun): glib2 >= 1:2.40.0
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
-Requires:      gexiv2 >= 0.10.4
+Requires:      gexiv2 >= 0.11
 Requires:      glib2 >= 1:2.40.0
-Requires:      gtk+3 >= 3.14.0
-Requires:      gtk-webkit4
+Requires:      gtk+3 >= 3.22
+Requires:      gtk-webkit4 >= 2.4
 Requires:      hicolor-icon-theme
+Requires:      json-glib >= 1.0
 Requires:      libexif >= 1:0.6.16
+Requires:      libgee >= 0.8.5
 Requires:      libgphoto2 >= 2.5.0
 Requires:      libraw >= 0.14.7-2
 Requires:      libsoup >= 2.26.0
 Requires:      libxml2 >= 1:2.6.32
+%{?with_opencv:Requires:       opencv >= 1:2.3.0}
 Requires:      sqlite3 >= 3.5.9
 Requires:      udev-glib >= 1:145
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -81,32 +81,23 @@ pełnoekranowym oraz eksportować, aby podzielić się nimi z innymi.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-
-# force rebuild without _GITVERSION
-%{__rm} src/Resources.c
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --disable-schemas-compile \
-       --disable-silent-rules \
-       %{?with_unity:--enable-unity-support}
-%{__make}
+%meson build \
+       --default-library=shared \
+       %{?with_opencv:-Dface-detection=true} \
+       %{!?with_apport:-Dinstall-apport-hook=false} \
+       %{?with_unity:-Dunity-support=true}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/builtin/*.la
+# API not exported, so no need for development symlinks
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libshotwell-*.so
 
 %find_lang shotwell --with-gnome
 
@@ -114,32 +105,53 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
 %update_icon_cache hicolor
 %update_desktop_database
 %glib_compile_schemas
 
 %postun
+/sbin/ldconfig
 %update_icon_cache hicolor
 %update_desktop_database_postun
 %glib_compile_schemas
 
 %files -f shotwell.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING NEWS README THANKS
+%doc AUTHORS COPYING MAINTAINERS NEWS README.md THANKS
 %attr(755,root,root) %{_bindir}/shotwell
-%attr(755,root,root) %{_libdir}/libshotwell-authenticator.so*
-%attr(755,root,root) %{_libdir}/libshotwell-plugin-common.so*
-%{_desktopdir}/%{name}-viewer.desktop
-%{_desktopdir}/%{name}.desktop
+%attr(755,root,root) %{_libdir}/libshotwell-authenticator.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libshotwell-authenticator.so.0
+%attr(755,root,root) %{_libdir}/libshotwell-plugin-common.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libshotwell-plugin-common.so.0
+%attr(755,root,root) %{_libdir}/libshotwell-plugin-dev-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libshotwell-plugin-dev-1.0.so.0
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/%{name}
+%endif
+%if %{with opencv}
+%attr(755,root,root) %{_libexecdir}/%{name}/shotwell-facedetect
+%endif
+%attr(755,root,root) %{_libexecdir}/%{name}/shotwell-settings-migrator
+%attr(755,root,root) %{_libexecdir}/%{name}/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}/glib-2.0/schemas/org.yorba.shotwell.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/plugins/builtin
-%attr(755,root,root) %{_libdir}/%{name}/plugins/builtin/*.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/builtin/libshotwell-publishing.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/builtin/libshotwell-publishing-extras.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/builtin/libshotwell-transitions.so
+%if %{with opencv}
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/facedetect-haarcascade.xml
+%endif
+%if %{with apport}
+%{_datadir}/apport/package-hooks/shotwell.py
+%endif
+%{_datadir}/glib-2.0/schemas/org.yorba.shotwell.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
+%{_datadir}/metainfo/shotwell.appdata.xml
+%{_desktopdir}/shotwell.desktop
+%{_desktopdir}/shotwell-viewer.desktop
 %{_iconsdir}/hicolor/*x*/apps/shotwell.png
 %{_iconsdir}/hicolor/symbolic/apps/shotwell-symbolic.svg
 %{_mandir}/man1/shotwell.1*