- updated to 1.5; uses meson now

diff --git a/frogr.spec b/frogr.spec
index 5515d17cc0cdd7782512540255913523aad0ac88..10194cade43ab2239ed7553ccd3b36e596070260 100644 (file)
--- a/frogr.spec
+++ b/frogr.spec
@@ -1,32 +1,36 @@
 Summary:       Frogr - Flickr Remote Organizer for GNOME
 Summary(pl.UTF-8):     Frogr - zdalny organizator Flickra dla GNOME
 Name:          frogr
-Version:       1.3
+Version:       1.5
 Release:       1
 License:       GPL v3
 Group:         X11/Applications/Graphics
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/frogr/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 53f1214c61d0bc50ac1740b0bde0ae95
+# Source0-md5: 75fb406ca54310d74c7bbbb9ddefaef1
 URL:           https://wiki.gnome.org/Apps/Frogr
 BuildRequires: gettext-tools >= 0.19.7
 BuildRequires: glib2-devel >= 1:2.44
 BuildRequires: gstreamer-devel >= 1.0
-BuildRequires: gtk+3-devel >= 3.12
-BuildRequires: json-glib-devel >= 0.12
+BuildRequires: gtk+3-devel >= 3.16
+BuildRequires: json-glib-devel >= 1.2
 BuildRequires: libexif-devel >= 1:0.6.14
 BuildRequires: libgcrypt-devel >= 1.5.0
 BuildRequires: libsoup-devel >= 2.34
 BuildRequires: libxml2-devel >= 1:2.6.8
+BuildRequires: meson
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRequires: yelp-tools
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
 Requires:      glib2 >= 1:2.44
-Requires:      gtk+3 >= 3.12
+Requires:      gtk+3 >= 3.16
 Requires:      hicolor-icon-theme
-Requires:      json-glib >= 0.12
+Requires:      json-glib >= 1.2
 Requires:      libexif >= 1:0.6.14
 Requires:      libgcrypt >= 1.5.0
 Requires:      libsoup >= 2.34
@@ -44,17 +48,18 @@ zarządzanie swoimi kontami w serwisie zdjęciowym Flickr.
 %prep
 %setup -q
 
+# build fails on deprecated glib functions, disable -Werror
+%{__sed} -i -e "/'werror=true'/d" meson.build
+
 %build
-%configure \
-       --disable-silent-rules
+%meson build
 
-%{__make}
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %find_lang %{name} --with-gnome
 
@@ -69,13 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog MAINTAINERS NEWS README THANKS TRANSLATORS
+%doc AUTHORS MAINTAINERS NEWS README THANKS TRANSLATORS
 %attr(755,root,root) %{_bindir}/frogr
 %{_datadir}/frogr
-%{_datadir}/appdata/org.gnome.frogr.appdata.xml
+%{_datadir}/metainfo/org.gnome.frogr.appdata.xml
 %{_desktopdir}/org.gnome.frogr.desktop
 %{_iconsdir}/hicolor/*x*/apps/org.gnome.frogr.png
 %{_iconsdir}/hicolor/scalable/apps/org.gnome.frogr.svg
 %{_iconsdir}/hicolor/scalable/apps/org.gnome.frogr-symbolic.svg
-%{_pixmapsdir}/frogr.xpm
 %{_mandir}/man1/frogr.1*