public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/Thunar] rawhide: Fix Licenses plus spec cleanup and modernization
@ 2026-09-13 17:34 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-09-13 17:34 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/Thunar
Branch : rawhide
Commit : b5209456904ec590e587e8a5bf3ddebb72b13554
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-09-12T15:49:58-03:00
Stats  : +22/-25 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/Thunar/c/b5209456904ec590e587e8a5bf3ddebb72b13554?branch=rawhide

Log:
Fix Licenses plus spec cleanup and modernization

---
diff --git a/Thunar.spec b/Thunar.spec
index 3843168..97eb0f5 100644
--- a/Thunar.spec
+++ b/Thunar.spec
@@ -6,8 +6,7 @@ Version:        4.20.10
 Release:        %autorelease
 Summary:        Thunar File Manager
 
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:        GPL-2.0-or-later
+License:        GPL-2.0-or-later AND LGPL-2.0-or-later
 URL:            http://thunar.xfce.org/
 #VCS git:git://git.xfce.org/xfce/thunar
 Source0:        http://archive.xfce.org/src/xfce/thunar/%{xfceversion}/thunar-%{version}.tar.bz2
@@ -19,8 +18,8 @@ Source4:        thunar-sendto-blueman.desktop
 
 Patch:          https://gitlab.xfce.org/xfce/thunar/-/merge_requests/620.patch
 
+BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(exo-2) >= %{xfceversion}
 BuildRequires:  pkgconfig(glib-2.0) >= 2.72.0
 BuildRequires:  pkgconfig(gudev-1.0) >= 145
@@ -30,11 +29,9 @@ BuildRequires:  pkgconfig(libnotify) >= 0.4.0
 BuildRequires:  pkgconfig(libxfce4ui-2) >= %{xfceversion}
 BuildRequires:  pkgconfig(libxfce4panel-2.0) >= %{xfceversion}
 BuildRequires:  libSM-devel
-BuildRequires:  freetype-devel
-BuildRequires:  libpng-devel >= 2:1.2.2-16
 BuildRequires:  libICE-devel
 BuildRequires:  pkgconfig
-BuildRequires:  intltool gettext
+BuildRequires:  gettext
 BuildRequires:  desktop-file-utils >= 0.7
 BuildRequires:  libappstream-glib
 BuildRequires:  gobject-introspection-devel
@@ -66,6 +63,7 @@ libraries and header files for the Thunar file manager.
 %package docs
 Summary: GTK docs for Thunar file manager
 Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
 
 %description docs
 Thunarx GTK documentation files for the Thunar file manager.
@@ -90,9 +88,10 @@ export LD_LIBRARY_PATH="`pwd`/thunarx/.libs"
 %make_install
 
 # fixes wrong library permissions
-chmod 755 %{buildroot}/%{_libdir}/*.so
+chmod 755 %{buildroot}%{_libdir}/*.so
 
 make -C examples distclean
+rm -f examples/Makefile.am examples/tex-open-terminal/Makefile.am
 
 # 2 of the example files need to not be executable 
 # so they don't pull in dependencies. 
@@ -101,19 +100,24 @@ chmod 644 examples/xfce-file-manager.py
 
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
+# Rename non-standard hye locale to hy
+if [ -d %{buildroot}%{_datadir}/locale/hye ]; then
+    mv %{buildroot}%{_datadir}/locale/hye %{buildroot}%{_datadir}/locale/hy
+fi
+
 %find_lang thunar
 
 desktop-file-install --delete-original          \
-        --dir %{buildroot}/%{_datadir}/applications         \
-        %{buildroot}/%{_datadir}/applications/thunar-settings.desktop
+        --dir %{buildroot}%{_datadir}/applications         \
+        %{buildroot}%{_datadir}/applications/thunar-settings.desktop
 
 desktop-file-install --delete-original          \
-        --dir %{buildroot}/%{_datadir}/applications          \
-        %{buildroot}/%{_datadir}/applications/thunar-bulk-rename.desktop
+        --dir %{buildroot}%{_datadir}/applications          \
+        %{buildroot}%{_datadir}/applications/thunar-bulk-rename.desktop
 
 desktop-file-install --delete-original          \
-        --dir %{buildroot}/%{_datadir}/applications         \
-        %{buildroot}/%{_datadir}/applications/thunar.desktop
+        --dir %{buildroot}%{_datadir}/applications         \
+        %{buildroot}%{_datadir}/applications/thunar.desktop
 
 # install additional sendto helpers
 for source in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do
@@ -122,24 +126,17 @@ for source in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do
             $source
 done
 
-# appdata
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
-%pre
-for target in %{_defaultdocdir}/Thunar/html/*/images
-do
-       if [ -d $target ]
-       then
-               rm -rf $target
-       fi
-done
 
 %ldconfig_scriptlets
 
 %files -f thunar.lang
-%license COPYING
-%doc ChangeLog NEWS INSTALL AUTHORS HACKING THANKS
+%license COPYING COPYING.LIB
+%doc ChangeLog NEWS AUTHORS HACKING THANKS
 %doc docs/README.gtkrc
 # exclude docs that we have moved to the above
 %exclude %{_datadir}/doc/thunar/README.gtkrc

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-13 17:34 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-13 17:34 [rpms/Thunar] rawhide: Fix Licenses plus spec cleanup and modernization Filipe Rosset

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox