Update to 3.28.0

diff --git a/simple-scan.spec b/simple-scan.spec
index 054f56580c836cb02b37cc4d58cb95356c1368f2..1e9ce7b7b1ca7d674a0cc51615c54c61d82d918c 100644 (file)
--- a/simple-scan.spec
+++ b/simple-scan.spec
@@ -1,11 +1,11 @@
 Summary:       Simple scanning utility
 Name:          simple-scan
-Version:       3.18.1
+Version:       3.28.0
 Release:       1
 License:       GPL v3+
 Group:         Applications/Multimedia
-Source0:       https://launchpad.net/simple-scan/3.18/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5: 269634eb3e5c17733413cf9f9bfb170e
+Source0:       https://download.gnome.org/sources/simple-scan/3.28/%{name}-%{version}.tar.xz
+# Source0-md5: 1313de249d70d7fc844ef485603f4977
 URL:           https://launchpad.net/simple-scan
 BuildRequires: PackageKit-devel
 BuildRequires: autoconf
@@ -14,17 +14,21 @@ BuildRequires:      cairo-devel
 BuildRequires: colord-devel
 BuildRequires: gdk-pixbuf2-devel
 BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.32.0
+BuildRequires: glib2-devel >= 1:2.38.0
 BuildRequires: gnome-common
 BuildRequires: gnome-doc-utils
-BuildRequires: gtk+3-devel >= 3.0.0
-BuildRequires: intltool >= 0.40.0
-BuildRequires: libgusb-devel
+BuildRequires: gtk+3-devel >= 3.12.0
+BuildRequires: itstool
+BuildRequires: libgusb-devel >= 0.2.7
 BuildRequires: libjpeg-devel
+BuildRequires: libwebp-devel
+BuildRequires: meson >= 0.37.1
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.198
 BuildRequires: sane-backends-devel
 BuildRequires: vala >= 2:0.22.0
+BuildRequires: vala-colord
+BuildRequires: vala-libgusb
 BuildRequires: yelp-tools
 BuildRequires: zlib-devel
 Requires(post,postun): glib2 >= 1:2.26.0
@@ -41,20 +45,13 @@ appropriate format.
 %setup -q
 
 %build
-%{__intltoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure \
-       --disable-schemas-compile \
-       --disable-silent-rules
-%{__make}
+%meson build
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
 
 %find_lang %{name} --with-gnome
 
@@ -73,6 +70,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/simple-scan
 %{_mandir}/man1/simple-scan.1*
 %{_desktopdir}/simple-scan.desktop
-%{_datadir}/appdata/simple-scan.appdata.xml
+%{_datadir}/metainfo/simple-scan.appdata.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.SimpleScan.gschema.xml
 %{_datadir}/simple-scan