- updated to 43.4 (gtk4 now; last version of nautilus 3 copied to nautilus3.spec)

diff --git a/nautilus.spec b/nautilus.spec
index bd86f16faaf1253ae6960537c942c071b1652ef3..8d94479f59481cf2b9f3b92042df633abc29f825 100644 (file)
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,47 +1,40 @@
+# TODO: switch to gtk4-update-icon-cache
 #
 # Conditinal build:
 %bcond_without apidocs         # disable API documentation
-%bcond_without libportal       # xdg-desktop-portals integration
 %bcond_without selinux         # SELinux context support in file properties dialog
 
-%ifarch alpha ia64 m68k parisc parisc64 sh4 sparc sparcv9 sparc64
-%define        use_seccomp     0
-%else
-%define        use_seccomp     1
-%endif
 Summary:       Nautilus is a file manager for the GNOME desktop environment
 Summary(pl.UTF-8):     Nautilus - powłoka GNOME i zarządca plików
 Summary(pt_BR.UTF-8):  Nautilus é um gerenciador de arquivos para o GNOME
 Name:          nautilus
-Version:       42.6
+Version:       43.4
 Release:       1
 License:       GPL v3+
 Group:         X11/Applications
-Source0:       https://download.gnome.org/sources/nautilus/42/%{name}-%{version}.tar.xz
-# Source0-md5: beaf60362666263abca992d00ab9df9b
+Source0:       https://download.gnome.org/sources/nautilus/43/%{name}-%{version}.tar.xz
+# Source0-md5: da5de70bf385f7570653b1302494adbc
 URL:           https://wiki.gnome.org/Apps/Files
-BuildRequires: docbook-dtd412-xml
 # -std=c11
 BuildRequires: gcc >= 6:4.7
+BuildRequires: gdk-pixbuf2-devel >= 2.30.0
 BuildRequires: gettext-tools >= 0.19.7
 BuildRequires: gexiv2-devel >= 0.14.0
-BuildRequires: glib2-devel >= 1:2.67.1
+BuildRequires: glib2-devel >= 1:2.72.0
 BuildRequires: gnome-autoar-devel >= 0.4.0
-BuildRequires: gnome-desktop-devel >= 3.0.0
+BuildRequires: gnome-desktop4-devel >= 43
 BuildRequires: gobject-introspection-devel >= 0.6.4
 BuildRequires: gsettings-desktop-schemas-devel >= 3.8.0
 BuildRequires: gstreamer-plugins-base-devel >= 1.0
-BuildRequires: gtk+3-devel >= 3.22.27
-BuildRequires: gtk-doc >= 1.10
-BuildRequires: libhandy1-devel >= 1.5.0
-%{?with_libportal:BuildRequires:       libportal-devel >= 0.5}
-%{?with_libportal:BuildRequires:       libportal-gtk3-devel >= 0.5}
-%if %{use_seccomp}
-BuildRequires: libseccomp-devel
-%endif
+BuildRequires: gtk4-devel >= 4.7.2
+%{?with_apidocs:BuildRequires: gi-docgen}
+BuildRequires: libadwaita-devel >= 1.2
+BuildRequires: libcloudproviders-devel >= 0.3.1
+BuildRequires: libportal-devel >= 0.5
+BuildRequires: libportal-gtk4-devel >= 0.5
 %{?with_selinux:BuildRequires: libselinux-devel >= 2.0}
 BuildRequires: libxml2-devel >= 1:2.7.8
-BuildRequires: meson >= 0.49.0
+BuildRequires: meson >= 0.59.0
 BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.6
@@ -50,20 +43,21 @@ BuildRequires:      tar >= 1:1.22
 BuildRequires: tracker3-devel >= 3.0
 # for tests
 #BuildRequires:        tracker3-testutils >= 3.0
-BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xz
 Requires(post,postun): desktop-file-utils
-Requires(post,postun): glib2 >= 1:2.67.1
+Requires(post,postun): glib2 >= 1:2.72.0
 Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      gdk-pixbuf2 >= 2.30.0
 Requires:      gexiv2 >= 0.14.0
-Requires:      glib2 >= 1:2.67.1
+Requires:      glib2 >= 1:2.72.0
 Requires:      gnome-autoar >= 0.4.0
 Requires:      gsettings-desktop-schemas >= 3.8.0
 Requires:      gvfs >= 1.16.0
 Requires:      hicolor-icon-theme
