diff --git a/.gitignore b/.gitignore index b334c15..e79c0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,47 @@ -/libfm-*.tar.gz -/libfm-*.tar.xz +libfm-0.1.12.tar.gz +/libfm-0.1.14.tar.gz +/libfm-0.1.15-git3ec0a717adde65f262b5bb2b33ae5eb56e9aea6f.tar.gz +/libfm-0.1.15-git197c7e1b8e3e439a5e4f3f004a3447aef43b298b.tar.gz +/libfm-0.1.15-gitdebea4a90d17ec6fd5876564d28977a3c3875924.tar.gz +/libfm-0.1.15-D20110422git30d03d27e4.tar.gz +/libfm-0.1.15-D20110427gita1f63c3114.tar.gz +/libfm-0.1.15-D20110529gitcd79d6228b.tar.gz +/libfm-0.1.15-D20110807gitd22b41fd2f.tar.gz +/libfm-0.1.16.tar.gz +/libfm-0.1.17.tar.gz +/libfm-1.0.tar.gz +/libfm-1.0.1.tar.gz +/libfm-1.1.0.tar.gz +/libfm-1.1.1.tar.gz +/libfm-1.1.2.tar.gz +/libfm-1.1.2.1.tar.gz +/libfm-1.1.2.2.tar.gz +/libfm-1.1.3.tar.xz +/libfm-1.1.4.tar.xz +/libfm-1.2.0-rc1.tar.xz +/libfm-1.2.0.tar.xz +/libfm-1.2.1.tar.xz +/libfm-1.2.2.tar.xz +/libfm-1.2.3.tar.xz +/libfm-1.2.3-699810d3bd0c5d9d508fcd9aa3a65442f2afee3f.tar.gz +/libfm-1.2.3-577806e29d2ec27ce5fee9dc816566fb4e23b155.tar.gz +/libfm-1.2.3-D20150525git8f38f90e04b648637509f2fa2d4208027ae59b5c.tar.gz +/libfm-1.2.3-D20150607gite1de98ccba316605e14d8cfc06df9a55752cdcec.tar.gz +/libfm-1.2.3-D20150713gitf47c9ae7ae7e1c5ff9742b8a6ca49fdb6f55f98d.tar.gz +/libfm-1.2.3-D20150728git47d0c1dd7d59c83188f11bfd6aef4a855f4f5c39.tar.gz +/libfm-1.2.4.tar.xz +/libfm-1.2.4-D20160618gitb22c0995e76936d62e246a12e5a0cf0ccf31361e.tar.gz +/libfm-1.2.4-D20160627git2a537414def87ebd75024a74030e60582cd78c45.tar.gz +/libfm-1.2.4-D20161017git82b3a1a201aae22860f501e3f7e75b46f8bcacd7.tar.gz +/libfm-1.2.4-D20161105gitc2989af0154256c35c5def4b9f5a758c8a3878ca.tar.gz +/libfm-1.2.4-D20161204git275559f196db6340d4ae6119a10d9b0efedaf84f.tar.gz +/libfm-1.2.4-D20161206gita24389f804ae95f737bbb4239be00bc99a62180b.tar.gz +/libfm-1.2.4-D20161209gitab583d7800bbc308f2852384f87c2357f49b01cd.tar.gz +/libfm-1.2.5.tar.xz +/libfm-20171230T1949.tar.gz +/libfm-1.3.0.2.tar.xz +/libfm-1.3.1.tar.xz +/libfm-20200407T1514.tar.gz +/libfm-20210201T2130.tar.gz +/libfm-20210204T1524.tar.gz +/libfm-1.3.2.tar.xz diff --git a/libfm-1.3.0.2-moduledir-gtkspecific-v03.patch b/libfm-1.3.0.2-moduledir-gtkspecific-v03.patch index d240e49..b70a7e5 100644 --- a/libfm-1.3.0.2-moduledir-gtkspecific-v03.patch +++ b/libfm-1.3.0.2-moduledir-gtkspecific-v03.patch @@ -22,8 +22,8 @@ + LIBFM_GTK_MODULE_DIR_SUFFIX="" LIBFM_PREF_APPS= fi - if test "$ac_with_gtk" = "3.0"; then -@@ -144,6 +147,7 @@ AC_SUBST(GTK_LIBS) + AC_SUBST(GTK_CFLAGS) +@@ -141,6 +144,7 @@ AC_SUBST(GTK_LIBS) AC_SUBST(LIBFM_GTK_LTLIBRARIES) AC_SUBST(LIBFM_PREF_APPS) AC_SUBST(LIBFM_GTK_PC) diff --git a/libfm.spec b/libfm.spec index 5fc24d7..77cd5ed 100644 --- a/libfm.spec +++ b/libfm.spec @@ -3,76 +3,54 @@ # Upstream git: # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm # add bootstrap, need to build menu-cache in epel7 -%global use_release 0 -%global use_gitbare 1 +%global userelease 1 +%global usegitbare 0 -%if 0%{?use_gitbare} < 1 +%if 0%{?usegitbare} < 1 # force -%global use_release 1 +%global userelease 1 %endif -%global git_version %{nil} -%global git_ver_rpm %{nil} -%global git_builddir %{nil} - -%if 0%{?use_gitbare} -%global gittardate 20251217 -%global gittartime 2335 -%define use_gitcommit_as_rel 0 - -%global gitbaredate 20251214 -%global git_rev 7e575d13fcf0532fc181fc26391ad6fd7717ed66 -%global git_short %(echo %{git_rev} | cut -c-8) -%global git_version %{gitbaredate}git%{git_short} - -%if 0%{?use_gitcommit_as_rel} -%global git_ver_rpm ^%{git_version} -%global git_builddir -%{git_version} -%else -%global git_ver_rpm %{nil} -%global git_builddir %{nil} -%endif - -%endif - - -%global main_version 1.4.1 - %global bootstrap 0 +%global mainver 1.3.2 +%undefine prever +%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') + +%global mainrel 2 + +%if 0%{?usegitbare} >= 1 +%global gitcommit 54cd5fc0af2407a70717ed3e8577d3ae9ae1a849 +%global gitdate 20210202 +%global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) + +%global tarballdate 20210204 +%global tarballtime 1524 +%endif + +%if 0%{?userelease} >= 1 +%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%endif +%if 0%{?usegitbare} >= 1 +%global fedorarel %{?prever:0.}%{mainrel}.D%{gitdate}git%{shortcommit} +%endif + %global build_doc 1 %undefine _changelog_trimtime Name: libfm -Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Version: %{mainver} +Release: %{fedorarel}%{?dist}.3 Summary: GIO-based library for file manager-like programs -# src/actions/ GPL-2.0-or-later -# src/base/ LGPL-2.1-or-later -# src/demo/ GPL-2.0-or-later -# src/extra/ LGPL-2.1-or-later -# src/fm-gtk.{c,h} GPL-2.0-or-later -# src/gtk-compat.c GPL-2.0-or-later -# src/*.c (rest) LGPL-2.1-or-later -# src/gio/ GPL-2.0-or-later -# src/gtk/exo/ LGPL-2.1-or-later AND GPL-2.0-or-later -# src/gtk/ GPL-2.0-or-later AND LGPL-2.1-or-later -# src/job/ LGPL-2.1-or-later -# src/modules/ GPL-2.0-or-later -# src/tests/ GPL-2.0-or-later -# src/tools/ GPL-2.0-or-later -# src/udisks/ GPL-2.0-or-later - -# SPDX confirmed -License: LGPL-2.1-or-later AND GPL-2.0-or-later +License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ -%if 0%{?use_release} >= 1 +%if 0%{?userelease} >= 1 Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.tar.xz Source1: https://raw.githubusercontent.com/lxde/libfm/master/autogen.sh %endif -%if 0%{?use_gitbare} >= 1 -Source0: libfm-%{gittardate}T%{gittartime}.tar.gz +%if 0%{?usegitbare} >= 1 +Source0: libfm-%{tarballdate}T%{tarballtime}.tar.gz %endif Source10: create-libfm-git-bare-tarball.sh @@ -214,47 +192,32 @@ This package containg development documentation files for %{name}. %prep -%if 0%{?use_release} >= 1 -%setup -q -n %{name}-%{main_version}%{?prever} +%if 0%{?userelease} >= 1 +%setup -q -n %{name}-%{version}%{?prever} cp -a %{SOURCE1} . #%%patch0 -p1 -b .orig git init %endif -%if 0%{?use_gitbare} -%setup -q -c -T -n %{name}-%{main_version}%{git_builddir} -a 0 -git clone ./%{name}.git/ -cd %{name} - -%if !%{use_gitcommit_as_rel} -git checkout -b fedora-%{version} %{version} -%endif - -# Restore timestamps -set +x -echo "Restore timestamps" -git ls-tree -r --name-only HEAD | while read f -do - unixtime=$(git log -n 1 --pretty='%ct' -- $f) - touch -d "@${unixtime}" $f -done -set -x - +%if 0%{?usegitbare} >= 1 +%setup -q -c -T -a 0 +git clone ./libfm.git/ +cd libfm cp -a [A-Z]* .. %endif git config user.name "libfm Fedora maintainer" git config user.email "libfm-maintainer@fedoraproject.org" -%if 0%{?use_release} >= 1 +%if 0%{?userelease} >= 1 # Once call autogen.sh to make git status clean sh autogen.sh git add . git commit -m "Init tree" -q %endif -%if 0%{?use_gitbare} >= 1 -git checkout -b %{main_version}-fedora %{git_rev} +%if 0%{?usegitbare} >= 1 +git checkout -b %{version}-fedora %{gitcommit} cat > GITHASH <= 1 +%if 0%{?usegitbare} >= 1 cd libfm %endif -%if 0%{?use_gitbare} >= 1 +%if 0%{?usegitbare} >= 1 # Workaround # Once generate files anyway ./configure @@ -343,7 +289,7 @@ done %install TOPDIR=$(pwd) -%if 0%{?use_gitbare} >= 1 +%if 0%{?usegitbare} >= 1 cd libfm %endif @@ -388,7 +334,7 @@ done pushd INSTDIR-gtk2 find . -name '*.la' -exec rm -f {} ';' -rm -f .%{_libdir}/pkgconfig/libfm-gtk3.pc +rm -f .{_libdir}/pkgconfig/libfm-gtk3.pc diff -urNp .%{_includedir}/%{name}-1.0 $RPM_BUILD_ROOT%{_includedir}/%name-1.0 diff -urNp .%{_datadir}/%{name} $RPM_BUILD_ROOT/%{_datadir}/%{name} @@ -404,10 +350,11 @@ popd /usr/lib/rpm/check-rpaths %check -%if 0%{?use_gitbare} >= 1 +%if 0%{?usegitbare} >= 1 cd libfm %endif +find INSTDIR-gtk* -name \*.ui >> po/POTFILES.skip for ver in \ 2 \ 3 \ @@ -502,87 +449,6 @@ fi %endif %changelog -* Wed Dec 17 2025 Mamoru TASAKA - 1.4.1-1 -- 1.4.1 - -* Thu Jul 24 2025 Fedora Release Engineering - 1.4.0^20250316git3289abf5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon May 26 2025 Mamoru TASAKA - 1.4.0^20250316git3289abf5-2 -- Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) - -* Sat Mar 22 2025 Mamoru TASAKA - 1.4.0^20250316git3289abf5-1 -- Update to the latest git - -* Wed Feb 19 2025 Mamoru TASAKA - 1.4.0-1 -- 1.4.0 - -* Sun Feb 16 2025 Mamoru TASAKA - 1.3.2^20250215git9ea11dca-1 -- Update to the latest git - -* Fri Feb 07 2025 Mamoru TASAKA - 1.3.2^20250114git493571d1-1 -- Update to the latest git - -* Fri Jan 17 2025 Fedora Release Engineering - 1.3.2^20250109git2d94c3c8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Jan 14 2025 Mamoru TASAKA - 1.3.2^20250109git2d94c3c8-2 -- Apply upstream PR for C23 with function prototype strictness - -* Tue Jan 14 2025 Mamoru TASAKA - 1.3.2^20250109git2d94c3c8-1 -- Update to the latest git - -* Wed Dec 25 2024 Mamoru TASAKA - 1.3.2^20241221git37456d7d-1 -- Update to the latest git -- Restore libfm.so ABI (bug 2333955) - -* Thu Dec 19 2024 Mamoru TASAKA - 1.3.2^20241216gitfb651b87-1 -- Update to the latest git - -* Fri Dec 06 2024 Mamoru TASAKA - 1.3.2^20241203gitcea66071-1 -- Update to the latest git - -* Sun Nov 10 2024 Mamoru TASAKA - 1.3.2^20241107gitd9935ec1-1 -- Update to the latest git - -* Sun Aug 25 2024 Mamoru TASAKA - 1.3.2^20240823git4d2f7b41-1 -- Update to the latest git - -* Tue Aug 13 2024 Mamoru TASAKA - 1.3.2^20240812gitfbcd1833-1 -- Update to the latest git - -* Thu Jul 18 2024 Mamoru TASAKA - 1.3.2^20240714gitee33947e-1 -- Update to the latest git (20240714gitee33947e) - -* Tue Jun 04 2024 Mamoru TASAKA - 1.3.2^20230916git5346a539-3 -- Ignore po/ directory make check error with autoconf 2.72 - -* Tue May 14 2024 Mamoru TASAKA - 1.3.2^20230916git5346a539-2 -- Restore timestamps for git ls files - -* Tue Feb 27 2024 Mamoru TASAKA - 1.3.2^20230916git5346a539-1 -- Update to the latest git (20230916git5346a539) - -* Fri Feb 23 2024 Mamoru TASAKA - 1.3.2-8 -- Handle gcc14 -Werror=incompatible-pointer-types -- Make vala regenerate C source related to -Werror=incompatible-pointer-types - workaround for vala source - -* Thu Jan 25 2024 Fedora Release Engineering - 1.3.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.3.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Mamoru TASAKA - 1.3.2-5 -- Change -Wincompatible-pointer-types from error to warning - -* Mon Dec 11 2023 Mamoru TASAKA - 1.3.2-4 -- SPDX migration - -* Thu Jul 20 2023 Fedora Release Engineering - 1.3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - * Thu Jan 19 2023 Fedora Release Engineering - 1.3.2-2.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 6e2ccab..803f17a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfm-20251217T2335.tar.gz) = 22310c122892588d23196b21e4e8e251fb83a49a6e8d0bd86abdc93e20d427d6f81f738f3fb8500c0aaf7d6ff7be5752329435b80ce36f5aa5c42353ab0e1864 +SHA512 (libfm-1.3.2.tar.xz) = eaa3358cd1d8f611f8f4ac882e01a716b4dc32729b641417e1100aa039db3c57ae57ccc45df7dcac4f0570cd88684beba7752a5586c1d0598b1bc7502e99f4be