[packages/file-roller] - updated to 3.32.2 - added packages patch (add some PLD-specific package matches)

[qboosh]

commit ff3191690ec00ca6295efcced3dc8d491d7f9273
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Nov 15 18:48:46 2019 +0100

    - updated to 3.32.2
    - added packages patch (add some PLD-specific package matches)

 file-roller-packages.patch | 24 +++++++++++++++++++
 file-roller.spec           | 60 ++++++++++++++++++----------------------------
 2 files changed, 47 insertions(+), 37 deletions(-)
---
diff --git a/file-roller.spec b/file-roller.spec
index d580af6..2c13c83 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -6,31 +6,33 @@ Summary:	An archive manager for GNOME
 Summary(pl.UTF-8):	Zarządca archiwów dla GNOME
 Summary(pt_BR.UTF-8):	Gerenciador de arquivos compactados para o GNOME
 Name:		file-roller
-Version:	3.24.1
+Version:	3.32.2
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.24/%{name}-%{version}.tar.xz
-# Source0-md5:	1e6be71792c7a8e4950297e9fdcf33e7
-URL:		http://www.gnome.org/
-BuildRequires:	autoconf >= 2.68
-BuildRequires:	automake >= 1:1.11
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.32/%{name}-%{version}.tar.xz
+# Source0-md5:	e79715bb2400df83c0f67cc0cce2b655
+Patch0:		%{name}-packages.patch
+URL:		https://wiki.gnome.org/Apps/FileRoller
 BuildRequires:	desktop-file-utils
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.36.0
 BuildRequires:	gtk+3-devel >= 3.13.3
-BuildRequires:	intltool >= 0.50.1
 BuildRequires:	json-glib-devel >= 0.14.0
 BuildRequires:	libarchive-devel >= 3.0.0
 BuildRequires:	libmagic-devel
 BuildRequires:	libnotify-devel >= 0.4.3
 BuildRequires:	libtool >= 2:2
 BuildRequires:	libxml2-progs
+BuildRequires:	meson >= 0.43
 %{?with_nautilus:BuildRequires:	nautilus-devel >= 3.0.0}
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.601
+BuildRequires:	rpmbuild(macros) >= 1.736
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildRequires:	yelp-tools
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	glib2 >= 1:2.36.0
@@ -51,8 +53,6 @@ Suggests:	unrar
 %endif
 Suggests:	tar
 Suggests:	zip
-# sr at Latn vs. sr at latin
-Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -115,31 +115,18 @@ plików GNOME).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	%{!?with_nautilus:--disable-nautilus-actions} \
-	--disable-schemas-compile \
-	--disable-silent-rules \
-	--disable-static
-
-%{__make}
+%meson build
+
+%ninja_build -C build \
+	%{!?with_nautilus:-Dnautilus-actions=false}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-%if %{with nautilus}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
-%endif
+%ninja_install -C build
 
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr at ije,sr at ijekavian}
 
@@ -160,20 +147,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog MAINTAINERS NEWS README README_COMMANDLINE
+%doc AUTHORS MAINTAINERS NEWS README README_COMMANDLINE
 %attr(755,root,root) %{_bindir}/file-roller
-%dir %{_libdir}/file-roller
-%attr(755,root,root) %{_libdir}/file-roller/isoinfo.sh
-%attr(755,root,root) %{_libdir}/file-roller/rpm2cpio
-%{_datadir}/GConf/gsettings/file-roller.convert
-%{_datadir}/appdata/org.gnome.FileRoller.appdata.xml
+%dir %{_libexecdir}/file-roller
+%attr(755,root,root) %{_libexecdir}/file-roller/isoinfo.sh
+%attr(755,root,root) %{_libexecdir}/file-roller/rpm2cpio
 %{_datadir}/dbus-1/services/org.gnome.FileRoller.service
 %{_datadir}/dbus-1/services/org.gnome.FileRoller.ArchiveManager1.service
 %{_datadir}/file-roller
 %{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml
+%{_datadir}/metainfo/org.gnome.FileRoller.appdata.xml
 %{_desktopdir}/org.gnome.FileRoller.desktop
-%{_iconsdir}/hicolor/*x*/apps/file-roller.png
-%{_iconsdir}/hicolor/scalable/apps/file-roller-symbolic.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.ArchiveManager.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.ArchiveManager-symbolic.svg
 
 %if %{with nautilus}
 %files -n nautilus-extension-file-roller
diff --git a/file-roller-packages.patch b/file-roller-packages.patch
new file mode 100644
index 0000000..27458ea
--- /dev/null
+++ b/file-roller-packages.patch
@@ -0,0 +1,24 @@
+--- file-roller-3.32.2/data/packages.match.orig	2019-09-09 20:42:41.000000000 +0200
++++ file-roller-3.32.2/data/packages.match	2019-11-15 16:16:16.405840102 +0100
+@@ -5,17 +5,17 @@
+ bzip2=
+ cpio=
+ dpkg=
+-genisoimage=
++genisoimage=cdrkit-mkisofs
+ gzip=
+ lha=
+ lrzip=
+ lzip=
+-lzma=
++lzma=xz
+ lzop=
+ ncompress=
+ p7zip=
+-p7zip-full=
+-p7zip-rar=
++p7zip-full=p7zip
++p7zip-rar=p7zip
+ rar=
+ rpm=
+ rzip=
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/file-roller.git/commitdiff/ff3191690ec00ca6295efcced3dc8d491d7f9273