$ git show --format=fuller --patch-with-stat --summary 5c5b3c832fdd4c4937fd5d34e5f91fc489de0f5e

commit 5c5b3c832fdd4c4937fd5d34e5f91fc489de0f5e
Author:     mandian <mandian@users.noreply.github.com>
AuthorDate: Wed Dec 6 23:19:54 2023 +0000
Commit:     mandian <mandian@users.noreply.github.com>
CommitDate: Wed Dec 6 23:19:54 2023 +0000

    upgrade at the latest git version and rebuild against gtk3
---
 .abf.yml   |   2 +-
 libfm.spec | 208 ++++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 109 insertions(+), 101 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 08c5153..980ca6e 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  libfm-1.3.2.tar.gz: f3e3121cd2de317f84e21942f6c310b288959433
+  libfm-5346a5390a0881d5713a71e15f371132680056ee.tar.gz: 175562f31db2683f5e1efc955e15bfba67e73d76
diff --git a/libfm.spec b/libfm.spec
index 275f528..2f40b03 100644
--- a/libfm.spec
+++ b/libfm.spec
@@ -1,24 +1,30 @@
 %define api 1.0
 %define major 4
-%define libname %mklibname fm %{major}
-%define elibname %mklibname fm-extra %{major}
-%define glibname %mklibname fm-gtk 3 %{major}
-%define devname %mklibname -d fm
-%define edevname %mklibname -d fm-extra
-%define git 0
+%define libname	%mklibname fm
+%define elibname	%mklibname fm-extra
+%define glibname	%mklibname fm-gtk3
+%define devname	%mklibname -d fm
+%define edevname	%mklibname -d fm-extra
+
+%define oldlibname	%mklibname fm 4
+%define oldelibname	%mklibname fm-extra 4
+%define oldglibname	%mklibname fm-gtk 3 4
+
+# git snapshot
+%global snapshot 1
+%if 0%{?snapshot}
+	%global commit		5346a5390a0881d5713a71e15f371132680056ee
+	%global commitdate	20230916
+	%global shortcommit	%(c=%{commit}; echo ${c:0:7})
+%endif
+
 %bcond_without gtk
-%bcond_with bootstrap
 
 Summary:	GIO-based library for file manager-like programs
 Name:		libfm
 Version:	1.3.2
-%if %{git}
-Release:	0.%{git}.2
-Source0:	%{name}-%{git}.tar.xz
-%else
 Release:	2
-Source0:	https://github.com/lxde/libfm/archive/%{version}/%{name}-%{version}.tar.gz
-%endif
+Source0:	https://github.com/lxde/libfm/archive/%{?snapshot:%{commit}}%{!?snapshot:%{version}}/%{name}-%{?snapshot:%{commit}}%{!?snapshot:%{version}}.tar.gz
 License:	GPLv2
 Group:		File tools
 Url:		http://pcmanfm.sourceforge.net/
@@ -26,7 +32,6 @@ Patch0:		libfm-0.1.5-set-cutomization.patch
 BuildRequires:	gettext
 BuildRequires:	gtk-doc
 BuildRequires:	intltool
-BuildRequires:	vala
 BuildRequires:	pkgconfig(cairo) >= 1.8.0
 BuildRequires:	pkgconfig(dbus-glib-1)
 BuildRequires:	pkgconfig(gio-unix-2.0) >= 2.26.0
@@ -34,9 +39,7 @@ BuildRequires:	pkgconfig(glib-2.0) >= 2.26.0
 BuildRequires:	pkgconfig(gobject-2.0)
 BuildRequires:	pkgconfig(gthread-2.0)
 BuildRequires:	pkgconfig(libexif)
-%if %{without bootstrap}
 BuildRequires:	pkgconfig(libmenu-cache) >= 0.3.2
-%endif
 BuildRequires:	pkgconfig(pango) >= 1.16.0
 %if %{with gtk}
 BuildRequires:	pkgconfig(gtk+-3.0)
@@ -44,6 +47,7 @@ BuildRequires:	pkgconfig(gtk+-3.0)
 %if %{without gtk}
 Obsoletes:	lxshortcut <= 1.2.3-2
 %endif
+BuildRequires:	vala
 
 %description
 LibFM is a GIO-based library used to develop file manager-like programs. It is
@@ -52,14 +56,37 @@ related operations such as copy & paste, drag & drop, file associations or
 thumbnails support. By utilizing glib/gio and gvfs, libfm can access remote 
 filesystems supported by gvfs.
 
