From 662da0db5b707f08ec260cc0d704a605489a5d04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 00:39:52 +0000 Subject: [PATCH 01/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 7c58284..a2cee34 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -2,7 +2,7 @@ Name: lxtask Version: 0.1.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Lightweight and desktop independent task manager Group: User Interface/Desktops @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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-2 - Make renice process work (SF#889) From 547a268e5cf29d92cf46e0b4d9537470da7c53ae Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:47:25 +0100 Subject: [PATCH 02/39] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- lxtask.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index a2cee34..6deb031 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -12,7 +12,6 @@ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{vers # https://sourceforge.net/p/lxde/bugs/889/ Patch1: 0001-SF-889-Make-priority-change-work.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig(gtk+-2.0) > 2.6 BuildRequires: desktop-file-utils From 13ac2af74b6f9e3df9907a88542c44289279a801 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:21:17 +0100 Subject: [PATCH 03/39] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- lxtask.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/lxtask.spec b/lxtask.spec index 6deb031..dc8d7b4 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -49,9 +49,6 @@ desktop-file-install \ %find_lang %{name} -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-,root,root,-) From 938d8889f1a8bdca86d2ccf273ae75baebfff88d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:48 +0200 Subject: [PATCH 04/39] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- lxtask.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/lxtask.spec b/lxtask.spec index dc8d7b4..2d76696 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -13,6 +13,7 @@ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{vers Patch1: 0001-SF-889-Make-priority-change-work.patch +BuildRequires: gcc BuildRequires: pkgconfig(gtk+-2.0) > 2.6 BuildRequires: desktop-file-utils BuildRequires: gettext From f9cedf6d5f0cb4beb05b13e3d057b6a3f4e1d7b5 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:53:27 -0500 Subject: [PATCH 05/39] Remove needless use of %defattr --- lxtask.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 2d76696..1b6c9cd 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -52,7 +52,6 @@ desktop-file-install \ %files -f %{name}.lang -%defattr(-,root,root,-) %doc AUTHORS ChangeLog README TODO %license COPYING %{_bindir}/%{name} From 1a4abdd73040fac21d9e2f56394ba5ec1aeb7593 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 09:38:16 +0000 Subject: [PATCH 06/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 1b6c9cd..f77afde 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -2,7 +2,7 @@ Name: lxtask Version: 0.1.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Lightweight and desktop independent task manager Group: User Interface/Desktops @@ -60,6 +60,9 @@ desktop-file-install \ %changelog +* 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 From f8ae72c6f549c6e34736953a4b4b1bbc69dbfb8a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:53 +0100 Subject: [PATCH 07/39] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- lxtask.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index f77afde..2f27174 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -5,7 +5,6 @@ Version: 0.1.8 Release: 7%{?dist} Summary: Lightweight and desktop independent task manager -Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz From ab1bb53ddba868cf53f3615eff2fb6f2097c7139 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 09:25:42 +0000 Subject: [PATCH 08/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 2f27174..fcf1202 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -2,7 +2,7 @@ Name: lxtask Version: 0.1.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -59,6 +59,9 @@ desktop-file-install \ %changelog +* 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 From e09c7ab355f45a88aaffccb3b20a8100b1889f86 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 11 Feb 2019 14:46:59 +0900 Subject: [PATCH 09/39] Upstream patch for correcting "free memory" usage display --- ...hows-Use-memory-as-free-command-line.patch | 45 +++++++++++++++++++ lxtask.spec | 9 +++- 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 0012-Shows-Use-memory-as-free-command-line.patch diff --git a/0012-Shows-Use-memory-as-free-command-line.patch b/0012-Shows-Use-memory-as-free-command-line.patch new file mode 100644 index 0000000..eccba0b --- /dev/null +++ b/0012-Shows-Use-memory-as-free-command-line.patch @@ -0,0 +1,45 @@ +From db2e2ca12a790f235f84d0cf50e1c4cfcb6f2377 Mon Sep 17 00:00:00 2001 +From: Carles Pina i Estany +Date: Sun, 6 Jan 2019 22:45:18 +0000 +Subject: [PATCH 12/12] Shows "Use memory" as 'free' command line. + +'free' command line utility counts SReclaimable as not used. Now lxtask +does the same. +--- + src/xfce-taskmanager-linux.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/xfce-taskmanager-linux.c b/src/xfce-taskmanager-linux.c +index dd490c1..2b2a186 100644 +--- a/src/xfce-taskmanager-linux.c ++++ b/src/xfce-taskmanager-linux.c +@@ -263,6 +263,11 @@ gboolean get_system_status (system_status *sys_stat) + file = fopen ("/proc/meminfo", "r"); + if(!file) return FALSE; + reach=0; ++ ++ /* Same approach as 'free' from procps-3.3.12: mem_cached ++ * is Cached+SReclaimable (see proc/sysinfo.c line 707 */ ++ sys_stat->mem_cached = 0; ++ + while (fgets (buffer, 100, file) != NULL) + { + if(!strncmp(buffer,"MemTotal:",9)) +@@ -270,10 +275,12 @@ gboolean get_system_status (system_status *sys_stat) + else if(!strncmp(buffer,"MemFree:",8)) + sys_stat->mem_free=atoi(buffer+9),reach++; + else if(!strncmp(buffer,"Cached:",7)) +- sys_stat->mem_cached=atoi(buffer+8),reach++; ++ sys_stat->mem_cached+=atoi(buffer+8),reach++; ++ else if(!strncmp(buffer,"SReclaimable:", 13)) ++ sys_stat->mem_cached+=atoi(buffer+14),reach++; + else if(!strncmp(buffer,"Buffers:",8)) + sys_stat->mem_buffered=atoi(buffer+9),reach++; +- if(reach==4) break; ++ if(reach==5) break; + } + fclose (file); + +-- +2.20.1 + diff --git a/lxtask.spec b/lxtask.spec index fcf1202..48785e0 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -2,7 +2,7 @@ Name: lxtask Version: 0.1.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -10,6 +10,8 @@ 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 +# From Upstream: +Patch12: 0012-Shows-Use-memory-as-free-command-line.patch BuildRequires: gcc @@ -59,6 +61,9 @@ desktop-file-install \ %changelog +* 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 @@ -68,7 +73,7 @@ desktop-file-install \ * 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-2 +* 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 From fdc989829545e08e14784edcfbaa155e48bc3364 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 1 Mar 2019 21:58:27 +0900 Subject: [PATCH 10/39] Update to the latest git --- .gitignore | 1 + lxtask.spec | 87 ++++++++++++++++++++++++++++++++++++++++++++++------- sources | 2 +- 3 files changed, 78 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 221d54e..b75e6eb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ lxtask-0.1.3.tar.gz /lxtask-0.1.6.tar.xz /lxtask-0.1.7.tar.xz /lxtask-0.1.8.tar.xz +/lxtask-20190301T2144.tar.gz diff --git a/lxtask.spec b/lxtask.spec index 48785e0..a4b7842 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -1,24 +1,56 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=445140 +%global use_release 0 +%global use_gitbare 1 + +%if 0%{?use_gitbare} < 1 +# force +%global use_release 1 +%endif + +%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} +%endif + +%global mainrel 10 + +%if 0%{?use_release} >= 1 +%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%endif +%if 0%{?use_gitbare} >= 1 +%global fedorarel %{mainrel}.%{git_version} +%endif + Name: lxtask Version: 0.1.8 -Release: 9%{?dist} +Release: %{fedorarel}%{?dist} Summary: Lightweight and desktop independent task manager License: GPLv2+ 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 -# https://sourceforge.net/p/lxde/bugs/889/ -Patch1: 0001-SF-889-Make-priority-change-work.patch -# From Upstream: -Patch12: 0012-Shows-Use-memory-as-free-command-line.patch - +%endif 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 + %description LXTask is a lightweight task manager derived from xfce4 task manager with all @@ -28,16 +60,44 @@ totally desktop independent and only requires pure gtk+. %prep -%setup -q -%patch1 -p1 +%if 0%{?use_release} +%setup -q %{?git_version:-n %{name}-%{version}-%{?git_version}} + +git init +%endif + +%if 0%{?use_gitbare} +%setup -q -c -T -a 0 +git clone ./%{name}.git/ +cd %{name} + +git checkout -b %{version}-fedora %{git_rev} +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 +%if 0%{?use_gitbare} +cd %{name} +bash autogen.sh +%endif + %configure make %{?_smp_mflags} %install -rm -rf %{buildroot} +%if 0%{?use_gitbare} +cd %{name} +%endif + make install DESTDIR=%{buildroot} INSTALL="install -p" desktop-file-install \ @@ -48,10 +108,12 @@ desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop +%if 0%{?use_gitbare} +cd .. +%endif + %find_lang %{name} - - %files -f %{name}.lang %doc AUTHORS ChangeLog README TODO %license COPYING @@ -61,6 +123,9 @@ desktop-file-install \ %changelog +* 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 diff --git a/sources b/sources index 6880636..2121c00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-0.1.8.tar.xz) = 095904df6ecea699a2ea44ca6f1677d8882b1bb26926b716bd0d6a65ce5aece99e3ac833d5bf08dcadb42e269baa1d3bd7c6e974e58a64f6da147763e9a40c6a +SHA512 (lxtask-20190301T2144.tar.gz) = 523678969a613c8448d08e44328037d84c09d5fbf7f559f7669afd0c07d2c5d345ff30a244f9c9c38f986dff1a720e9a960b2ed365acec18d1cbfc155a2a55f7 From 538f629ba5648ab64a22c207f0ce61f2086d0a67 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 2 Mar 2019 14:39:05 +0900 Subject: [PATCH 11/39] 0.1.9 formal release --- .gitignore | 1 + lxtask.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b75e6eb..1cb3cdb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ lxtask-0.1.3.tar.gz /lxtask-0.1.7.tar.xz /lxtask-0.1.8.tar.xz /lxtask-20190301T2144.tar.gz +/lxtask-0.1.9.tar.xz diff --git a/lxtask.spec b/lxtask.spec index a4b7842..c95d9cf 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -1,7 +1,7 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=445140 -%global use_release 0 -%global use_gitbare 1 +%global use_release 1 +%global use_gitbare 0 %if 0%{?use_gitbare} < 1 # force @@ -17,7 +17,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 10 +%global mainrel 1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -27,7 +27,7 @@ %endif Name: lxtask -Version: 0.1.8 +Version: 0.1.9 Release: %{fedorarel}%{?dist} Summary: Lightweight and desktop independent task manager @@ -123,6 +123,9 @@ cd .. %changelog +* 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 diff --git a/sources b/sources index 2121c00..c98d4e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-20190301T2144.tar.gz) = 523678969a613c8448d08e44328037d84c09d5fbf7f559f7669afd0c07d2c5d345ff30a244f9c9c38f986dff1a720e9a960b2ed365acec18d1cbfc155a2a55f7 +SHA512 (lxtask-0.1.9.tar.xz) = 21a28a86180e2c0d11f591707fe4333cb78224316d6c33e581f5a38a36baf619e22c426f58a6e4eaaa5701119b909a956691fc00ef47dff140443148f2941f4d From 8289b3e6113cda8fcc25f5554545c65b4e7abd37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 15:38:40 +0000 Subject: [PATCH 12/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index c95d9cf..28aa4ce 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -28,7 +28,7 @@ Name: lxtask Version: 0.1.9 -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -123,6 +123,9 @@ cd .. %changelog +* 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 From e5c5efa34816559ea5313af6cc543436374e1250 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Jan 2020 12:57:22 +0900 Subject: [PATCH 13/39] Apply upstream track proposal patch for gcc10 -fno-common --- lxtask-fix-no-common.patch | 73 ++++++++++++++++++++++++++++++++++++++ lxtask.spec | 12 +++++-- 2 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 lxtask-fix-no-common.patch diff --git a/lxtask-fix-no-common.patch b/lxtask-fix-no-common.patch new file mode 100644 index 0000000..d986741 --- /dev/null +++ b/lxtask-fix-no-common.patch @@ -0,0 +1,73 @@ +diff -Naur a/src/interface.c b/src/interface.c +--- a/src/interface.c 2016-02-21 01:06:17.000000000 +0100 ++++ b/src/interface.c 2016-09-13 19:37:28.038350050 +0200 +@@ -26,6 +26,18 @@ + #include + #include "interface.h" + ++GtkTreeStore *list_store; ++GtkTreeSelection *selection; ++GtkWidget *treeview; ++GtkWidget *mainmenu; ++GtkWidget *taskpopup; ++GtkWidget *cpu_usage_progress_bar; ++GtkWidget *mem_usage_progress_bar; ++GtkWidget *cpu_usage_progress_bar_box; ++GtkWidget *mem_usage_progress_bar_box; ++ ++GtkTreeViewColumn *column; ++ + #define GLADE_HOOKUP_OBJECT(component,widget,name) \ + g_object_set_data_full (G_OBJECT (component), name, \ + gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) +diff -Naur a/src/interface.h b/src/interface.h +--- a/src/interface.h 2014-09-16 14:27:52.000000000 +0200 ++++ b/src/interface.h 2016-09-13 19:32:22.816372893 +0200 +@@ -38,16 +38,15 @@ + #include "callbacks.h" + #include "types.h" + +-GtkTreeStore *list_store; +-GtkTreeSelection *selection; +-GtkWidget *treeview; +-GtkWidget *mainmenu; +-GtkWidget *taskpopup; +-GtkWidget *priopopup; +-GtkWidget *cpu_usage_progress_bar; +-GtkWidget *mem_usage_progress_bar; +-GtkWidget *cpu_usage_progress_bar_box; +-GtkWidget *mem_usage_progress_bar_box; ++extern GtkTreeStore *list_store; ++extern GtkTreeSelection *selection; ++extern GtkWidget *treeview; ++extern GtkWidget *mainmenu; ++extern GtkWidget *taskpopup; ++extern GtkWidget *cpu_usage_progress_bar; ++extern GtkWidget *mem_usage_progress_bar; ++extern GtkWidget *cpu_usage_progress_bar_box; ++extern GtkWidget *mem_usage_progress_bar_box; + + enum { + COLUMN_NAME = 0, +@@ -61,7 +60,7 @@ + COLUMN_PPID + }; + +-GtkTreeViewColumn *column; ++extern GtkTreeViewColumn *column; + + void change_list_store_view(void); + void create_list_store(void); +diff -Naur a/src/types.h b/src/types.h +--- a/src/types.h 2014-09-16 14:27:52.000000000 +0200 ++++ b/src/types.h 2016-09-13 19:25:51.014402217 +0200 +@@ -77,9 +77,6 @@ + extern gint win_width; + extern gint win_height; + +-const gchar *custom_signal_0; +-const gchar *custom_signal_1; +- + extern int page_size; + + #endif diff --git a/lxtask.spec b/lxtask.spec index 28aa4ce..1d01f23 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -17,7 +17,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 1 +%global mainrel 2 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -28,7 +28,7 @@ Name: lxtask Version: 0.1.9 -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist} Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -39,6 +39,8 @@ Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz %if 0%{?use_release} Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz %endif +# https://sourceforge.net/p/lxde/patches/535/ +Patch0: https://sourceforge.net/p/lxde/patches/535/attachment/lxtask-fix-no-common.patch BuildRequires: gcc BuildRequires: git @@ -83,6 +85,9 @@ git add . git commit -m "base" -q %endif +%patch0 -p1 +git commit -m "Apply upstream tracker proposal patch" -a + %build %if 0%{?use_gitbare} cd %{name} @@ -123,6 +128,9 @@ cd .. %changelog +* 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 From b35024db467114e5922a968a9e5d2834fa2536a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 11:47:13 +0000 Subject: [PATCH 14/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 1d01f23..e72def7 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -28,7 +28,7 @@ Name: lxtask Version: 0.1.9 -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -128,6 +128,9 @@ cd .. %changelog +* 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 From 8795062bae9de7da78cc66f2d9ab5962d5c285a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:40:58 +0000 Subject: [PATCH 15/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index e72def7..8d56106 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -28,7 +28,7 @@ Name: lxtask Version: 0.1.9 -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -128,6 +128,9 @@ cd .. %changelog +* 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 From 327bca47e542eae66e844d208c4e7750cea7e00e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 28 Oct 2020 15:50:22 +0900 Subject: [PATCH 16/39] 0.1.10 --- .gitignore | 1 + 0001-SF-889-Make-priority-change-work.patch | 43 ----------- ...hows-Use-memory-as-free-command-line.patch | 45 ------------ lxtask-fix-no-common.patch | 73 ------------------- lxtask.spec | 13 ++-- sources | 2 +- 6 files changed, 8 insertions(+), 169 deletions(-) delete mode 100644 0001-SF-889-Make-priority-change-work.patch delete mode 100644 0012-Shows-Use-memory-as-free-command-line.patch delete mode 100644 lxtask-fix-no-common.patch diff --git a/.gitignore b/.gitignore index 1cb3cdb..3e56daa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ lxtask-0.1.3.tar.gz /lxtask-0.1.8.tar.xz /lxtask-20190301T2144.tar.gz /lxtask-0.1.9.tar.xz +/lxtask-0.1.10.tar.xz 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/0012-Shows-Use-memory-as-free-command-line.patch b/0012-Shows-Use-memory-as-free-command-line.patch deleted file mode 100644 index eccba0b..0000000 --- a/0012-Shows-Use-memory-as-free-command-line.patch +++ /dev/null @@ -1,45 +0,0 @@ -From db2e2ca12a790f235f84d0cf50e1c4cfcb6f2377 Mon Sep 17 00:00:00 2001 -From: Carles Pina i Estany -Date: Sun, 6 Jan 2019 22:45:18 +0000 -Subject: [PATCH 12/12] Shows "Use memory" as 'free' command line. - -'free' command line utility counts SReclaimable as not used. Now lxtask -does the same. ---- - src/xfce-taskmanager-linux.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/xfce-taskmanager-linux.c b/src/xfce-taskmanager-linux.c -index dd490c1..2b2a186 100644 ---- a/src/xfce-taskmanager-linux.c -+++ b/src/xfce-taskmanager-linux.c -@@ -263,6 +263,11 @@ gboolean get_system_status (system_status *sys_stat) - file = fopen ("/proc/meminfo", "r"); - if(!file) return FALSE; - reach=0; -+ -+ /* Same approach as 'free' from procps-3.3.12: mem_cached -+ * is Cached+SReclaimable (see proc/sysinfo.c line 707 */ -+ sys_stat->mem_cached = 0; -+ - while (fgets (buffer, 100, file) != NULL) - { - if(!strncmp(buffer,"MemTotal:",9)) -@@ -270,10 +275,12 @@ gboolean get_system_status (system_status *sys_stat) - else if(!strncmp(buffer,"MemFree:",8)) - sys_stat->mem_free=atoi(buffer+9),reach++; - else if(!strncmp(buffer,"Cached:",7)) -- sys_stat->mem_cached=atoi(buffer+8),reach++; -+ sys_stat->mem_cached+=atoi(buffer+8),reach++; -+ else if(!strncmp(buffer,"SReclaimable:", 13)) -+ sys_stat->mem_cached+=atoi(buffer+14),reach++; - else if(!strncmp(buffer,"Buffers:",8)) - sys_stat->mem_buffered=atoi(buffer+9),reach++; -- if(reach==4) break; -+ if(reach==5) break; - } - fclose (file); - --- -2.20.1 - diff --git a/lxtask-fix-no-common.patch b/lxtask-fix-no-common.patch deleted file mode 100644 index d986741..0000000 --- a/lxtask-fix-no-common.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -Naur a/src/interface.c b/src/interface.c ---- a/src/interface.c 2016-02-21 01:06:17.000000000 +0100 -+++ b/src/interface.c 2016-09-13 19:37:28.038350050 +0200 -@@ -26,6 +26,18 @@ - #include - #include "interface.h" - -+GtkTreeStore *list_store; -+GtkTreeSelection *selection; -+GtkWidget *treeview; -+GtkWidget *mainmenu; -+GtkWidget *taskpopup; -+GtkWidget *cpu_usage_progress_bar; -+GtkWidget *mem_usage_progress_bar; -+GtkWidget *cpu_usage_progress_bar_box; -+GtkWidget *mem_usage_progress_bar_box; -+ -+GtkTreeViewColumn *column; -+ - #define GLADE_HOOKUP_OBJECT(component,widget,name) \ - g_object_set_data_full (G_OBJECT (component), name, \ - gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) -diff -Naur a/src/interface.h b/src/interface.h ---- a/src/interface.h 2014-09-16 14:27:52.000000000 +0200 -+++ b/src/interface.h 2016-09-13 19:32:22.816372893 +0200 -@@ -38,16 +38,15 @@ - #include "callbacks.h" - #include "types.h" - --GtkTreeStore *list_store; --GtkTreeSelection *selection; --GtkWidget *treeview; --GtkWidget *mainmenu; --GtkWidget *taskpopup; --GtkWidget *priopopup; --GtkWidget *cpu_usage_progress_bar; --GtkWidget *mem_usage_progress_bar; --GtkWidget *cpu_usage_progress_bar_box; --GtkWidget *mem_usage_progress_bar_box; -+extern GtkTreeStore *list_store; -+extern GtkTreeSelection *selection; -+extern GtkWidget *treeview; -+extern GtkWidget *mainmenu; -+extern GtkWidget *taskpopup; -+extern GtkWidget *cpu_usage_progress_bar; -+extern GtkWidget *mem_usage_progress_bar; -+extern GtkWidget *cpu_usage_progress_bar_box; -+extern GtkWidget *mem_usage_progress_bar_box; - - enum { - COLUMN_NAME = 0, -@@ -61,7 +60,7 @@ - COLUMN_PPID - }; - --GtkTreeViewColumn *column; -+extern GtkTreeViewColumn *column; - - void change_list_store_view(void); - void create_list_store(void); -diff -Naur a/src/types.h b/src/types.h ---- a/src/types.h 2014-09-16 14:27:52.000000000 +0200 -+++ b/src/types.h 2016-09-13 19:25:51.014402217 +0200 -@@ -77,9 +77,6 @@ - extern gint win_width; - extern gint win_height; - --const gchar *custom_signal_0; --const gchar *custom_signal_1; -- - extern int page_size; - - #endif diff --git a/lxtask.spec b/lxtask.spec index 8d56106..77a457a 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -17,7 +17,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 2 +%global mainrel 1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -27,8 +27,8 @@ %endif Name: lxtask -Version: 0.1.9 -Release: %{fedorarel}%{?dist}.2 +Version: 0.1.10 +Release: %{fedorarel}%{?dist} Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -39,8 +39,6 @@ Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz %if 0%{?use_release} Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz %endif -# https://sourceforge.net/p/lxde/patches/535/ -Patch0: https://sourceforge.net/p/lxde/patches/535/attachment/lxtask-fix-no-common.patch BuildRequires: gcc BuildRequires: git @@ -85,8 +83,6 @@ git add . git commit -m "base" -q %endif -%patch0 -p1 -git commit -m "Apply upstream tracker proposal patch" -a %build %if 0%{?use_gitbare} @@ -128,6 +124,9 @@ cd .. %changelog +* 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 diff --git a/sources b/sources index c98d4e9..58eb55c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-0.1.9.tar.xz) = 21a28a86180e2c0d11f591707fe4333cb78224316d6c33e581f5a38a36baf619e22c426f58a6e4eaaa5701119b909a956691fc00ef47dff140443148f2941f4d +SHA512 (lxtask-0.1.10.tar.xz) = 21f3a145939b53136be11892d183f3549b1a736070bb0c69e0932009d46abfd4956d1ec1d904e58bd6fca0a30fa0cca0cce897a83113c3fe1591300cfddae99a From a29a0fd2a416068afff6e11707ec006f59e92673 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 03:09:24 +0000 Subject: [PATCH 17/39] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- lxtask.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/lxtask.spec b/lxtask.spec index 77a457a..ad23381 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -40,6 +40,7 @@ Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz %endif +BuildRequires: make BuildRequires: gcc BuildRequires: git BuildRequires: pkgconfig(gtk+-2.0) > 2.6 From f0b1f7fb9c771e2fe5e45d0bb0afd87c1e1f5584 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 19:04:08 +0000 Subject: [PATCH 18/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index ad23381..653fb78 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -28,7 +28,7 @@ Name: lxtask Version: 0.1.10 -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -125,6 +125,9 @@ cd .. %changelog +* 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 From 94d7ecec35838f6782b5786470a6f00f040902b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:33:15 +0000 Subject: [PATCH 19/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 653fb78..bf75ce0 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -28,7 +28,7 @@ Name: lxtask Version: 0.1.10 -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -125,6 +125,9 @@ cd .. %changelog +* 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 From 9f108433e9806acfa7a16719c1af01dd8028c00a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:30:02 +0000 Subject: [PATCH 20/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index bf75ce0..b178f79 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -28,7 +28,7 @@ Name: lxtask Version: 0.1.10 -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist}.3 Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -125,6 +125,9 @@ cd .. %changelog +* 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 From c8c2a7deb68630e4fad58a207c42f05327ae9777 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:18:26 +0000 Subject: [PATCH 21/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index b178f79..866d325 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -28,7 +28,7 @@ Name: lxtask Version: 0.1.10 -Release: %{fedorarel}%{?dist}.3 +Release: %{fedorarel}%{?dist}.4 Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -125,6 +125,9 @@ cd .. %changelog +* 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 From ca44a17a384e88d12112c36c26f08b29f9dea093 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:44:29 +0000 Subject: [PATCH 22/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 866d325..49bc9be 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -28,7 +28,7 @@ Name: lxtask Version: 0.1.10 -Release: %{fedorarel}%{?dist}.4 +Release: %{fedorarel}%{?dist}.5 Summary: Lightweight and desktop independent task manager License: GPLv2+ @@ -125,6 +125,9 @@ cd .. %changelog +* 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 From 755a9eb219c813048bccfbc61321b5189daf5cfb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:16:06 +0900 Subject: [PATCH 23/39] rename release macro to make rpmdev-bumprelease work --- lxtask.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lxtask.spec b/lxtask.spec index 49bc9be..28a911f 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -20,15 +20,15 @@ %global mainrel 1 %if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?use_gitbare} >= 1 -%global fedorarel %{mainrel}.%{git_version} +%global baserelease %{mainrel}.%{git_version} %endif Name: lxtask Version: 0.1.10 -Release: %{fedorarel}%{?dist}.5 +Release: %{baserelease}%{?dist}.5 Summary: Lightweight and desktop independent task manager License: GPLv2+ From 32c7b3e732136af87d6453db2ea6d22ffc487821 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:20:46 +0900 Subject: [PATCH 24/39] fix baserelease usage --- lxtask.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lxtask.spec b/lxtask.spec index 28a911f..7eee770 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -17,18 +17,18 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 1 +%global baserelease 1 %if 0%{?use_release} >= 1 -%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif %if 0%{?use_gitbare} >= 1 -%global baserelease %{mainrel}.%{git_version} +%global fedorarel %{baserelease}.%{git_version} %endif Name: lxtask Version: 0.1.10 -Release: %{baserelease}%{?dist}.5 +Release: %{fedorarel}%{?dist} Summary: Lightweight and desktop independent task manager License: GPLv2+ From a81ab458635f0b54201885e92001c7e95415faba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:31:03 +0000 Subject: [PATCH 25/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 7eee770..94e0dea 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -17,7 +17,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global baserelease 1 +%global baserelease 2 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -125,6 +125,9 @@ cd .. %changelog +* 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 From 2bdb87ab7deddd73e45f44535a932d0488ee1952 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 13:04:53 +0900 Subject: [PATCH 26/39] indentation etc --- lxtask.spec | 93 ++++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 44 deletions(-) diff --git a/lxtask.spec b/lxtask.spec index 94e0dea..2f3124f 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -1,55 +1,60 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=445140 -%global use_release 1 -%global use_gitbare 0 +%global use_release 1 +%global use_gitbare 0 %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 20190301 +%global gittartime 2144 + +%global gitbaredate 20190224 +%global git_rev db6017ff991f298b7a362ce5acbdd4d84cf40b18 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version %{gitbaredate}git%{git_short} %endif -%global baserelease 2 - -%if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} -%endif -%if 0%{?use_gitbare} >= 1 -%global fedorarel %{baserelease}.%{git_version} +%if 0%{?use_git} || 0%{?use_gitbare} +%global git_ver_rpm ^%{git_version} +%global git_builddir -%{git_version} %endif -Name: lxtask -Version: 0.1.10 -Release: %{fedorarel}%{?dist} -Summary: Lightweight and desktop independent task manager -License: GPLv2+ -URL: http://lxde.sourceforge.net/ +%global main_version 0.1.10 + +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: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz %endif -BuildRequires: make -BuildRequires: gcc -BuildRequires: git -BuildRequires: pkgconfig(gtk+-2.0) > 2.6 -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: intltool +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 +BuildRequires: automake +BuildRequires: libtool %endif @@ -62,17 +67,17 @@ totally desktop independent and only requires pure gtk+. %prep %if 0%{?use_release} -%setup -q %{?git_version:-n %{name}-%{version}-%{?git_version}} +%setup -q %{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} cp -a [A-Z]* .. %endif @@ -92,7 +97,7 @@ bash autogen.sh %endif %configure -make %{?_smp_mflags} +%make_build %install @@ -100,15 +105,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 +119,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 From 667c3772e250cfa15a3864ec71aac27a85191f68 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 13:06:56 +0900 Subject: [PATCH 27/39] trim .gitignore --- .gitignore | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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 From 05c24387a94de2087f4c5826a7c3b50e35e58e2f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 13:36:41 +0900 Subject: [PATCH 28/39] Update to the latest git Switch to GTK3 --- create-lxtask-git-bare-tarball.sh | 28 ++++++++++++++++++++++++++++ lxtask.spec | 25 ++++++++++++++++--------- sources | 2 +- 3 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 create-lxtask-git-bare-tarball.sh 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 2f3124f..575c305 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -1,7 +1,7 @@ # 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 @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20190301 -%global gittartime 2144 +%global gittardate 20230814 +%global gittartime 1305 -%global gitbaredate 20190224 -%global git_rev db6017ff991f298b7a362ce5acbdd4d84cf40b18 +%global gitbaredate 20230802 +%global git_rev 5c0d34566ed1396e5dd8ed514b645a7b39f75f5b %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -32,7 +32,7 @@ Name: lxtask Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Lightweight and desktop independent task manager # SPDX confirmed @@ -44,11 +44,12 @@ Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz %if 0%{?use_release} Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz %endif +Source100: create-lxtask-git-bare-tarball.sh BuildRequires: make BuildRequires: gcc BuildRequires: git -BuildRequires: pkgconfig(gtk+-2.0) > 2.6 +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -96,7 +97,9 @@ cd %{name} bash autogen.sh %endif -%configure +%configure \ + --enable-gtk3 \ + %{nil} %make_build @@ -130,6 +133,10 @@ cd .. %changelog +* 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 diff --git a/sources b/sources index 58eb55c..7089d08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-0.1.10.tar.xz) = 21f3a145939b53136be11892d183f3549b1a736070bb0c69e0932009d46abfd4956d1ec1d904e58bd6fca0a30fa0cca0cce897a83113c3fe1591300cfddae99a +SHA512 (lxtask-20230814T1305.tar.gz) = 81c632edb0a7fa6f94740a7818b3b41d3fb3ff2032c3987467520c71fbdd90bf2c1087710426437fc29352f31ac405e4732c9f1d159b7c9221b9bba0cb1d9703 From c39fe93669013cbe9c054f9c9e240c9b3f07ba7d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 14:17:22 +0900 Subject: [PATCH 29/39] misc fix --- lxtask.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lxtask.spec b/lxtask.spec index 575c305..21a986f 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -42,7 +42,7 @@ URL: http://lxde.sourceforge.net/ Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz %endif %if 0%{?use_release} -Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz +Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{main_version}.tar.xz %endif Source100: create-lxtask-git-bare-tarball.sh @@ -68,7 +68,7 @@ totally desktop independent and only requires pure gtk+. %prep %if 0%{?use_release} -%setup -q %{name}-%{main_version}%{git_builddir} +%setup -q -n %{name}-%{main_version}%{git_builddir} git init %endif From 07176ad430c2c6ea9e0aba757f55dd62f78ce340 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:40:48 +0000 Subject: [PATCH 30/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 21a986f..24881e3 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -32,7 +32,7 @@ Name: lxtask Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight and desktop independent task manager # SPDX confirmed @@ -133,6 +133,9 @@ cd .. %changelog +* 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 From 92915de175ce87d0b963663ca4781477208793e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 05:31:50 +0000 Subject: [PATCH 31/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 24881e3..f79c786 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -32,7 +32,7 @@ Name: lxtask Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight and desktop independent task manager # SPDX confirmed @@ -133,6 +133,9 @@ cd .. %changelog +* 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 From 27afcf4254d7b289dc510690933fdc5ed9c56254 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 16:29:43 +0000 Subject: [PATCH 32/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index f79c786..7e5b180 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -32,7 +32,7 @@ Name: lxtask Version: %{main_version}%{git_ver_rpm} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight and desktop independent task manager # SPDX confirmed @@ -133,6 +133,9 @@ cd .. %changelog +* 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 From 0552aa056a91336bb8b5ca512b05eefbd729c0da Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 15 Aug 2024 15:03:50 +0900 Subject: [PATCH 33/39] 0.1.11 --- lxtask.spec | 17 +++++++++-------- sources | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lxtask.spec b/lxtask.spec index 7e5b180..66444b3 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -1,7 +1,7 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=445140 -%global use_release 0 -%global use_gitbare 1 +%global use_release 1 +%global use_gitbare 0 %if 0%{?use_gitbare} < 1 # force @@ -28,11 +28,11 @@ %endif -%global main_version 0.1.10 +%global main_version 0.1.11 Name: lxtask Version: %{main_version}%{git_ver_rpm} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Lightweight and desktop independent task manager # SPDX confirmed @@ -42,7 +42,7 @@ URL: http://lxde.sourceforge.net/ Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz %endif %if 0%{?use_release} -Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{main_version}.tar.xz +Source0: https://github.com/lxde/%{name}/archive/%{main_version}/%{name}-%{version}.tar.gz %endif Source100: create-lxtask-git-bare-tarball.sh @@ -53,10 +53,8 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool -%if 0%{?use_gitbare} BuildRequires: automake BuildRequires: libtool -%endif %description @@ -94,9 +92,9 @@ git commit -m "base" -q %build %if 0%{?use_gitbare} cd %{name} -bash autogen.sh %endif +bash autogen.sh %configure \ --enable-gtk3 \ %{nil} @@ -133,6 +131,9 @@ cd .. %changelog +* 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 diff --git a/sources b/sources index 7089d08..62a560a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-20230814T1305.tar.gz) = 81c632edb0a7fa6f94740a7818b3b41d3fb3ff2032c3987467520c71fbdd90bf2c1087710426437fc29352f31ac405e4732c9f1d159b7c9221b9bba0cb1d9703 +SHA512 (lxtask-0.1.11.tar.gz) = e0e4f6230263a230db7b3d07603b6b872fe5d5a7bbe55b50bcb0a3c2e25131030ce70d4e16b7f2b7681cafc8578b656d627df32fa042d984cd6b077ec007d9f9 From c7a635c61a5daa3c37e0ba41802ae0a36aafa5d6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Aug 2024 16:46:11 +0900 Subject: [PATCH 34/39] Update to the latest git --- lxtask.spec | 15 +++++++++------ sources | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lxtask.spec b/lxtask.spec index 66444b3..dc01d63 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -1,7 +1,7 @@ # 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 @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20230814 -%global gittartime 1305 +%global gittardate 20240825 +%global gittartime 1559 -%global gitbaredate 20230802 -%global git_rev 5c0d34566ed1396e5dd8ed514b645a7b39f75f5b +%global gitbaredate 20240823 +%global git_rev 0113fe4ee95a039da5aa43ad2de975149abbf7a7 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -131,6 +131,9 @@ cd .. %changelog +* 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 diff --git a/sources b/sources index 62a560a..3f340b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-0.1.11.tar.gz) = e0e4f6230263a230db7b3d07603b6b872fe5d5a7bbe55b50bcb0a3c2e25131030ce70d4e16b7f2b7681cafc8578b656d627df32fa042d984cd6b077ec007d9f9 +SHA512 (lxtask-20240825T1559.tar.gz) = c54f66cbe47808c00418aa92a892c8f5c0db1f5c30590e45aedbebfca8eca2a9c892e2853543970875e9609c835404765eb520905bc7b58abaf986fabd9b1378 From 037f7a5011ea3b25932abe6f4275937a68676df5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 30 Aug 2024 11:45:59 +0900 Subject: [PATCH 35/39] Update to the latest git --- lxtask.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lxtask.spec b/lxtask.spec index dc01d63..66e6746 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20240825 -%global gittartime 1559 +%global gittardate 20240830 +%global gittartime 1141 -%global gitbaredate 20240823 -%global git_rev 0113fe4ee95a039da5aa43ad2de975149abbf7a7 +%global gitbaredate 20240828 +%global git_rev 67c04303e9a4d08569ae3b84012d3abf8c44adcf %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -131,6 +131,9 @@ cd .. %changelog +* 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 diff --git a/sources b/sources index 3f340b0..99a5fd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-20240825T1559.tar.gz) = c54f66cbe47808c00418aa92a892c8f5c0db1f5c30590e45aedbebfca8eca2a9c892e2853543970875e9609c835404765eb520905bc7b58abaf986fabd9b1378 +SHA512 (lxtask-20240830T1141.tar.gz) = 39bd54b52acfbcf86646cb0bf3a02ec25ecfac231edad70f0039bcb432f2bb64b670238d76d7462e4313ee4f8c9254b3f53128de95cc3b4364b11a6a7375cd08 From a78b0546f52a8ffd5bc081f51f2e1163b9d9d447 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 2 Oct 2024 22:24:29 +0900 Subject: [PATCH 36/39] Update to the latest git --- lxtask.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lxtask.spec b/lxtask.spec index 66e6746..31a93bf 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20240830 -%global gittartime 1141 +%global gittardate 20241002 +%global gittartime 2221 -%global gitbaredate 20240828 -%global git_rev 67c04303e9a4d08569ae3b84012d3abf8c44adcf +%global gitbaredate 20240905 +%global git_rev 6aaa2949c8caf63cda04ee4068fe389751aa1e7b %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -131,6 +131,9 @@ cd .. %changelog +* 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 diff --git a/sources b/sources index 99a5fd3..a8f0a9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-20240830T1141.tar.gz) = 39bd54b52acfbcf86646cb0bf3a02ec25ecfac231edad70f0039bcb432f2bb64b670238d76d7462e4313ee4f8c9254b3f53128de95cc3b4364b11a6a7375cd08 +SHA512 (lxtask-20241002T2221.tar.gz) = 3a96af3a76f490d5d575021ec97cf02434b0ad89268ac7185471e2ad0bc3b46c1af58a0de5fba582c14c2eaba3148d5eac2a068ec820715fb3420e1c611c365a From e0412525245cfe40d5fefda5bc6a53aebd14d41c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:36:30 +0000 Subject: [PATCH 37/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index 31a93bf..6dc2026 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -32,7 +32,7 @@ Name: lxtask Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight and desktop independent task manager # SPDX confirmed @@ -131,6 +131,9 @@ cd .. %changelog +* 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 From 151e7b1e01311b83c08897901656cb0e65722727 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Mar 2025 15:21:27 +0900 Subject: [PATCH 38/39] 0.1.12 --- lxtask.spec | 29 ++++++++++++++++++++++------- sources | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/lxtask.spec b/lxtask.spec index 6dc2026..b15d7de 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -13,26 +13,27 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20241002 -%global gittartime 2221 +%global gittardate 20250327 +%global gittartime 1511 +%define use_gitcommit_as_rel 0 -%global gitbaredate 20240905 -%global git_rev 6aaa2949c8caf63cda04ee4068fe389751aa1e7b +%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_git} || 0%{?use_gitbare} +%if 0%{?use_gitcommit_as_rel} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} %endif -%global main_version 0.1.11 +%global main_version 0.1.12 Name: lxtask Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Lightweight and desktop independent task manager # SPDX confirmed @@ -77,6 +78,17 @@ 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 @@ -131,6 +143,9 @@ cd .. %changelog +* 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 diff --git a/sources b/sources index a8f0a9c..d81a4d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-20241002T2221.tar.gz) = 3a96af3a76f490d5d575021ec97cf02434b0ad89268ac7185471e2ad0bc3b46c1af58a0de5fba582c14c2eaba3148d5eac2a068ec820715fb3420e1c611c365a +SHA512 (lxtask-20250327T1511.tar.gz) = db3ceab603eedb7272880e99ccd084928ff5c418a8d06c4ad48a68b8113294e109d85f089156acf90107397968f7395b2485a5952a7dc64eeaf4f99663a62712 From c71c9982f33f13e05de76c44330c2aa9b901260f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:08:34 +0000 Subject: [PATCH 39/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- lxtask.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxtask.spec b/lxtask.spec index b15d7de..8cd0c25 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -33,7 +33,7 @@ Name: lxtask Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight and desktop independent task manager # SPDX confirmed @@ -143,6 +143,9 @@ 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