diff --git a/pcmanfm.spec b/pcmanfm.spec index 030f20d..4549beb 100644 --- a/pcmanfm.spec +++ b/pcmanfm.spec @@ -6,7 +6,7 @@ %global use_release 1 %endif -%global main_version 1.4.0 +%global main_version 1.3.2 %undefine prever %global prerpmver %(echo "%{?prever}" | sed -e 's|-||g') @@ -18,47 +18,35 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} >= 1 -%global tarballdate 20251218 -%global tarballtime 1224 -%define use_gitcommit_as_rel 1 +%global gitbaredate 20230921 +%global gitbaretime 1410 -%global githeaddate 20251022 -%global git_rev 09087446392d08c25412cade107bdec0a6e8ae7b +%global githeaddate 20230917 +%global git_rev e6b422b2003126b2116d26cf09f6e6244f1bb41f %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{githeaddate}git%{git_short} %endif -%global libfm_minver 1.4.0 +%global libfm_minver 1.2.0 %undefine _changelog_trimtime -%if 0%{?use_gitbare} -%if 0%{?use_gitcommit_as_rel} +%if 0%{?use_git} || 0%{?use_gitbare} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} %endif -%endif - -%global use_gcc_strict_sanitize 0 - -%global flagrel %{nil} -%if 0%{?use_gcc_strict_sanitize} >= 1 -%global flagrel %{flagrel}.san -%endif - -#%%undefine _annotated_build Name: pcmanfm Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist}%{flagrel} +Release: 1%{?dist} Summary: Extremly fast and lightweight file manager # SPDX confirmed License: GPL-2.0-or-later URL: http://pcmanfm.sourceforge.net/ %if 0%{?use_gitbare} >= 1 -Source0: %{name}-%{tarballdate}T%{tarballtime}.tar.gz +Source0: %{name}-%{gitbaredate}T%{gitbaretime}.tar.gz %endif %if 0%{?use_release} >= 1 Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{main_version}%{?prever}.tar.xz @@ -87,17 +75,12 @@ BuildRequires: menu-cache-devel BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: gettext-devel BuildRequires: intltool %if 0%{?use_gitbare} BuildRequires: automake BuildRequires: intltool %endif -%if 0%{?use_gcc_strict_sanitize} -BuildRequires: libasan -BuildRequires: libubsan -%endif BuildRequires: git @@ -137,17 +120,6 @@ cd %{name} #git checkout -b %{version}-fedora %{version} git checkout -b %{main_version}-fedora %{git_rev} - -# 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 - install -cpm 0644 [A-Z]* .. %endif @@ -165,9 +137,9 @@ cat %PATCH103 | git am cat %PATCH104 | git am cat %PATCH202 | git am -%if 0%{?use_gitbare} -# Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) -export ACLOCAL_PATH=%{_datadir}/gettext/m4/ +%if 0%{?use_git} || 0%{?use_gitbare} +sh autogen.sh + # Patch0 autoreconf -fi %endif @@ -181,12 +153,6 @@ chmod u+x configure chmod u+x */ %build -%if 0%{?use_gcc_strict_sanitize} -export CC="${CC} -fsanitize=address -fsanitize=undefined" -export CXX="${CXX} -fsanitize=address -fsanitize=undefined" -export LDFLAGS="${LDFLAGS} -pthread" -%endif - %if 0%{?use_gitbare} cd %{name} %endif @@ -242,57 +208,6 @@ cd .. %{_includedir}/pcmanfm-modules.h %changelog -* Thu Dec 18 2025 Mamoru TASAKA - 1.4.0^20251022git09087446-1 -- Update to the latest git - -* Fri Jul 25 2025 Fedora Release Engineering - 1.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon May 26 2025 Mamoru TASAKA - 1.4.0-3 -- Use ACLOCAL_PATH environment instead of calling autopoint - -* Sat May 17 2025 Mamoru TASAKA - 1.4.0-2 -- Call autopoint with gettext 0.25 (ref: bug 2366708) - -* Thu Mar 06 2025 Mamoru TASAKA - 1.4.0-1 -- 1.4.0 - -* Wed Feb 19 2025 Mamoru TASAKA - 1.3.2^20241216gita8ae14c5-3 -- Rebuild with libfm 1.4.0 for date format option - -* Fri Jan 17 2025 Fedora Release Engineering - 1.3.2^20241216gita8ae14c5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Dec 25 2024 Mamoru TASAKA - 1.3.2^20241216gita8ae14c5-1 -- Update to the latest git - -* Fri Dec 06 2024 Mamoru TASAKA - 1.3.2^20241203git836c77c8-1 -- Update to the latest git - -* Sat Nov 23 2024 Mamoru TASAKA - 1.3.2^20241103git1312f603-1 -- Update to the latest git - -* Sun Aug 25 2024 Mamoru TASAKA - 1.3.2^20240821gitaa4860d6-1 -- Update to the latest git - -* Tue Aug 13 2024 Mamoru TASAKA - 1.3.2^20240812git12abd7e1-1 -- Update to the latest git - -* Fri Jul 26 2024 Mamoru TASAKA - 1.3.2^20230917gite6b422b2-6 -- Apply upstream PR for gcc14 -Werror=incompatible-pointer-types - -* Thu Jul 18 2024 Fedora Release Engineering - 1.3.2^20230917gite6b422b2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.3.2^20230917gite6b422b2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.3.2^20230917gite6b422b2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Mamoru TASAKA - 1.3.2^20230917gite6b422b2-2 -- Change -Wincompatible-pointer-types from error to warning - * Thu Sep 21 2023 Mamoru TASAKA - 1.3.2^20230917gite6b422b2-1 - Update to the latest git diff --git a/sources b/sources index d68685d..f23c247 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcmanfm-20251218T1224.tar.gz) = 41427507b7cdb3d8eb142f858d5228394aa6eaabe38405dc20c12d3c94efd2bc88e6ccda49d9a9b463cbf0092e8f9bed5aa76a0aa23a0a573071a53ab78a3100 +SHA512 (pcmanfm-20230921T1410.tar.gz) = a2f74ff9535bea055806a43a9ba473c26ff769a157f3025bc836ab04596d51e5edcad464c0a5853dbe028858569aea4d369f830c97206f512c24856b28501414