+%files -f %{name}.lang
+%config(noreplace) %{_sysconfdir}/xdg/libfm/libfm.conf
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/terminals.list
+%{_datadir}/%{name}/archivers.list
+%{_datadir}/mime/packages/%{name}.xml
+%{_libdir}/libfm
+
+#---------------------------------------------------------------------------
+
 %package gtk
 Summary:	gtk related parts of the %{name} library
 Group:		File tools
 Requires:	lxshortcut = %{EVRD}
+Obsoletes:	%oldlibname < %{EVRD}
 
 %description gtk
 gtk related parts of the %{name} library
 
+%files gtk
+%if %{with gtk}
+%{_bindir}/libfm-pref-apps
+%{_mandir}/man1/libfm-pref-apps.1*
+%{_datadir}/applications/libfm-pref-apps.desktop
+%dir %{_datadir}/%{name}/images
+%{_datadir}/%{name}/images/*
+%dir %{_datadir}/%{name}/ui
+%{_datadir}/%{name}/ui/*
+
+#---------------------------------------------------------------------------
+
 %package -n %{libname}
 Summary:	%{name} library package
 Group:		File tools
@@ -68,24 +95,40 @@ Requires:	%{name} = %{version}-%{release}
 %description -n %{libname}
 %{summary}.
 
+%files -n %{libname}
+%{_libdir}/libfm.so.%{major}*
+
+#---------------------------------------------------------------------------
+
 %package -n %{elibname}
 Summary:	%{name} extra library package
 Group:		File tools
-%if %{without bootstrap}
 Requires:	%{libname} = %{EVRD}
-%endif
+Obsoletes:	%oldelibname < %{EVRD}
 
 %description -n %{elibname}
 %{summary}
 
+%files -n %{elibname}
+%{_libdir}/libfm-extra.so.%{major}*
+
+#---------------------------------------------------------------------------
+
 %package -n %{glibname}
 Summary:	%{name} extra library package
 Group:		File tools
 Requires:	%{libname} = %{EVRD}
+Obsoletes:	%oldglibname < %{EVRD}
 
 %description -n %{glibname}
 %{summary}
 
+%files -n %{glibname}
+%if %{with gtk}
+%{_libdir}/libfm-gtk3.so.%{major}*
+%endif
+#---------------------------------------------------------------------------
+
 %package -n %{devname}
 Summary:	%{name} developement files
 Group:		File tools
@@ -99,6 +142,28 @@ Provides:	%{name}-devel = %{version}-%{release}
 This package contains header files needed when building applications based on
 %{name}.
 
+%files -n %{devname}
+#doc #{_datadir}/gtk-doc/html/*
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}-%{api}
+%{_includedir}/%{name}/*.h
+%{_includedir}/%{name}-%{api}/*.h
+%exclude %{_includedir}/%{name}/fm-xml-file.h
+%exclude %{_includedir}/%{name}/fm-version.h
+%exclude %{_includedir}/%{name}/fm-extra.h
+%exclude %{_includedir}/%{name}-%{api}/fm-xml-file.h
+%exclude %{_includedir}/%{name}-%{api}/fm-version.h
+%exclude %{_includedir}/%{name}-%{api}/fm-extra.h
+%{_libdir}/libfm.so
+%{_libdir}/pkgconfig/libfm.pc
+%if %{with gtk}
+%{_libdir}/libfm-gtk3.so
+%{_libdir}/pkgconfig/libfm-gtk3.pc
+%endif
+%endif
+
+#---------------------------------------------------------------------------
+
 %package -n %{edevname}
 Summary:	%{name}-extra developement files
 Group:		File tools
@@ -108,6 +173,18 @@ Requires:	%{elibname} = %{version}-%{release}
 This package contains header files needed when building applications based on
 %{name}-extra.
 
+%files -n %{edevname}
+%{_libdir}/libfm-extra.so
+%{_libdir}/pkgconfig/libfm-extra.pc
+%{_includedir}/%{name}/fm-xml-file.h
+%{_includedir}/%{name}/fm-version.h
+%{_includedir}/%{name}/fm-extra.h
+%{_includedir}/%{name}-%{api}/fm-xml-file.h
+%{_includedir}/%{name}-%{api}/fm-version.h
+%{_includedir}/%{name}-%{api}/fm-extra.h
+
+#---------------------------------------------------------------------------
+
 %package -n lxshortcut
 Summary:	Edit app shortcuts
 Group:		Graphical desktop/Other
@@ -116,28 +193,24 @@ Group:		Graphical desktop/Other
 LXShortcut is a small program used to edit application shortcuts created
 with freedesktop.org Desktop Entry spec.
 
-%prep
-%if %{git}
-%setup -q -n %{name}-%{git}
-%else
-%setup -q
+%files -n lxshortcut
+%if %{with gtk}
+%{_bindir}/lxshortcut
+%{_datadir}/applications/lxshortcut.desktop
+%{_mandir}/man1/lxshortcut.1*
 %endif
-%autopatch -p1
 
-[ -e autogen.sh ] && ./autogen.sh
+#---------------------------------------------------------------------------
+
+%prep
+%autosetup -p1 -n %{name}-%{?snapshot:%{commit}}%{!?snapshot:%{version}}
 
 %build
+autoreconf -fiv
 %configure \
 	--enable-udisks \
-%if %{with bootstrap}
-	--with-extra-only \
-%endif
-%if %{without gtk}
-	--without-gtk
-%else
-        --with-gtk=3
-%endif
-
+	--with%{?with_gtk:-gtk=3}%{?!with_gtk:out-gtk} \
+	%{nil}
 %make_build
 
 %install
@@ -149,72 +222,7 @@ rm -rf %{buildroot}%{_includedir}/%{name}
 mkdir -p %{buildroot}%{_includedir}/%{name}
 cp -f %{buildroot}%{_includedir}/%{name}-%{api}/* %{buildroot}%{_includedir}/%{name}/
 
-%if %{without bootstrap}
+# locales
 %find_lang %{name}
-%endif
-
-%if %{without bootstrap}
-%files -f %{name}.lang
-%config(noreplace) %{_sysconfdir}/xdg/libfm/libfm.conf
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/terminals.list
-%{_datadir}/%{name}/archivers.list
-%{_datadir}/mime/packages/%{name}.xml
-%{_libdir}/libfm
-
-%if %{with gtk}
-%files gtk
-%{_bindir}/libfm-pref-apps
-%{_mandir}/man1/libfm-pref-apps.1*
-%{_datadir}/applications/libfm-pref-apps.desktop
-%dir %{_datadir}/%{name}/images
-%{_datadir}/%{name}/images/*
-%dir %{_datadir}/%{name}/ui
-%{_datadir}/%{name}/ui/*
-%endif
-
-%files -n %{libname}
-%{_libdir}/libfm.so.%{major}*
-
-%if %{with gtk}
-%files -n %{glibname}
-%{_libdir}/libfm-gtk3.so.%{major}*
 
-%files -n lxshortcut
-%{_bindir}/lxshortcut
-%{_datadir}/applications/lxshortcut.desktop
-%{_mandir}/man1/lxshortcut.1*
-%endif
 
-%files -n %{devname}
-#doc #{_datadir}/gtk-doc/html/*
-%dir %{_includedir}/%{name}
-%dir %{_includedir}/%{name}-%{api}
-%{_includedir}/%{name}/*.h
-%{_includedir}/%{name}-%{api}/*.h
-%exclude %{_includedir}/%{name}/fm-xml-file.h
-%exclude %{_includedir}/%{name}/fm-version.h
-%exclude %{_includedir}/%{name}/fm-extra.h
-%exclude %{_includedir}/%{name}-%{api}/fm-xml-file.h
-%exclude %{_includedir}/%{name}-%{api}/fm-version.h
-%exclude %{_includedir}/%{name}-%{api}/fm-extra.h
-%{_libdir}/libfm.so
-%{_libdir}/pkgconfig/libfm.pc
-%if %{with gtk}
-%{_libdir}/libfm-gtk3.so
-%{_libdir}/pkgconfig/libfm-gtk3.pc
-%endif
-%endif
-
-%files -n %{elibname}
-%{_libdir}/libfm-extra.so.%{major}*
-
-%files -n %{edevname}
-%{_libdir}/libfm-extra.so
-%{_libdir}/pkgconfig/libfm-extra.pc
-%{_includedir}/%{name}/fm-xml-file.h
-%{_includedir}/%{name}/fm-version.h
-%{_includedir}/%{name}/fm-extra.h
-%{_includedir}/%{name}-%{api}/fm-xml-file.h
-%{_includedir}/%{name}-%{api}/fm-version.h
-%{_includedir}/%{name}-%{api}/fm-extra.h