diff --git a/.gitignore b/.gitignore index 3e56daa..addd02a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,2 @@ -lxtask-0.1.3.tar.gz -/lxtask-0.1.4.tar.gz -/lxtask-0.1.6.tar.xz -/lxtask-0.1.7.tar.xz -/lxtask-0.1.8.tar.xz -/lxtask-20190301T2144.tar.gz -/lxtask-0.1.9.tar.xz -/lxtask-0.1.10.tar.xz +/lxtask-*.tar.xz +/lxtask-*.tar.gz diff --git a/create-lxtask-git-bare-tarball.sh b/create-lxtask-git-bare-tarball.sh new file mode 100644 index 0000000..0c50d00 --- /dev/null +++ b/create-lxtask-git-bare-tarball.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +set -x +set -e + +REPONAME=lxtask +GITURL=https://github.com/lxde/${REPONAME}.git + +DATE=$(date '+%Y%m%d') +TIME=$(date '+%H%M') + +TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz + +PWDDIR=$(pwd) +TMPDIR=$(mktemp -d /var/tmp/libfm-XXXXXX) +pushd $TMPDIR + +git clone --mirror $GITURL + +pushd ${REPONAME}.git/ +git log --format=fuller | head -n 12 +popd + +tar czf ${TARNAME} ${REPONAME}.git/ + +cp -p ${TARNAME} $PWDDIR +popd +rm -rf $TMPDIR diff --git a/lxtask.spec b/lxtask.spec index bf75ce0..8cd0c25 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -1,56 +1,61 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=445140 -%global use_release 1 -%global use_gitbare 0 +%global use_release 0 +%global use_gitbare 1 %if 0%{?use_gitbare} < 1 # force -%global use_release 1 +%global use_release 1 %endif +%global git_version %{nil} +%global git_ver_rpm %{nil} +%global git_builddir %{nil} + %if 0%{?use_gitbare} -%global gittardate 20190301 -%global gittartime 2144 -%global gitbaredate 20190224 -%global git_rev db6017ff991f298b7a362ce5acbdd4d84cf40b18 -%global git_short %(echo %{git_rev} | cut -c-8) -%global git_version D%{gitbaredate}git%{git_short} +%global gittardate 20250327 +%global gittartime 1511 +%define use_gitcommit_as_rel 0 + +%global gitbaredate 20250325 +%global git_rev 33d3f23801089589e3e866fd43c4c96fd0b9d325 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version %{gitbaredate}git%{git_short} %endif -%global mainrel 1 - -%if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} -%endif -%if 0%{?use_gitbare} >= 1 -%global fedorarel %{mainrel}.%{git_version} +%if 0%{?use_gitcommit_as_rel} +%global git_ver_rpm ^%{git_version} +%global git_builddir -%{git_version} %endif -Name: lxtask -Version: 0.1.10 -Release: %{fedorarel}%{?dist}.2 -Summary: Lightweight and desktop independent task manager -License: GPLv2+ -URL: http://lxde.sourceforge.net/ +%global main_version 0.1.12 + +Name: lxtask +Version: %{main_version}%{git_ver_rpm} +Release: 2%{?dist} +Summary: Lightweight and desktop independent task manager + +# SPDX confirmed +License: GPL-2.0-or-later +URL: http://lxde.sourceforge.net/ %if 0%{?use_gitbare} Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz %endif %if 0%{?use_release} -Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz +Source0: https://github.com/lxde/%{name}/archive/%{main_version}/%{name}-%{version}.tar.gz %endif +Source100: create-lxtask-git-bare-tarball.sh -BuildRequires: make -BuildRequires: gcc -BuildRequires: git -BuildRequires: pkgconfig(gtk+-2.0) > 2.6 -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: intltool -%if 0%{?use_gitbare} -BuildRequires: automake -BuildRequires: libtool -%endif +BuildRequires: make +BuildRequires: gcc +BuildRequires: git +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: automake +BuildRequires: libtool %description @@ -62,17 +67,28 @@ totally desktop independent and only requires pure gtk+. %prep %if 0%{?use_release} -%setup -q %{?git_version:-n %{name}-%{version}-%{?git_version}} +%setup -q -n %{name}-%{main_version}%{git_builddir} git init %endif %if 0%{?use_gitbare} -%setup -q -c -T -a 0 +%setup -q -c -T -n %{name}-%{main_version}%{git_builddir} -a 0 git clone ./%{name}.git/ cd %{name} -git checkout -b %{version}-fedora %{git_rev} +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 + cp -a [A-Z]* .. %endif @@ -88,11 +104,13 @@ git commit -m "base" -q %build %if 0%{?use_gitbare} cd %{name} -bash autogen.sh %endif -%configure -make %{?_smp_mflags} +bash autogen.sh +%configure \ + --enable-gtk3 \ + %{nil} +%make_build %install @@ -100,15 +118,12 @@ make %{?_smp_mflags} cd %{name} %endif -make install DESTDIR=%{buildroot} INSTALL="install -p" +%make_install desktop-file-install \ - %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) - --vendor fedora \ - %endif - --delete-original \ - --dir=%{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/%{name}.desktop + --delete-original \ + --dir=%{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/%{name}.desktop %if 0%{?use_gitbare} cd .. @@ -117,7 +132,10 @@ cd .. %find_lang %{name} %files -f %{name}.lang -%doc AUTHORS ChangeLog README TODO +%doc AUTHORS +%doc ChangeLog +%doc README +%doc TODO %license COPYING %{_bindir}/%{name} %{_datadir}/applications/*%{name}.desktop @@ -125,6 +143,52 @@ cd .. %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.1.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Mar 27 2025 Mamoru TASAKA - 0.1.12-1 +- 0.1.12 + +* Fri Jan 17 2025 Fedora Release Engineering - 0.1.11^20240905git6aaa2949-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Oct 02 2024 Mamoru TASAKA - 0.1.11^20240905git6aaa2949-1 +- Update to the latest git + +* Fri Aug 30 2024 Mamoru TASAKA - 0.1.11^20240828git67c04303-1 +- Update to the latest git + +* Sun Aug 25 2024 Mamoru TASAKA - 0.1.11^20240823git0113fe4e-1 +- Update to the latest git + +* Thu Aug 15 2024 Mamoru TASAKA - 0.1.11-1 +- 0.1.11 + +* Thu Jul 18 2024 Fedora Release Engineering - 0.1.10^20230802git5c0d3456-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.1.10^20230802git5c0d3456-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.1.10^20230802git5c0d3456-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Aug 14 2023 Mamoru TASAKA - 0.1.10^20230802git5c0d3456-1 +- Update to the latest git +- Switch to GTK3 + +* Thu Jul 20 2023 Fedora Release Engineering - 0.1.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.1.10-1.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.1.10-1.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.1.10-1.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.1.10-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 58eb55c..d81a4d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-0.1.10.tar.xz) = 21f3a145939b53136be11892d183f3549b1a736070bb0c69e0932009d46abfd4956d1ec1d904e58bd6fca0a30fa0cca0cce897a83113c3fe1591300cfddae99a +SHA512 (lxtask-20250327T1511.tar.gz) = db3ceab603eedb7272880e99ccd084928ff5c418a8d06c4ad48a68b8113294e109d85f089156acf90107397968f7395b2485a5952a7dc64eeaf4f99663a62712