X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=Thunar.spec;h=d5e59d10f9b8035e31f077e3560c5dcc73956991;hb=HEAD;hp=49ad7ff67061a8bcb751db0f95f582a1f126826b;hpb=5625ddf3e6f31c0581543ea7cfe899e18c6213ec;p=packages%2FThunar.git

diff --git a/Thunar.spec b/Thunar.spec
index 49ad7ff..d5e59d1 100644
--- a/Thunar.spec
+++ b/Thunar.spec
@@ -1,54 +1,64 @@
 #
 # Conditional build:
-%bcond_without	static_libs	# don't build static library
+%bcond_without	static_libs	# static library
 
-%define		xfce_version	4.12.0
+%define		xfce_version	4.18.0
 Summary:	Xfce file manager
 Summary(pl.UTF-8):	Zarządca plików Xfce
 Name:		Thunar
-Version:	1.8.7
+Version:	4.18.10
 Release:	1
 License:	GPL v2 / LGPL v2
 Group:		X11/Applications
-Source0:	http://archive.xfce.org/src/xfce/thunar/1.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	9abdbc78cbf9957f9727c327476a08c2
+Source0:	https://archive.xfce.org/src/xfce/thunar/4.18/thunar-%{version}.tar.bz2
+# Source0-md5:	5cec04a1c41df73cd146d027fd513ef2
 Patch0:		%{name}-desktop.patch
-URL:		http://thunar.xfce.org/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake >= 1:1.8
-BuildRequires:	dbus-glib-devel >= 0.62
+URL:		https://docs.xfce.org/xfce/thunar/start
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	exo-devel >= 0.12.0
-BuildRequires:	gdk-pixbuf2-devel
+BuildRequires:	exo-devel >= 4.17.0
+BuildRequires:	gdk-pixbuf2-devel >= 2.40.0
 BuildRequires:	gettext-tools
-BuildRequires:	glib2-devel >= 1:2.30.0
-BuildRequires:	gobject-introspection-devel >= 1.30.0
-BuildRequires:	gtk+3-devel >= 3.22.0
-BuildRequires:	gtk-doc >= 1.7
+BuildRequires:	glib2-devel >= 1:2.66.0
+BuildRequires:	gobject-introspection-devel >= 1.66.0
+BuildRequires:	gtk+3-devel >= 3.24.0
+BuildRequires:	gtk-doc >= 1.9
 BuildRequires:	intltool
 BuildRequires:	libexif-devel >= 0.6.0
-BuildRequires:	libgudev-devel
+BuildRequires:	libgudev-devel >= 145
 BuildRequires:	libnotify-devel >= 0.4.0
-BuildRequires:	libtool
-BuildRequires:	libxfce4ui-devel >= 4.12.0
+BuildRequires:	libtool >= 2:2.4
+BuildRequires:	libxfce4ui-devel >= %{xfce_version}
 BuildRequires:	libxfce4util-devel >= %{xfce_version}
 BuildRequires:	pcre-devel >= 6.0
+BuildRequires:	pango-devel >= 1:1.38.0
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.601
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 2.011
 BuildRequires:	startup-notification-devel >= 0.8
 BuildRequires:	xfce4-dev-tools >= %{xfce_version}
 BuildRequires:	xfce4-panel-devel >= %{xfce_version}
 BuildRequires:	xfconf-devel >= %{xfce_version}
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libX11-devel
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk-update-icon-cache
+Requires(post,preun):	systemd-units >= 1:250.1
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	exo >= 0.12.0
-Requires:	gtk-update-icon-cache
+Requires:	exo >= 4.17.0
+Requires:	gdk-pixbuf2 >= 2.40.0
 Requires:	hicolor-icon-theme
+Requires:	libnotify >= 0.4.0
+Requires:	libxfce4ui >= %{xfce_version}
+Requires:	libxfce4util >= %{xfce_version}
+Requires:	pango >= 1:1.38.0
 Requires:	shared-mime-info >= 0.15
+Requires:	systemd-units >= 1:250.1
 Requires:	xfconf >= %{xfce_version}
 Suggests:	tumbler
-Obsoletes:	Thunar-thumbnailers
+Obsoletes:	Thunar-thumbnailers < 0.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -58,27 +68,13 @@ Thunar is a modern file manager, aiming to be easy-to-use and fast.
 Thunar jest nowoczesnym zarządcą plików, nakierowanym na łatwość i
 szybkość użycia.
 
-%package apidocs
-Summary:	Thunar API documentation
-Summary(pl.UTF-8):	Dokumentacja API Thunar
-Group:		Documentation
-Requires:	gtk-doc-common
-Obsoletes:	thunar-vfs-apidocs
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
-
-%description apidocs
-Thunar API documentation.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API Thunar.
-
 %package libs
 Summary:	Thunar libraries
 Summary(pl.UTF-8):	Biblioteki Thunar
 Group:		X11/Libraries
-Obsoletes:	thunar-vfs
+Requires:	glib2 >= 1:2.66.0
+Requires:	gtk+3 >= 3.24.0
+Obsoletes:	thunar-vfs < 1.3
 
 %description libs
 Thunar libraries.
