- up to 4.18.0

diff --git a/Thunar-desktop.patch b/Thunar-desktop.patch
index 59d44c4d839bdc3f86cd650fee48fe9f55c7a251..bcd221ae2a3b6a0d07fd0e0f88d5dbeb34dc4812 100644 (file)
--- a/Thunar-desktop.patch
+++ b/Thunar-desktop.patch
@@ -1,35 +1,29 @@
-diff -urN Thunar-1.2.0/thunar/thunar-settings.desktop.in Thunar-1.2.0.new//thunar/thunar-settings.desktop.in
---- Thunar-1.2.0/thunar/thunar-settings.desktop.in     2011-01-16 16:02:11.000000000 +0000
-+++ Thunar-1.2.0.new//thunar/thunar-settings.desktop.in        2011-01-30 12:56:28.076666636 +0000
-@@ -7,4 +7,5 @@
+--- thunar-4.17.11/thunar/thunar-settings.desktop.in~  2022-10-28 20:37:00.000000000 +0000
++++ thunar-4.17.11/thunar/thunar-settings.desktop.in   2022-11-13 01:56:14.435826939 +0000
+@@ -8,4 +8,5 @@
  Terminal=false
  Type=Application
  Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
 +OnlyShowIn=XFCE;
  StartupNotify=true
-diff -urN Thunar-1.2.0/thunar-bulk-rename.desktop.in.in Thunar-1.2.0.new//thunar-bulk-rename.desktop.in.in
---- Thunar-1.2.0/thunar-bulk-rename.desktop.in.in      2011-01-16 16:02:11.000000000 +0000
-+++ Thunar-1.2.0.new//thunar-bulk-rename.desktop.in.in 2011-01-30 12:53:15.139999548 +0000
+--- thunar-4.17.11/thunar-bulk-rename.desktop.in.in~   2022-10-28 20:37:00.000000000 +0000
++++ thunar-4.17.11/thunar-bulk-rename.desktop.in.in    2022-11-13 01:59:55.452316194 +0000
 @@ -8,4 +8,5 @@
  Terminal=false
  StartupNotify=true
  Type=Application
--Categories=System;Utility;Core;GTK;Filesystem;
+-Categories=Utility;Core;GTK;Filesystem;
 +Categories=XFCE;System;Utility;Core;GTK;Filesystem;
 +OnlyShowIn=XFCE;
- 
- # vi:set encoding=UTF-8:
-diff -urN Thunar-1.2.0/thunar.desktop.in.in Thunar-1.2.0.new//thunar.desktop.in.in
---- Thunar-1.2.0/thunar.desktop.in.in  2011-01-16 16:02:11.000000000 +0000
-+++ Thunar-1.2.0.new//thunar.desktop.in.in     2011-01-30 12:55:39.470000167 +0000
+--- thunar-4.17.11/thunar.desktop.in.in~       2022-10-28 20:37:00.000000000 +0000
++++ thunar-4.17.11/thunar.desktop.in.in        2022-11-13 02:01:54.252563463 +0000
 @@ -8,7 +8,8 @@
  Terminal=false
  StartupNotify=true
  Type=Application
--Categories=System;Utility;Core;GTK;FileTools;FileManager;
+-Categories=System;Core;GTK;FileTools;FileManager;
 +Categories=XFCE;System;Utility;Core;GTK;FileTools;FileManager;
 +OnlyShowIn=XFCE;
  MimeType=inode/directory;
  Actions=open-home;open-computer;open-trash;
  
- # vi:set emcoding=UTF-8:

diff --git a/Thunar.spec b/Thunar.spec
index 5ea8cc612c4c1490bcac52f7192187888560f4da..d30908176ad1b851e2ddb1e811f39ca8c4773531 100644 (file)
--- a/Thunar.spec
+++ b/Thunar.spec
@@ -2,18 +2,18 @@
 # Conditional build:
 %bcond_without static_libs     # don't build static library
 
-%define                xfce_version    4.16.0
+%define                xfce_version    4.18.0
 Summary:       Xfce file manager
 Summary(pl.UTF-8):     Zarządca plików Xfce
 Name:          Thunar
-Version:       4.16.11
+Version:       4.18.0
 Release:       1
 License:       GPL v2 / LGPL v2
 Group:         X11/Applications
-Source0:       http://archive.xfce.org/src/xfce/thunar/4.16/thunar-%{version}.tar.bz2
-# Source0-md5: 2c439fc00b3e312a7d697c383403bddf
+Source0:       https://archive.xfce.org/src/xfce/thunar/4.18/thunar-%{version}.tar.bz2
+# Source0-md5: 5beec0a224ef65b8d89b4dc0ce3bff53
 Patch0:                %{name}-desktop.patch
-URL:           http://thunar.xfce.org/
+URL:           https://thunar.xfce.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.8
 BuildRequires: dbus-glib-devel >= 0.62
@@ -21,7 +21,7 @@ BuildRequires:        docbook-dtd412-xml
 BuildRequires: exo-devel >= 4.15.3
 BuildRequires: gdk-pixbuf2-devel
 BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.50.0
+BuildRequires: glib2-devel >= 1:2.66.0
 BuildRequires: gobject-introspection-devel >= 1.30.0
 BuildRequires: gtk+3-devel >= 3.22.0
 BuildRequires: gtk-doc >= 1.7
@@ -30,7 +30,7 @@ BuildRequires:        libexif-devel >= 0.6.0
 BuildRequires: libgudev-devel
 BuildRequires: libnotify-devel >= 0.4.0
 BuildRequires: libtool
-BuildRequires: libxfce4ui-devel >= 4.16.0
+BuildRequires: libxfce4ui-devel >= 4.18.0
 BuildRequires: libxfce4util-devel >= %{xfce_version}
 BuildRequires: pcre-devel >= 6.0
 BuildRequires: perl-base
@@ -133,7 +133,6 @@ mkdir -p m4
 %configure \
        --enable-exif \
        --enable-gtk-doc \
-       --enable-pcre \
        --with-html-dir=%{_gtkdocdir} \
        %{?with_static_libs:--enable-static} \
        --disable-silent-rules
@@ -201,6 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/thunar
 # move it to proper place
 %{_docdir}/thunar/README*
+%{_gtkdocdir}/thunar
 
 %files apidocs
 %defattr(644,root,root,755)