diff --git a/.gitignore b/.gitignore index 221d54e..addd02a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +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-*.tar.xz +/lxtask-*.tar.gz diff --git a/0001-SF-889-Make-priority-change-work.patch b/0001-SF-889-Make-priority-change-work.patch deleted file mode 100644 index ebfa9b3..0000000 --- a/0001-SF-889-Make-priority-change-work.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 5aa3dd3fec932016d2b88f0bdb4a719adfb8142e Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Wed, 3 Jan 2018 21:41:24 +0900 -Subject: [PATCH] [SF#889] Make priority change work - -To get pid number from GTK selection, column id must be set to COLUMN_PID. -Also, to redirect g_spawn_command_line_sync() result to /dev/null using -shell-style redirect, shell command must be used, otherwise such redirection -is regarded as command's arguments. ---- - src/callbacks.c | 2 +- - src/xfce-taskmanager-linux.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/callbacks.c b/src/callbacks.c -index dfaff57..315852e 100644 ---- a/src/callbacks.c -+++ b/src/callbacks.c -@@ -103,7 +103,7 @@ void handle_prio_menu(GtkWidget *widget, gchar *prio) - - if(gtk_tree_selection_get_selected(selection, &model, &iter)) - { -- gtk_tree_model_get(model, &iter, 1, &task_id, -1); -+ gtk_tree_model_get(model, &iter, COLUMN_PID, &task_id, -1); - - set_priority_to_task(atoi(task_id), atoi(prio)); - refresh_task_list(); -diff --git a/src/xfce-taskmanager-linux.c b/src/xfce-taskmanager-linux.c -index 36656fb..dd490c1 100644 ---- a/src/xfce-taskmanager-linux.c -+++ b/src/xfce-taskmanager-linux.c -@@ -306,7 +306,7 @@ void set_priority_to_task(gint task_id, gint prio) - { - int status = 0; - gchar command[128] = ""; -- g_sprintf(command, "renice %d %d > /dev/null", prio, task_id); -+ g_sprintf(command, "sh -c \"renice %d %d > /dev/null\"", prio, task_id); - - if( ! g_spawn_command_line_sync(command, NULL, NULL, &status, NULL) ||status ) - show_error(_("Couldn't set priority %d to the task with ID %d"), prio, task_id); --- -2.14.3 - 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 7c58284..8cd0c25 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -1,23 +1,62 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=445140 -Name: lxtask -Version: 0.1.8 -Release: 5%{?dist} -Summary: Lightweight and desktop independent task manager +%global use_release 0 +%global use_gitbare 1 -Group: User Interface/Desktops -License: GPLv2+ -URL: http://lxde.sourceforge.net/ -Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz -# https://sourceforge.net/p/lxde/bugs/889/ -Patch1: 0001-SF-889-Make-priority-change-work.patch +%if 0%{?use_gitbare} < 1 +# force +%global use_release 1 +%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%global git_version %{nil} +%global git_ver_rpm %{nil} +%global git_builddir %{nil} + +%if 0%{?use_gitbare} +%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 + +%if 0%{?use_gitcommit_as_rel} +%global git_ver_rpm ^%{git_version} +%global git_builddir -%{git_version} +%endif + + +%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: 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+-3.0) +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: automake +BuildRequires: libtool -BuildRequires: pkgconfig(gtk+-2.0) > 2.6 -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: intltool %description LXTask is a lightweight task manager derived from xfce4 task manager with all @@ -27,36 +66,76 @@ totally desktop independent and only requires pure gtk+. %prep -%setup -q -%patch1 -p1 +%if 0%{?use_release} +%setup -q -n %{name}-%{main_version}%{git_builddir} + +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} + +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 + +git config user.name "lxpanel Fedora maintainer" +git config user.email "lxpanel-owner@fedoraproject.org" + +%if 0%{?use_release} +git add . +git commit -m "base" -q +%endif + %build -%configure -make %{?_smp_mflags} +%if 0%{?use_gitbare} +cd %{name} +%endif + +bash autogen.sh +%configure \ + --enable-gtk3 \ + %{nil} +%make_build %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="install -p" +%if 0%{?use_gitbare} +cd %{name} +%endif + +%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 .. +%endif %find_lang %{name} - -%clean -rm -rf $RPM_BUILD_ROOT - - %files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog README TODO +%doc AUTHORS +%doc ChangeLog +%doc README +%doc TODO %license COPYING %{_bindir}/%{name} %{_datadir}/applications/*%{name}.desktop @@ -64,7 +143,92 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Jan 5 2018 Mamoru TASAKA - 0.1.8-2 +* 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 + +* Tue Jan 26 2021 Fedora Release Engineering - 0.1.10-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Oct 28 2020 Mamoru TASAKA - 0.1.10-1 +- 0.1.10 + +* Tue Jul 28 2020 Fedora Release Engineering - 0.1.9-2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.1.9-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 24 2020 Mamoru TASAKA - 0.1.9-2 +- Apply upstream track proposal patch for gcc10 -fno-common + +* Thu Jul 25 2019 Fedora Release Engineering - 0.1.9-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Mar 2 2019 Mamoru TASAKA - 0.1.9-1 +- 0.1.9 formal release + +* Fri Mar 1 2019 Mamoru TASAKA - 0.1.8-10.D20190224gitdb6017ff +- Update to the latest git + +* Mon Feb 11 2019 Mamoru TASAKA - 0.1.8-9 +- Upstream patch for correcting "free memory" usage display + +* Fri Feb 01 2019 Fedora Release Engineering - 0.1.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.1.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 0.1.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 5 2018 Mamoru TASAKA - 0.1.8-5 - Make renice process work (SF#889) * Thu Aug 03 2017 Fedora Release Engineering - 0.1.8-4 diff --git a/sources b/sources index 6880636..d81a4d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-0.1.8.tar.xz) = 095904df6ecea699a2ea44ca6f1677d8882b1bb26926b716bd0d6a65ce5aece99e3ac833d5bf08dcadb42e269baa1d3bd7c6e974e58a64f6da147763e9a40c6a +SHA512 (lxtask-20250327T1511.tar.gz) = db3ceab603eedb7272880e99ccd084928ff5c418a8d06c4ad48a68b8113294e109d85f089156acf90107397968f7395b2485a5952a7dc64eeaf4f99663a62712