- updated to 43.0; nautilus plugin has been ported to nautilus 4 API (43+)

diff --git a/file-roller-packages.patch b/file-roller-packages.patch
index 27458eaf7956922aced2e75e8ef00433ff0c4c33..5aa9f73ad71678be5b0cf7ca26c14ef64469f54f 100644 (file)
--- a/file-roller-packages.patch
+++ b/file-roller-packages.patch
@@ -1,6 +1,16 @@
---- 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 @@
+--- file-roller-43.0/data/packages.match.orig  2023-05-18 22:57:11.319556933 +0200
++++ file-roller-43.0/data/packages.match       2023-05-18 22:59:06.448933223 +0200
+@@ -1,20 +1,20 @@
+ [Package Matches]
+-7zip=
+-7zip-full=
+-7zip-rar=
++7zip=p7zip
++7zip-full=p7zip
++7zip-rar=p7zip
+ arj=
+ binutils=
+ brotli=
  bzip2=
  cpio=
  dpkg=
@@ -9,16 +19,10 @@
  gzip=
  lha=
  lrzip=
+ lz4=
  lzip=
 -lzma=
 +lzma=xz
  lzop=
  ncompress=
- p7zip=
--p7zip-full=
--p7zip-rar=
-+p7zip-full=p7zip
-+p7zip-rar=p7zip
  rar=
- rpm=
- rzip=

diff --git a/file-roller.spec b/file-roller.spec
index 0576a3377a4f8e38672ad9f7bfc590f291bac4a6..cfa97daee7d27c8e0e16a939dcafa8f025e8e567 100644 (file)
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -1,31 +1,36 @@
 #
 # Conditional build:
+%bcond_with    apidocs         # API documentation (API not packaged, so disabled for now)
+%bcond_without libportal       # native app chooser via libportal
 %bcond_without nautilus        # Nautilus extension
 #
 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.42.0
+Version:       43.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       https://download.gnome.org/sources/file-roller/3.42/%{name}-%{version}.tar.xz
-# Source0-md5: c7564ff0532df8b7379a46c895ab4fcd
+Source0:       https://download.gnome.org/sources/file-roller/43/%{name}-%{version}.tar.xz
+# Source0-md5: fd743c77f1af1934a9eac7e7b1688219
 Patch0:                %{name}-packages.patch
 URL:           https://wiki.gnome.org/Apps/FileRoller
+BuildRequires: cpio
 BuildRequires: desktop-file-utils
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-tools
+%{?with_apidocs:BuildRequires: gi-docgen >= 2021.1}
 BuildRequires: glib2-devel >= 1:2.38
+BuildRequires: gobject-introspection-devel
 BuildRequires: gtk+3-devel >= 3.22.0
 BuildRequires: json-glib-devel >= 0.14.0
 BuildRequires: libarchive-devel >= 3.2.0
 BuildRequires: libhandy1-devel >= 1.5.0
-BuildRequires: libnotify-devel >= 0.4.3
-BuildRequires: libxml2-progs
-BuildRequires: meson >= 0.50
-%{?with_nautilus:BuildRequires:        nautilus-devel >= 3.28.0}
+%{?with_libportal:BuildRequires:       libportal-devel >= 0.5}
+%{?with_libportal:BuildRequires:       libportal-gtk3-devel >= 0.5}
+BuildRequires: meson >= 0.59
+%{?with_nautilus:BuildRequires:        nautilus-devel >= 43}
 BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
@@ -42,8 +47,8 @@ Requires:     hicolor-icon-theme
 Requires:      json-glib >= 0.14.0
 Requires:      libarchive >= 3.2.0
 Requires:      libhandy1 >= 1.5.0
-Requires:      libnotify >= 0.4.3
 Suggests:      bzip2
+Suggests:      cpio
 Suggests:      gzip
 Suggests:      p7zip
 %ifarch %{ix86}
@@ -103,7 +108,7 @@ Summary:    File Roller (archive manager) extension for Nautilus (GNOME file manage
 Summary(pl.UTF-8):     Rozszerzenie File Roller (zarządca archiwów) Nautilusa (zarządcy plików GNOME)
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
-Requires:      nautilus >= 3.28.0
+Requires:      nautilus >= 43
 
 %description -n nautilus-extension-file-roller
 File Roller (archive manager) extension for Nautilus (GNOME file
@@ -118,10 +123,13 @@ plików GNOME).
 %patch0 -p1
 
 %build
-%meson build
+%meson build \
+       %{?with_apidocs:-Dapi_docs=enabled} \
+       -Dintrospection=enabled \
+       %{!?with_nautilus:-Dnautilus-actions=disabled} \
+       %{!?with_libportal:-Duse_native_appchooser=false}
 
-%ninja_build -C build \
-       %{!?with_nautilus:-Dnautilus-actions=false}
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -158,12 +166,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml
 %{_datadir}/metainfo/org.gnome.FileRoller.appdata.xml
 %{_desktopdir}/org.gnome.FileRoller.desktop
-%{_iconsdir}/hicolor/scalable/apps/org.gnome.ArchiveManager.svg
-%{_iconsdir}/hicolor/scalable/apps/org.gnome.ArchiveManager.Devel.svg
-%{_iconsdir}/hicolor/symbolic/apps/org.gnome.ArchiveManager-symbolic.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.FileRoller.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.FileRoller.Devel.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.FileRoller-symbolic.svg
 
 %if %{with nautilus}
 %files -n nautilus-extension-file-roller
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libnautilus-fileroller.so
+%attr(755,root,root) %{_libdir}/nautilus/extensions-4/libnautilus-fileroller.so
 %endif