@@ -91,9 +87,9 @@ Summary:	Header files for Thunar libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek Thunar
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	exo-devel >= 0.12.0
-Requires:	gtk+3-devel >= 3.22.0
-Obsoletes:	thunar-vfs-devel
+Requires:	glib2-devel >= 1:2.66.0
+Requires:	gtk+3-devel >= 3.24.0
+Obsoletes:	thunar-vfs-devel < 1.3
 
 %description devel
 This is the package containing the header files for Thunar libraries.
@@ -106,7 +102,7 @@ Summary:	Static Thunar libraries
 Summary(pl.UTF-8):	Statyczne biblioteki Thunar
 Group:		X11/Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
-Obsoletes:	thunar-vfs-static
+Obsoletes:	thunar-vfs-static < 1.3
 
 %description static
 Static Thunar libraries.
@@ -114,13 +110,23 @@ Static Thunar libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki Thunar.
 
-%prep
-%setup -q
-%patch0 -p1
+%package apidocs
+Summary:	Thunar API documentation
+Summary(pl.UTF-8):	Dokumentacja API Thunar
+Group:		Documentation
+Requires:	gtk-doc-common
+Obsoletes:	thunar-vfs-apidocs < 1.3
+BuildArch:	noarch
 
-mkdir -p m4
+%description apidocs
+Thunar API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API Thunar.
 
-%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+%prep
+%setup -q -n thunar-%{version}
+%patch0 -p1
 
 %build
 %{__gtkdocize}
@@ -131,14 +137,11 @@ mkdir -p m4
 %{__autoheader}
 %{__autoconf}
 %configure \
-	--enable-dbus \
 	--enable-exif \
 	--enable-gtk-doc \
-	--enable-pcre \
-	--enable-startup-notification \
-	--with-html-dir=%{_gtkdocdir} \
+	--disable-silent-rules \
 	%{?with_static_libs:--enable-static} \
-	--disable-silent-rules
+	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
 
@@ -151,13 +154,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/*.{a,la}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# duplicate of ur
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ur_PK
+# unify
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{fa_IR,fa}
+# duplicate of hy,ur
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{hy_AM,ur_PK}
+# not supported by glibc (as of 2.37)
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{hye,ie}
 
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/fa_IR
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
-
-%find_lang %{name} --all-name
+%find_lang thunar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -165,6 +169,10 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %update_desktop_database_post
 %update_icon_cache hicolor
+%systemd_user_post thunar.service
+
+%preun
+%systemd_user_preun thunar.service
 
 %postun
 %update_desktop_database_postun
@@ -173,43 +181,45 @@ rm -rf $RPM_BUILD_ROOT
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files -f thunar.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS ChangeLog NEWS THANKS
+%attr(755,root,root) %{_bindir}/Thunar
+%attr(755,root,root) %{_bindir}/thunar
+%attr(755,root,root) %{_bindir}/thunar-settings
 %dir %{_sysconfdir}/xdg/Thunar
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/Thunar/*.xml
 %dir %{_libdir}/Thunar
-%attr(755,root,root) %{_libdir}/Thunar/ThunarBulkRename
 %attr(755,root,root) %{_libdir}/Thunar/thunar-sendto-email
 %dir %{_libdir}/thunarx-3
-%attr(755,root,root) %{_libdir}/thunarx-3/*.so
+%attr(755,root,root) %{_libdir}/thunarx-3/thunar-*.so
 %attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libthunar-tpa.so
 
 %{systemduserunitdir}/thunar.service
-%{_libdir}/girepository-1.0/Thunarx-3.0.typelib
+%{_datadir}/dbus-1/services/org.xfce.FileManager.service
+%{_datadir}/dbus-1/services/org.xfce.Thunar.service
+%{_datadir}/dbus-1/services/org.xfce.Thunar.FileManager1.service
 %{_datadir}/metainfo/org.xfce.thunar.appdata.xml
 %{_datadir}/polkit-1/actions/org.xfce.thunar.policy
-%{_datadir}/Thunar/sendto/*.desktop
-%{_datadir}/xfce4/panel/plugins/*.desktop
-%{_datadir}/dbus-1/services/*.service
-%{_desktopdir}/*.desktop
-%{_iconsdir}/hicolor/*/*/*
-%{_pixmapsdir}/Thunar
-%{_mandir}/man1/Thunar*
-
-%dir %{_docdir}/Thunar
+%{_datadir}/Thunar/sendto/thunar-sendto-email.desktop
+%{_datadir}/xfce4/panel/plugins/thunar-tpa.desktop
+%{_desktopdir}/thunar.desktop
+%{_desktopdir}/thunar-bulk-rename.desktop
+%{_desktopdir}/thunar-settings.desktop
+%{_iconsdir}/hicolor/*x*/apps/org.xfce.thunar.png
+%{_iconsdir}/hicolor/*x*/stock/navigation/stock_folder-*.png
+%{_iconsdir}/hicolor/scalable/apps/org.xfce.thunar.svg
+%{_mandir}/man1/Thunar.1*
+
+%dir %{_docdir}/thunar
 # move it to proper place
-%{_docdir}/Thunar/README*
-
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/thunarx
+%{_docdir}/thunar/README*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libthunarx-3.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libthunarx-3.so.0
+%{_libdir}/girepository-1.0/Thunarx-3.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
@@ -223,3 +233,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libthunarx-3.a
 %endif
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/thunar
+%{_gtkdocdir}/thunarx