-Requires:      libhandy1 >= 1.5.0
-%{?with_libportal:Requires:    libportal >= 0.3}
+Requires:      libadwaita >= 1.2
+Requires:      libcloudproviders >= 0.3.1
+Requires:      libportal >= 0.5
 Requires:      libxml2 >= 1:2.7.8
 Requires:      tracker3 >= 3.0
 Requires:      tracker3-miners >= 3.0
@@ -71,8 +65,10 @@ Provides:    gnome-volume-manager
 Obsoletes:     eel < 2.21
 Obsoletes:     gnome-volume-manager < 2.23
 Obsoletes:     gstreamer-player-nautilus < 0.9
+Obsoletes:     nautilus-extension-console < 43
 Obsoletes:     nautilus-gtkhtml < 0.4
 Obsoletes:     nautilus-media < 0.9
+Obsoletes:     nautilus-sendto < 3.9
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -93,8 +89,8 @@ O nautilus é um excelente gerenciador de arquivos para o GNOME.
 Summary:       Nautilus libraries
 Summary(pl.UTF-8):     Biblioteki Nautilusa
 Group:         X11/Libraries
-Requires:      glib2 >= 1:2.67.1
-Requires:      gtk+3 >= 3.22.27
+Requires:      glib2 >= 1:2.72.0
+Requires:      gtk4 >= 4.7.2
 
 %description libs
 Nautilus libraries.
@@ -108,8 +104,8 @@ Summary(pl.UTF-8):  Pliki nagłówkowe do tworzenia komponentów dla Nautilusa
 Summary(pt_BR.UTF-8):  Bibliotecas e arquivos para desenvolvimento com o nautilus
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.67.1
-Requires:      gtk+3-devel >= 3.22.27
+Requires:      glib2-devel >= 1:2.72.0
+Requires:      gtk4-devel >= 4.7.2
 Obsoletes:     eel-devel < 2.21
 Obsoletes:     nautilus-static < 3.26
 
@@ -143,7 +139,6 @@ Dokumentacja API Nautilusa.
 %build
 %meson build \
        -Ddocs=%{__true_false apidocs} \
-       %{!?with_libportal:-Dlibportal=false} \
        -Dpackagekit=true \
        %{?with_selinux:-Dselinux=true} \
        -Dtests=none
@@ -157,7 +152,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@ije,sr@ijekavian}
 # not supported by glibc
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/io
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ie,io}
+
+%if %{with apidocs}
+# FIXME: where to package gi-docgen generated docs?
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/nautilus $RPM_BUILD_ROOT%{_gtkdocdir}
+%endif
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -185,10 +186,9 @@ fi
 %attr(755,root,root) %{_bindir}/nautilus
 %attr(755,root,root) %{_bindir}/nautilus-autorun-software
 %dir %{_libdir}/nautilus
-%dir %{_libdir}/nautilus/extensions-3.0
-%attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libnautilus-image-properties.so
-%attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libnautilus-sendto.so
-%attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libtotem-properties-page.so
+%dir %{_libdir}/nautilus/extensions-4
+%attr(755,root,root) %{_libdir}/nautilus/extensions-4/libnautilus-image-properties.so
+%attr(755,root,root) %{_libdir}/nautilus/extensions-4/libtotem-properties-page.so
 %{_datadir}/metainfo/org.gnome.Nautilus.appdata.xml
 %{_datadir}/dbus-1/services/org.freedesktop.FileManager1.service
 %{_datadir}/dbus-1/services/org.gnome.Nautilus.service
@@ -211,19 +211,18 @@ fi
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnautilus-extension.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnautilus-extension.so.1
-%{_libdir}/girepository-1.0/Nautilus-3.0.typelib
+%attr(755,root,root) %{_libdir}/libnautilus-extension.so.4
+%{_libdir}/girepository-1.0/Nautilus-4.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnautilus-extension.so
 %{_includedir}/nautilus
-%{_datadir}/gir-1.0/Nautilus-3.0.gir
-%{_pkgconfigdir}/libnautilus-extension.pc
+%{_datadir}/gir-1.0/Nautilus-4.0.gir
+%{_pkgconfigdir}/libnautilus-extension-4.pc
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/libnautilus-extension
+%{_gtkdocdir}/nautilus
 %endif