From 19853a983fd3455ab27b5877d7b4f9045239dea9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 2 Dec 2021 15:32:46 +0000 Subject: [PATCH 01/38] Disable Wireless Extensions support (Fedora 36+) Disable the plugin that depends on wireless extensions. A ticket was filed for upstream 2.5 years ago and there's been no progress https://sourceforge.net/p/lxde/feature-requests/317/ https://fedoraproject.org/wiki/Changes/RemoveWirelessExtensions --- lxpanel.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index 6d19f30..9ece781 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -27,7 +27,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 2 +%global mainrel 3 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -96,8 +96,10 @@ BuildRequires: pkgconfig(libmenu-cache) >= 0.3.0 BuildRequires: pkgconfig(alsa) BuildRequires: %{_bindir}/curl-config +%if 0%{?fedora} < 36 # required for netstatus plugin BuildRequires: wireless-tools-devel +%endif %if 0%{?use_git} || 0%{?use_gitbare} BuildRequires: automake @@ -195,8 +197,13 @@ bash autogen.sh %configure \ --enable-indicator-support \ --disable-silent-rules \ +%if 0%{?fedora} < 36 + --with-plugins='all' \ +%else + --with-plugins='netstatus,volume,cpu,deskno,batt,kbled,xkb,thermal,cpufreq,monitors,indicator,weather' \ +%endif %{nil} -make %{?_smp_mflags} +%make_build %install @@ -204,7 +211,7 @@ make %{?_smp_mflags} cd %{name} %endif -make install DESTDIR=$RPM_BUILD_ROOT +%make_install rm -f $RPM_BUILD_ROOT%{_libdir}/lxpanel/*.la %if 0%{?use_gitbare} @@ -228,6 +235,10 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Dec 02 2021 Peter Robinson - 0.10.1-3 +- Disable Wireless Extensions support (Fedora 36+) + https://fedoraproject.org/wiki/Changes/RemoveWirelessExtensions + * Sun Aug 1 2021 Mamoru TASAKA - 0.10.1-2 - volumealsa: poll alsa mixer several times at startup (for pipewire) (bug 1960829) From 4ebf1eb510b345b5841d69b36db816d7914a3901 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:26:12 +0000 Subject: [PATCH 02/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxpanel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index 9ece781..4a24f25 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -41,7 +41,7 @@ Name: lxpanel Version: 0.10.1 -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: A lightweight X11 desktop panel License: GPLv2+ @@ -235,6 +235,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.10.1-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 02 2021 Peter Robinson - 0.10.1-3 - Disable Wireless Extensions support (Fedora 36+) https://fedoraproject.org/wiki/Changes/RemoveWirelessExtensions From 6e4e04f0d475002751576caf806bbb3bb6a24ef5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:14:27 +0000 Subject: [PATCH 03/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxpanel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index 4a24f25..87e1536 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -41,7 +41,7 @@ Name: lxpanel Version: 0.10.1 -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: A lightweight X11 desktop panel License: GPLv2+ @@ -235,6 +235,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.10.1-3.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.10.1-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5c31b7e56e5b8fa0dbe29e512a9e0ea8a3d079c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:40:30 +0000 Subject: [PATCH 04/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxpanel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index 87e1536..180ce7a 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -41,7 +41,7 @@ Name: lxpanel Version: 0.10.1 -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist}.3 Summary: A lightweight X11 desktop panel License: GPLv2+ @@ -235,6 +235,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.10.1-3.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.10.1-3.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a8d4974ada8fa1b1300560a70b435819155c2fad Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 7 Feb 2023 16:42:11 +0900 Subject: [PATCH 05/38] batt: make the status green on batt when the state is "not charging" --- lxpanel-0.10.1-batt-chaging-pending.patch | 12 ++++++++++++ lxpanel.spec | 10 ++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 lxpanel-0.10.1-batt-chaging-pending.patch diff --git a/lxpanel-0.10.1-batt-chaging-pending.patch b/lxpanel-0.10.1-batt-chaging-pending.patch new file mode 100644 index 0000000..10ffea2 --- /dev/null +++ b/lxpanel-0.10.1-batt-chaging-pending.patch @@ -0,0 +1,12 @@ +diff -urp lxpanel-0.10.1/plugins/batt.orig/batt_sys.c lxpanel-0.10.1/plugins/batt/batt_sys.c +--- lxpanel-0.10.1/plugins/batt.orig/batt_sys.c 2021-01-30 07:34:46.000000000 +0900 ++++ lxpanel-0.10.1/plugins/batt/batt_sys.c 2023-02-07 16:34:54.182239090 +0900 +@@ -396,6 +396,7 @@ gboolean battery_is_charging( battery *b + return ( strcasecmp( b->state, "Unknown" ) == 0 + || strcasecmp( b->state, "Full" ) == 0 + || strcasecmp( b->state, "Charging" ) == 0 ++ || strcasecmp( b->state, "not charging" ) == 0 + || b->current_now == 0 ); /* bug sf.net, #720 */ + } + +Only in lxpanel-0.10.1/plugins/batt: batt_sys.c~ diff --git a/lxpanel.spec b/lxpanel.spec index 180ce7a..6ffb5b1 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -27,7 +27,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 3 +%global mainrel 4 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -41,7 +41,7 @@ Name: lxpanel Version: 0.10.1 -Release: %{fedorarel}%{?dist}.3 +Release: %{fedorarel}%{?dist} Summary: A lightweight X11 desktop panel License: GPLv2+ @@ -77,6 +77,8 @@ Patch102: lxpanel-0.8.2-battery-plugin-use-zenity.patch # volumealsa: poll alsa mixer several times at startup (for pipewire) # https://bugzilla.redhat.com/show_bug.cgi?id=1960829 Patch103: lxpanel-0.10.1-0003-volumealsa-poll-alsa-mixer-several-times-at-startup.patch +# batt: make the status green on batt when the state is "not charging" +Patch104: lxpanel-0.10.1-batt-chaging-pending.patch #BuildRequires: docbook-utils @@ -174,6 +176,7 @@ cat %PATCH103 | git am %patch100 -p1 -b .default #%%patch101 -p1 -b .system-config-network %patch102 -p1 -b .zenity +%patch104 -p1 -b .batt_pending # Fedora >= 19 doesn't use vendor prefixes for desktop files. Instead of # maintaining two patches we just strip the prefixes from the files we just @@ -235,6 +238,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Tue Feb 7 2023 Mamoru TASAKA - 0.10.1-4 +- batt: make the status green on batt when the state is "not charging" + * Thu Jan 19 2023 Fedora Release Engineering - 0.10.1-3.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1e6d2cb00cbf6708d5f9f100d6f5cff544bf11eb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:15:11 +0900 Subject: [PATCH 06/38] rename release macro to make rpmdev-bumprelease work --- lxpanel.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index 6ffb5b1..3d7f265 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -30,18 +30,18 @@ %global mainrel 4 %if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?use_git} >= 1 -%global fedorarel %{mainrel}.%{git_version} +%global baserelease %{mainrel}.%{git_version} %endif %if 0%{?use_gitbare} >= 1 -%global fedorarel %{mainrel}.%{git_version} +%global baserelease %{mainrel}.%{git_version} %endif Name: lxpanel Version: 0.10.1 -Release: %{fedorarel}%{?dist} +Release: %{baserelease}%{?dist} Summary: A lightweight X11 desktop panel License: GPLv2+ From c39c39c8006ab3551415c1a216055bd969ecc1c0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:24:25 +0900 Subject: [PATCH 07/38] fix baserelease usage --- lxpanel.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index 3d7f265..ca125d1 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -27,21 +27,21 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 4 +%global baserelease 4 %if 0%{?use_release} >= 1 -%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif %if 0%{?use_git} >= 1 -%global baserelease %{mainrel}.%{git_version} +%global fedorarel %{baserelease}.%{git_version} %endif %if 0%{?use_gitbare} >= 1 -%global baserelease %{mainrel}.%{git_version} +%global fedorarel %{baserelease}.%{git_version} %endif Name: lxpanel Version: 0.10.1 -Release: %{baserelease}%{?dist} +Release: %{fedorarel}%{?dist} Summary: A lightweight X11 desktop panel License: GPLv2+ From c8a5f9d64b5217092e200ceeadd0918fa8c47249 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:27:19 +0000 Subject: [PATCH 08/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxpanel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index ca125d1..df2e629 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -27,7 +27,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global baserelease 4 +%global baserelease 5 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -238,6 +238,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.10.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Feb 7 2023 Mamoru TASAKA - 0.10.1-4 - batt: make the status green on batt when the state is "not charging" From 9f5e907e9a12748fedf3d314e7a8e559fe30a283 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 11:31:00 +0900 Subject: [PATCH 09/38] indentation --- lxpanel.spec | 146 +++++++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 75 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index df2e629..021cc91 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -2,117 +2,114 @@ %global use_release 1 %global use_git 0 -%global use_gitbare 0 +%global use_gitbare 0 %if 0%{?use_git} < 1 %if 0%{?use_gitbare} < 1 # force -%global use_release 1 +%global use_release 1 %endif %endif +%global git_version %{nil} +%global git_ver_rpm %{nil} +%global git_builddir %{nil} + %if 0%{?use_git} -%global git_rev 138ff9b22b45192a3b020ebbbed04e9060470a66 -%global git_date 20161125 -%global git_short %(echo %{git_rev} | cut -c-8) -%global git_version D%{git_date}git%{git_short} +%global git_rev 138ff9b22b45192a3b020ebbbed04e9060470a66 +%global git_date 20161125 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version %{git_date}git%{git_short} %endif %if 0%{?use_gitbare} -%global gittardate 20210201 -%global gittartime 1626 -%global gitbaredate 20210130 -%global git_rev 60edebfef627d3b42e2226c54d4aeb7d553a3e23 -%global git_short %(echo %{git_rev} | cut -c-8) -%global git_version D%{gitbaredate}git%{git_short} +%global gittardate 20230814 +%global gittartime 1113 + +%global gitbaredate 20230806 +%global git_rev 41a08b51181891f44aef4d87b849c94e2db58711 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version %{gitbaredate}git%{git_short} %endif -%global baserelease 5 +%if 0%{?use_git} || 0%{?use_gitbare} +%global git_ver_rpm ^%{git_version} +%global git_builddir -%{git_version} +%endif -%if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} -%endif -%if 0%{?use_git} >= 1 -%global fedorarel %{baserelease}.%{git_version} -%endif -%if 0%{?use_gitbare} >= 1 -%global fedorarel %{baserelease}.%{git_version} -%endif +Name: lxpanel +Version: 0.10.1%{git_ver_rpm} +Release: 1%{?dist} +Summary: A lightweight X11 desktop panel -Name: lxpanel -Version: 0.10.1 -Release: %{fedorarel}%{?dist} -Summary: A lightweight X11 desktop panel - -License: GPLv2+ -URL: http://lxde.org/ -#VCS: git:git://lxde.git.sourceforge.net/gitroot/lxde/lxpanel +License: GPLv2+ +URL: http://lxde.org/ %if 0%{?use_gitbare} Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz %endif %if 0%{?use_git} -Source0: %{name}-%{version}-%{?git_version}.tar.bz2 +Source0: %{name}-%{version}-%{?git_version}.tar.bz2 %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 # Shell script to create tarball from git scm -Source100: create-tarball-from-git.sh +Source100: create-tarball-from-git.sh Source101: create-lxpanel-git-bare-tarball.sh # Fedora bug: https://bugzilla.redhat.com/show_bug.cgi?id=746063 -Patch0: lxpanel-0.8.1-Fix-pager-scroll.patch +Patch0: lxpanel-0.8.1-Fix-pager-scroll.patch # Patches reported upstream Patch52: 0002-SF-894-task-button-correctly-find-the-window-current.patch ## distro specific patches # default configuration -Patch100: lxpanel-0.5.9-default.patch +Patch100: lxpanel-0.5.9-default.patch # use nm-connection-editor to edit network connections # Applied in 0.8.2 -#Patch101: lxpanel-0.8.1-nm-connection-editor.patch +#Patch101: lxpanel-0.8.1-nm-connection-editor.patch # use zenity instead of xmessage to display low battery warning -Patch102: lxpanel-0.8.2-battery-plugin-use-zenity.patch +Patch102: lxpanel-0.8.2-battery-plugin-use-zenity.patch # volumealsa: poll alsa mixer several times at startup (for pipewire) # https://bugzilla.redhat.com/show_bug.cgi?id=1960829 -Patch103: lxpanel-0.10.1-0003-volumealsa-poll-alsa-mixer-several-times-at-startup.patch +Patch103: lxpanel-0.10.1-0003-volumealsa-poll-alsa-mixer-several-times-at-startup.patch # batt: make the status green on batt when the state is "not charging" -Patch104: lxpanel-0.10.1-batt-chaging-pending.patch +Patch104: lxpanel-0.10.1-batt-chaging-pending.patch -#BuildRequires: docbook-utils -BuildRequires: make -BuildRequires: gettext -BuildRequires: intltool +#BuildRequires: docbook-utils +BuildRequires: make +BuildRequires: gettext +BuildRequires: intltool -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) -BuildRequires: pkgconfig(libfm-gtk) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(libwnck-1.0) -BuildRequires: pkgconfig(keybinder) -BuildRequires: pkgconfig(indicator-0.4) -BuildRequires: pkgconfig(libmenu-cache) >= 0.3.0 -BuildRequires: pkgconfig(alsa) -BuildRequires: %{_bindir}/curl-config +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) +BuildRequires: pkgconfig(libfm-gtk) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libwnck-1.0) +BuildRequires: pkgconfig(keybinder) +BuildRequires: pkgconfig(indicator-0.4) +BuildRequires: pkgconfig(libmenu-cache) >= 0.3.0 +BuildRequires: pkgconfig(alsa) +BuildRequires: /usr/bin/curl-config %if 0%{?fedora} < 36 # required for netstatus plugin -BuildRequires: wireless-tools-devel +BuildRequires: wireless-tools-devel %endif %if 0%{?use_git} || 0%{?use_gitbare} -BuildRequires: automake -BuildRequires: libtool +BuildRequires: automake +BuildRequires: libtool %endif BuildRequires: git BuildRequires: gcc # required for the battery plugin with Patch102 -Requires: zenity +Recommends: zenity %description @@ -121,27 +118,26 @@ compliant window manager (eg sawfish, metacity, xfwm4, kwin) and features a tasklist, pager, launchbar, clock, menu and sytray. %package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} -%description devel +%description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %if 0%{?use_release} || 0%{?use_git} -%setup -q %{?git_version:-n %{name}-%{version}-%{?git_version}} +%setup -q -n %{name}-%{version}%{git_builddir} git init %endif %if 0%{?use_gitbare} -%setup -q -c -T -a 0 +%setup -q -c -T -n %{name}-%{version}%{git_builddir} -a 0 git clone ./%{name}.git/ cd %{name} -#git checkout -b %{version}-fedora %{version} git checkout -b %{version}-fedora %{git_rev} cp -a [A-Z]* .. @@ -150,8 +146,8 @@ EOF cat GITHASH | while read line do - commit=$(echo "$line" | sed -e 's|[ \t].*||') - git cherry-pick $commit + commit=$(echo "$line" | sed -e 's|[ \t].*||') + git cherry-pick $commit done %endif @@ -171,21 +167,19 @@ git commit -m "base" -q cat %PATCH52 | git am cat %PATCH103 | git am -%patch0 -p1 -b .revert +%patch -P0 -p1 -b .revert -%patch100 -p1 -b .default +%patch -P100 -p1 -b .default #%%patch101 -p1 -b .system-config-network -%patch102 -p1 -b .zenity -%patch104 -p1 -b .batt_pending +%patch -P102 -p1 -b .zenity +%patch -P104 -p1 -b .batt_pending # Fedora >= 19 doesn't use vendor prefixes for desktop files. Instead of # maintaining two patches we just strip the prefixes from the files we just # patched with patch 100. -%if (0%{?fedora} && 0%{?fedora} >= 19) || (0%{?rhel} && 0%{?rhel} >= 7) sed -i 's|id=fedora-|id=|' data/default/panels/panel.in \ - data/two_panels/panels/bottom.in \ - data/two_panels/panels/top.in -%endif + data/two_panels/panels/bottom.in \ + data/two_panels/panels/top.in git commit -m "Apply Fedora specific configulation" -a %build @@ -225,7 +219,9 @@ cd .. %files -f %{name}.lang -%doc AUTHORS COPYING README +%license COPYING +%doc AUTHORS +%doc README %config(noreplace) %{_sysconfdir}/xdg/lxpanel/ %{_bindir}/lxpanel* From cd858925541cbb779f9fcfc692e3ba2d06d409d4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 11:45:02 +0900 Subject: [PATCH 10/38] Update to the latest git --- .gitignore | 1 + lxpanel.spec | 17 +++++++++++------ sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 04fe220..5f6eaf1 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ lxpanel-0.5.6.tar.gz /lxpanel-20190302T1732.tar.gz /lxpanel-20210201T1626.tar.gz /lxpanel-0.10.1.tar.xz +/lxpanel-20230814T1113.tar.gz diff --git a/lxpanel.spec b/lxpanel.spec index 021cc91..7150d54 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -1,8 +1,8 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=219930 -%global use_release 1 +%global use_release 0 %global use_git 0 -%global use_gitbare 0 +%global use_gitbare 1 %if 0%{?use_git} < 1 %if 0%{?use_gitbare} < 1 @@ -35,10 +35,12 @@ %if 0%{?use_git} || 0%{?use_gitbare} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} -%endif +%endif + +%global main_version 0.10.1 Name: lxpanel -Version: 0.10.1%{git_ver_rpm} +Version: %{main_version}%{git_ver_rpm} Release: 1%{?dist} Summary: A lightweight X11 desktop panel @@ -134,11 +136,11 @@ git init %endif %if 0%{?use_gitbare} -%setup -q -c -T -n %{name}-%{version}%{git_builddir} -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]* .. cat > GITHASH < - 0.10.1^20230806git41a08b51-1 +- Update to the latest git + * Thu Jul 20 2023 Fedora Release Engineering - 0.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index b8ebe95..e628827 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-0.10.1.tar.xz) = 0478ca1322a6645c5120e0fdb2b6d6409799f3296d971456670eb8b23b8457ae93a966ddcb5b5e5bdbcd694442ade2252d6a3931d36296e19e5339b2d689cfef +SHA512 (lxpanel-20230814T1113.tar.gz) = ccb67a63fa8eee136e2e19a97e6452df69735039024bafa2d18e86c4ca57dcd72e977efee5d2e90fbf5e8e3f158e3cb4bfecd27c5bd9852354cce070f7a19569 From 950c4ba9a462e9707b5401376531f0fc98c2d21a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 12:26:28 +0900 Subject: [PATCH 11/38] SPDX migration --- .gitignore | 31 ++----------------------------- lxpanel.spec | 3 ++- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 5f6eaf1..b6d49b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,2 @@ -lxpanel-0.5.6.tar.gz -/lxpanel-0.5.8.tar.gz -/lxpanel-0.5.9.tar.gz -/lxpanel-0.5.10.tar.gz -/lxpanel-0.5.12.tar.gz -/lxpanel-0.6.1.tar.gz -/lxpanel-0.8.1.tar.xz -/lxpanel-0.8.2.tar.xz -/lxpanel-0.8.99-D20161115gitd7022af2.tar.bz2 -/lxpanel-0.8.99-D20161117gitf10625d7.tar.bz2 -/lxpanel-0.8.99-D20161118git01eabc96.tar.bz2 -/lxpanel-0.8.99-D20161119git91b22034.tar.bz2 -/lxpanel-0.9.0.tar.xz -/lxpanel-0.9.0-D20161121git6d996a4e.tar.bz2 -/lxpanel-0.9.1.tar.xz -/lxpanel-0.9.1-D20161125git138ff9b2.tar.bz2 -/lxpanel-0.9.2.tar.xz -/lxpanel-0.9.3.tar.xz -/lxpanel-20180102T1713.tar.gz -/lxpanel-20180108T1513.tar.gz -/lxpanel-20180109T1532.tar.gz -/lxpanel-20180306T0014.tar.gz -/lxpanel-20190211T1504.tar.gz -/lxpanel-20190222T1342.tar.gz -/lxpanel-0.10.0.tar.xz -/lxpanel-20190302T1732.tar.gz -/lxpanel-20210201T1626.tar.gz -/lxpanel-0.10.1.tar.xz -/lxpanel-20230814T1113.tar.gz +/lxpanel-*.tar.xz +/lxpanel-*.tar.gz diff --git a/lxpanel.spec b/lxpanel.spec index 7150d54..eb43a1c 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -44,7 +44,8 @@ Version: %{main_version}%{git_ver_rpm} Release: 1%{?dist} Summary: A lightweight X11 desktop panel -License: GPLv2+ +# SPDX confirmed +License: GPL-2.0-or-later URL: http://lxde.org/ %if 0%{?use_gitbare} Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz From 4b0972ff9e6745d3bb88c6343b8446e227d30194 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 20 Aug 2023 14:36:11 +0900 Subject: [PATCH 12/38] Update to the latest git --- lxpanel.spec | 15 +++++++++------ sources | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index eb43a1c..3f8ce92 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -23,11 +23,11 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20230814 -%global gittartime 1113 +%global gittardate 20230820 +%global gittartime 1429 -%global gitbaredate 20230806 -%global git_rev 41a08b51181891f44aef4d87b849c94e2db58711 +%global gitbaredate 20230817 +%global git_rev dd0101154a5b87c5d844ccf055d5ce7b9a37d90d %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -54,7 +54,7 @@ Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz Source0: %{name}-%{version}-%{?git_version}.tar.bz2 %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 # Shell script to create tarball from git scm Source100: create-tarball-from-git.sh @@ -131,7 +131,7 @@ developing applications that use %{name}. %prep %if 0%{?use_release} || 0%{?use_git} -%setup -q -n %{name}-%{version}%{git_builddir} +%setup -q -n %{name}-%{main_version}%{git_builddir} git init %endif @@ -237,6 +237,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Sun Aug 20 2023 Mamoru TASAKA - 0.10.1^20230817gitdd010115-1 +- Update to the latest git + * Mon Aug 14 2023 Mamoru TASAKA - 0.10.1^20230806git41a08b51-1 - Update to the latest git diff --git a/sources b/sources index e628827..0941f92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20230814T1113.tar.gz) = ccb67a63fa8eee136e2e19a97e6452df69735039024bafa2d18e86c4ca57dcd72e977efee5d2e90fbf5e8e3f158e3cb4bfecd27c5bd9852354cce070f7a19569 +SHA512 (lxpanel-20230820T1429.tar.gz) = 46d5c1db8cc9a7a7ed7d88e5d55e3f26ad4e3aa5f56921e63a6642b2bac29c3e81e9bbc871888a706339f86d58ff026dfb833475f7e933baeac4a4c7234db602 From 9f10d29efe98181d97f6e9506d0245c81027567d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 15 Sep 2023 12:15:51 +0900 Subject: [PATCH 13/38] support asan --- lxpanel.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index 3f8ce92..fbe995b 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -37,11 +37,14 @@ %global git_builddir -%{git_version} %endif +%global use_gcc_strict_sanitize 0 + %global main_version 0.10.1 +%global baserelease 1 Name: lxpanel Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: %{baserelease}%{?dist}%{?use_gcc_strict_sanitize:.san} Summary: A lightweight X11 desktop panel # SPDX confirmed @@ -108,6 +111,11 @@ BuildRequires: automake BuildRequires: libtool %endif +%if 0%{?use_gcc_strict_sanitize} +BuildRequires: libasan +BuildRequires: libubsan +%endif + BuildRequires: git BuildRequires: gcc @@ -194,6 +202,15 @@ cd %{name} bash autogen.sh %endif +%if 0%{?use_gcc_strict_sanitize} +export CC="${CC} -fsanitize=address -fsanitize=undefined" +export LDFLAGS="${LDFLAGS} -pthread" +# Currently -fPIE binary cannot work with ASAN on kernel 4.12 +# https://github.com/google/sanitizers/issues/837 +export CFLAGS="$(echo $CFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')" +export LDFLAGS="$(echo $LDFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')" +%endif + %configure \ --enable-indicator-support \ --disable-silent-rules \ From 65fdd71e9bfe21d81fc3944027b185fb5067dca0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 19 Sep 2023 15:36:07 +0900 Subject: [PATCH 14/38] remove unneeded ifdefs --- lxpanel.spec | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index fbe995b..fb8cd3a 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -1,27 +1,17 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=219930 %global use_release 0 -%global use_git 0 %global use_gitbare 1 -%if 0%{?use_git} < 1 %if 0%{?use_gitbare} < 1 # force %global use_release 1 %endif -%endif %global git_version %{nil} %global git_ver_rpm %{nil} %global git_builddir %{nil} -%if 0%{?use_git} -%global git_rev 138ff9b22b45192a3b020ebbbed04e9060470a66 -%global git_date 20161125 -%global git_short %(echo %{git_rev} | cut -c-8) -%global git_version %{git_date}git%{git_short} -%endif - %if 0%{?use_gitbare} %global gittardate 20230820 %global gittartime 1429 @@ -32,7 +22,7 @@ %global git_version %{gitbaredate}git%{git_short} %endif -%if 0%{?use_git} || 0%{?use_gitbare} +%if 0%{?use_gitbare} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} %endif @@ -53,9 +43,6 @@ URL: http://lxde.org/ %if 0%{?use_gitbare} Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz %endif -%if 0%{?use_git} -Source0: %{name}-%{version}-%{?git_version}.tar.bz2 -%endif %if 0%{?use_release} Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{main_version}.tar.xz %endif @@ -106,7 +93,7 @@ BuildRequires: /usr/bin/curl-config BuildRequires: wireless-tools-devel %endif -%if 0%{?use_git} || 0%{?use_gitbare} +%if 0%{?use_gitbare} BuildRequires: automake BuildRequires: libtool %endif @@ -138,7 +125,7 @@ developing applications that use %{name}. %prep -%if 0%{?use_release} || 0%{?use_git} +%if 0%{?use_release} %setup -q -n %{name}-%{main_version}%{git_builddir} git init @@ -164,9 +151,9 @@ done %endif git config user.name "lxpanel Fedora maintainer" -git config user.email "lxpanel-owner@fedoraproject.org" +git config user.email "lxpanel-maintainer@fedoraproject.org" -%if 0%{?use_release} || 0%{?use_git} +%if 0%{?use_release} git add . git rm --cached \ config.guess config.sub configure \ @@ -198,7 +185,7 @@ git commit -m "Apply Fedora specific configulation" -a cd %{name} %endif -%if 0%{?use_git} || 0%{?use_gitbare} +%if 0%{?use_gitbare} bash autogen.sh %endif @@ -214,11 +201,7 @@ export LDFLAGS="$(echo $LDFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ %configure \ --enable-indicator-support \ --disable-silent-rules \ -%if 0%{?fedora} < 36 - --with-plugins='all' \ -%else --with-plugins='netstatus,volume,cpu,deskno,batt,kbled,xkb,thermal,cpufreq,monitors,indicator,weather' \ -%endif %{nil} %make_build From c78bfaadef507919d89938636545a8aff82985db Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 19 Sep 2023 15:52:36 +0900 Subject: [PATCH 15/38] Update to the latest git --- lxpanel.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index fb8cd3a..4e21cde 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20230820 -%global gittartime 1429 +%global gittardate 20230919 +%global gittartime 1537 -%global gitbaredate 20230817 -%global git_rev dd0101154a5b87c5d844ccf055d5ce7b9a37d90d +%global gitbaredate 20230918 +%global git_rev 633a2d46ffd37f3acde539de9a2861d1ade49ef8 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -27,7 +27,7 @@ %global git_builddir -%{git_version} %endif -%global use_gcc_strict_sanitize 0 +#%%global use_gcc_strict_sanitize 1 %global main_version 0.10.1 %global baserelease 1 @@ -237,6 +237,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Tue Sep 19 2023 Mamoru TASAKA - 0.10.1^20230918git633a2d46-1 +- Update to the latest git + * Sun Aug 20 2023 Mamoru TASAKA - 0.10.1^20230817gitdd010115-1 - Update to the latest git diff --git a/sources b/sources index 0941f92..a22a158 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20230820T1429.tar.gz) = 46d5c1db8cc9a7a7ed7d88e5d55e3f26ad4e3aa5f56921e63a6642b2bac29c3e81e9bbc871888a706339f86d58ff026dfb833475f7e933baeac4a4c7234db602 +SHA512 (lxpanel-20230919T1537.tar.gz) = 6fead5f08eebc244c05f63dc54b12310a1e4f00269e296baad08114ecb12b7bd2e3826cf3e8fad5bcad37c7f73a97dc556e9219645f7c11b85d8f47d5edc6361 From d0f692b0c03ffc3dca91327256bde8b64c6c3483 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 20 Jan 2024 07:49:00 +0900 Subject: [PATCH 16/38] Change -Wincompatible-pointer-types from error to warning --- lxpanel.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index 4e21cde..a625dc3 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -1,3 +1,6 @@ +# Skip -Werror=incompatilbe-pointer-types +%global build_type_safety_c 2 + # Review: https://bugzilla.redhat.com/show_bug.cgi?id=219930 %global use_release 0 @@ -30,7 +33,7 @@ #%%global use_gcc_strict_sanitize 1 %global main_version 0.10.1 -%global baserelease 1 +%global baserelease 2 Name: lxpanel Version: %{main_version}%{git_ver_rpm} @@ -237,6 +240,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Fri Jan 19 2024 Mamoru TASAKA - 0.10.1^20230918git633a2d46-2 +- Change -Wincompatible-pointer-types from error to warning + * Tue Sep 19 2023 Mamoru TASAKA - 0.10.1^20230918git633a2d46-1 - Update to the latest git From b13df3a995a08bb6af2ad8cd870733e569fb2881 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 05:25:31 +0000 Subject: [PATCH 17/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lxpanel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index a625dc3..359d8bb 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -33,7 +33,7 @@ #%%global use_gcc_strict_sanitize 1 %global main_version 0.10.1 -%global baserelease 2 +%global baserelease 3 Name: lxpanel Version: %{main_version}%{git_ver_rpm} @@ -240,6 +240,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.10.1^20230918git633a2d46-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Mamoru TASAKA - 0.10.1^20230918git633a2d46-2 - Change -Wincompatible-pointer-types from error to warning From 642653cd6e02434275f415ad1515432c90b98f0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 16:25:35 +0000 Subject: [PATCH 18/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- lxpanel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index 359d8bb..f451247 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -33,7 +33,7 @@ #%%global use_gcc_strict_sanitize 1 %global main_version 0.10.1 -%global baserelease 3 +%global baserelease 4 Name: lxpanel Version: %{main_version}%{git_ver_rpm} @@ -240,6 +240,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.10.1^20230918git633a2d46-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.10.1^20230918git633a2d46-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2bfe95751f2894692d12018cbaae04dbbd00db65 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 26 Jul 2024 11:30:02 +0900 Subject: [PATCH 19/38] Apply upstream PR to fix gcc14 -Werror=incompatible-pointer-types --- lxpanel.spec | 12 +++++++---- pr70-fix-incompatible-pointer-types.patch | 25 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 pr70-fix-incompatible-pointer-types.patch diff --git a/lxpanel.spec b/lxpanel.spec index f451247..e5f8e8d 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -1,6 +1,3 @@ -# Skip -Werror=incompatilbe-pointer-types -%global build_type_safety_c 2 - # Review: https://bugzilla.redhat.com/show_bug.cgi?id=219930 %global use_release 0 @@ -33,7 +30,7 @@ #%%global use_gcc_strict_sanitize 1 %global main_version 0.10.1 -%global baserelease 4 +%global baserelease 5 Name: lxpanel Version: %{main_version}%{git_ver_rpm} @@ -58,6 +55,9 @@ Patch0: lxpanel-0.8.1-Fix-pager-scroll.patch # Patches reported upstream Patch52: 0002-SF-894-task-button-correctly-find-the-window-current.patch +# https://github.com/lxde/lxpanel/pull/70 +# Fix build with gcc14 -Werror=incompatible-pointer-types +Patch70: pr70-fix-incompatible-pointer-types.patch ## distro specific patches # default configuration @@ -166,6 +166,7 @@ git commit -m "base" -q %endif cat %PATCH52 | git am +cat %PATCH70 | git am cat %PATCH103 | git am %patch -P0 -p1 -b .revert @@ -240,6 +241,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Fri Jul 26 2024 Mamoru TASAKA - 0.10.1^20230918git633a2d46-5 +- Apply upstream PR to fix gcc14 -Werror=incompatible-pointer-types + * Thu Jul 18 2024 Fedora Release Engineering - 0.10.1^20230918git633a2d46-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/pr70-fix-incompatible-pointer-types.patch b/pr70-fix-incompatible-pointer-types.patch new file mode 100644 index 0000000..7e758e4 --- /dev/null +++ b/pr70-fix-incompatible-pointer-types.patch @@ -0,0 +1,25 @@ +From 914bcc3945503be2506e112883a648b867c6db57 Mon Sep 17 00:00:00 2001 +From: Ravi Kant Sharma <600723+raviksharma@users.noreply.github.com> +Date: Tue, 23 Jul 2024 18:02:44 +0200 +Subject: [PATCH] fix build failure on gcc-14 + +gcc-14 treats implicitly casting all pointer types to all other pointer types as error now. + +https://gcc.gnu.org/gcc-14/porting_to.html#warnings-as-errors +--- + plugins/tray.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/tray.c b/plugins/tray.c +index 3e66b81f..42d4917c 100644 +--- a/plugins/tray.c ++++ b/plugins/tray.c +@@ -631,7 +631,7 @@ static GtkWidget *tray_constructor(LXPanel *panel, config_setting_t *settings) + /* Add GDK event filter. */ + gdk_window_add_filter(NULL, (GdkFilterFunc) tray_event_filter, tr); + /* Reference the window since it is never added to a container. */ +- tr->invisible = g_object_ref_sink(G_OBJECT(invisible)); ++ tr->invisible = (GtkWidget *) g_object_ref_sink(G_OBJECT(invisible)); + tr->invisible_window = GDK_WINDOW_XID(gtk_widget_get_window(invisible)); + + /* Allocate top level widget and set into Plugin widget pointer. */ From 35bbaf75843f3963200955f75f6169ad8e6ba587 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Aug 2024 15:39:25 +0900 Subject: [PATCH 20/38] Update to the latest git --- lxpanel.spec | 17 ++++++++------- pr70-fix-incompatible-pointer-types.patch | 25 ----------------------- sources | 2 +- 3 files changed, 9 insertions(+), 35 deletions(-) delete mode 100644 pr70-fix-incompatible-pointer-types.patch diff --git a/lxpanel.spec b/lxpanel.spec index e5f8e8d..7158465 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20230919 -%global gittartime 1537 +%global gittardate 20240808 +%global gittartime 1527 -%global gitbaredate 20230918 -%global git_rev 633a2d46ffd37f3acde539de9a2861d1ade49ef8 +%global gitbaredate 20240807 +%global git_rev 65d86bec5b3a3ec6185b0ec8ac99c98251fe3ba7 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -30,7 +30,7 @@ #%%global use_gcc_strict_sanitize 1 %global main_version 0.10.1 -%global baserelease 5 +%global baserelease 1 Name: lxpanel Version: %{main_version}%{git_ver_rpm} @@ -55,9 +55,6 @@ Patch0: lxpanel-0.8.1-Fix-pager-scroll.patch # Patches reported upstream Patch52: 0002-SF-894-task-button-correctly-find-the-window-current.patch -# https://github.com/lxde/lxpanel/pull/70 -# Fix build with gcc14 -Werror=incompatible-pointer-types -Patch70: pr70-fix-incompatible-pointer-types.patch ## distro specific patches # default configuration @@ -166,7 +163,6 @@ git commit -m "base" -q %endif cat %PATCH52 | git am -cat %PATCH70 | git am cat %PATCH103 | git am %patch -P0 -p1 -b .revert @@ -241,6 +237,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Aug 08 2024 Mamoru TASAKA - 0.10.1^20240807git65d86bec-1 +- Update to the latest git + * Fri Jul 26 2024 Mamoru TASAKA - 0.10.1^20230918git633a2d46-5 - Apply upstream PR to fix gcc14 -Werror=incompatible-pointer-types diff --git a/pr70-fix-incompatible-pointer-types.patch b/pr70-fix-incompatible-pointer-types.patch deleted file mode 100644 index 7e758e4..0000000 --- a/pr70-fix-incompatible-pointer-types.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 914bcc3945503be2506e112883a648b867c6db57 Mon Sep 17 00:00:00 2001 -From: Ravi Kant Sharma <600723+raviksharma@users.noreply.github.com> -Date: Tue, 23 Jul 2024 18:02:44 +0200 -Subject: [PATCH] fix build failure on gcc-14 - -gcc-14 treats implicitly casting all pointer types to all other pointer types as error now. - -https://gcc.gnu.org/gcc-14/porting_to.html#warnings-as-errors ---- - plugins/tray.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/tray.c b/plugins/tray.c -index 3e66b81f..42d4917c 100644 ---- a/plugins/tray.c -+++ b/plugins/tray.c -@@ -631,7 +631,7 @@ static GtkWidget *tray_constructor(LXPanel *panel, config_setting_t *settings) - /* Add GDK event filter. */ - gdk_window_add_filter(NULL, (GdkFilterFunc) tray_event_filter, tr); - /* Reference the window since it is never added to a container. */ -- tr->invisible = g_object_ref_sink(G_OBJECT(invisible)); -+ tr->invisible = (GtkWidget *) g_object_ref_sink(G_OBJECT(invisible)); - tr->invisible_window = GDK_WINDOW_XID(gtk_widget_get_window(invisible)); - - /* Allocate top level widget and set into Plugin widget pointer. */ diff --git a/sources b/sources index a22a158..7140a6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20230919T1537.tar.gz) = 6fead5f08eebc244c05f63dc54b12310a1e4f00269e296baad08114ecb12b7bd2e3826cf3e8fad5bcad37c7f73a97dc556e9219645f7c11b85d8f47d5edc6361 +SHA512 (lxpanel-20240808T1527.tar.gz) = e72890f061cf3307cb056e05d09d9014c80ce6e82c2a6c59e886adee5cb54e96e642303473c7bc73f827a961cbb0f4215fb551f383b34a347059d28867396ea6 From b80c41e5e8dbdc3eb78c71ca8ce8b8833bb46094 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Aug 2024 16:54:35 +0900 Subject: [PATCH 21/38] Update to the latest git Update to the latest git --- lxpanel.spec | 23 ++++++++++++++++++----- sources | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index 7158465..6d9ab3b 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20240808 -%global gittartime 1527 +%global gittardate 20240825 +%global gittartime 1558 -%global gitbaredate 20240807 -%global git_rev 65d86bec5b3a3ec6185b0ec8ac99c98251fe3ba7 +%global gitbaredate 20240823 +%global git_rev 95815af33cb13343790c356357bdc439f4941d28 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -137,7 +137,6 @@ git clone ./%{name}.git/ cd %{name} git checkout -b %{main_version}-fedora %{git_rev} -cp -a [A-Z]* .. cat > GITHASH < - 0.10.1^20240823git95815af3-1 +- Update to the latest git + * Thu Aug 08 2024 Mamoru TASAKA - 0.10.1^20240807git65d86bec-1 - Update to the latest git diff --git a/sources b/sources index 7140a6e..be45bca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20240808T1527.tar.gz) = e72890f061cf3307cb056e05d09d9014c80ce6e82c2a6c59e886adee5cb54e96e642303473c7bc73f827a961cbb0f4215fb551f383b34a347059d28867396ea6 +SHA512 (lxpanel-20240825T1558.tar.gz) = 02f3fdcf8c747c436d992b8d6c9a665fbdf3b6e650620ca5eca6ef4def3b348fd6c45a7f70ace8343d793048770acf7ae9a813a842a699a793d3aad8c9ecf64d From 6b2d0f0a25ad271db8d998d1a6ca4615782edf09 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 6 Sep 2024 14:13:21 +0900 Subject: [PATCH 22/38] Update to the latest git Update to the latest git --- lxpanel.spec | 15 +++++++-------- sources | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index 6d9ab3b..d4b93e8 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20240825 -%global gittartime 1558 +%global gittardate 20240906 +%global gittartime 1407 -%global gitbaredate 20240823 -%global git_rev 95815af33cb13343790c356357bdc439f4941d28 +%global gitbaredate 20240825 +%global git_rev ffd815fc2d30a5fe339e5c927060a14cdc88e345 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -202,10 +202,6 @@ bash autogen.sh %if 0%{?use_gcc_strict_sanitize} export CC="${CC} -fsanitize=address -fsanitize=undefined" export LDFLAGS="${LDFLAGS} -pthread" -# Currently -fPIE binary cannot work with ASAN on kernel 4.12 -# https://github.com/google/sanitizers/issues/837 -export CFLAGS="$(echo $CFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')" -export LDFLAGS="$(echo $LDFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')" %endif %configure \ @@ -247,6 +243,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Fri Sep 06 2024 Mamoru TASAKA - 0.10.1^20240825gitffd815fc-1 +- Update to the latest git + * Sun Aug 25 2024 Mamoru TASAKA - 0.10.1^20240823git95815af3-1 - Update to the latest git diff --git a/sources b/sources index be45bca..26aac40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20240825T1558.tar.gz) = 02f3fdcf8c747c436d992b8d6c9a665fbdf3b6e650620ca5eca6ef4def3b348fd6c45a7f70ace8343d793048770acf7ae9a813a842a699a793d3aad8c9ecf64d +SHA512 (lxpanel-20240906T1407.tar.gz) = 5e6da20cbf5515fd0c49edc2c726218b0ba72725d1e9e8fc5b951ddbd654f8182cdbc5bc352a300e47e31d40be269efcfc85262059919ff64580eae3f7983c61 From 6dd6cfc8cc388f94cf96213e4e0f8d1d60c0dd0e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 20 Dec 2024 14:41:41 +0900 Subject: [PATCH 23/38] Update to the latest git --- lxpanel-0.5.9-default.patch | 26 -------------------------- lxpanel.spec | 24 ++++++++---------------- sources | 2 +- 3 files changed, 9 insertions(+), 43 deletions(-) diff --git a/lxpanel-0.5.9-default.patch b/lxpanel-0.5.9-default.patch index 91c427b..898296e 100644 --- a/lxpanel-0.5.9-default.patch +++ b/lxpanel-0.5.9-default.patch @@ -29,19 +29,6 @@ diff -dur lxpanel-0.5.9.orig/data/default/panels/panel.in lxpanel-0.5.9/data/def command=logout } } -@@ -52,10 +53,10 @@ - type = launchbar - Config { - Button { -- id=pcmanfm.desktop -+ id=fedora-pcmanfm.desktop - } - Button { -- id=gnome-terminal.desktop -+ id=fedora-lxterminal.desktop - } - Button { - id=firefox.desktop @@ -75,6 +76,7 @@ Config { Button1=iconify @@ -107,16 +94,3 @@ diff -dur lxpanel-0.5.9.orig/data/two_panels/panels/top.in lxpanel-0.5.9/data/tw } } } -@@ -52,10 +53,10 @@ - type = launchbar - Config { - Button { -- id=pcmanfm.desktop -+ id=fedora-pcmanfm.desktop - } - Button { -- id=gnome-terminal.desktop -+ id=fedora-lxterminal.desktop - } - Button { - id=firefox.desktop diff --git a/lxpanel.spec b/lxpanel.spec index d4b93e8..7b70022 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20240906 -%global gittartime 1407 +%global gittardate 20241220 +%global gittartime 0038 -%global gitbaredate 20240825 -%global git_rev ffd815fc2d30a5fe339e5c927060a14cdc88e345 +%global gitbaredate 20241213 +%global git_rev 5eb39f111e9de0eddfc7beee218fb0f6109bda59 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -27,7 +27,7 @@ %global git_builddir -%{git_version} %endif -#%%global use_gcc_strict_sanitize 1 +%dnl %global use_gcc_strict_sanitize 1 %global main_version 0.10.1 %global baserelease 1 @@ -88,11 +88,6 @@ BuildRequires: pkgconfig(libmenu-cache) >= 0.3.0 BuildRequires: pkgconfig(alsa) BuildRequires: /usr/bin/curl-config -%if 0%{?fedora} < 36 -# required for netstatus plugin -BuildRequires: wireless-tools-devel -%endif - %if 0%{?use_gitbare} BuildRequires: automake BuildRequires: libtool @@ -182,12 +177,6 @@ cat %PATCH103 | git am %patch -P102 -p1 -b .zenity %patch -P104 -p1 -b .batt_pending -# Fedora >= 19 doesn't use vendor prefixes for desktop files. Instead of -# maintaining two patches we just strip the prefixes from the files we just -# patched with patch 100. -sed -i 's|id=fedora-|id=|' data/default/panels/panel.in \ - data/two_panels/panels/bottom.in \ - data/two_panels/panels/top.in git commit -m "Apply Fedora specific configulation" -a %build @@ -243,6 +232,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Fri Dec 20 2024 Mamoru TASAKA - 0.10.1^20241213git5eb39f11-1 +- Update to the latest git + * Fri Sep 06 2024 Mamoru TASAKA - 0.10.1^20240825gitffd815fc-1 - Update to the latest git diff --git a/sources b/sources index 26aac40..4d25b9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20240906T1407.tar.gz) = 5e6da20cbf5515fd0c49edc2c726218b0ba72725d1e9e8fc5b951ddbd654f8182cdbc5bc352a300e47e31d40be269efcfc85262059919ff64580eae3f7983c61 +SHA512 (lxpanel-20241220T0038.tar.gz) = ac6564a35aba2eae26957bb977cba5ec16fcc586bc5c5508dafd08d72f55802c1d1e69490ce8ca29fad8ff1553550584ed23f984344d37d7324a34a7c15588f8 From f2f383e91851a9407af3283d5cf795b8e0bed1cf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Dec 2024 18:17:49 +0900 Subject: [PATCH 24/38] Update to the latet git --- lxpanel.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index 7b70022..9ab6d4b 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20241220 -%global gittartime 0038 +%global gittardate 20241225 +%global gittartime 1813 -%global gitbaredate 20241213 -%global git_rev 5eb39f111e9de0eddfc7beee218fb0f6109bda59 +%global gitbaredate 20241223 +%global git_rev d45c45ae6515f70a7f4fc79d5f374183d7b8e4b7 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -232,6 +232,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Wed Dec 25 2024 Mamoru TASAKA - 0.10.1^20241223gitd45c45ae-1 +- Update to the latest git + * Fri Dec 20 2024 Mamoru TASAKA - 0.10.1^20241213git5eb39f11-1 - Update to the latest git diff --git a/sources b/sources index 4d25b9c..37fffc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20241220T0038.tar.gz) = ac6564a35aba2eae26957bb977cba5ec16fcc586bc5c5508dafd08d72f55802c1d1e69490ce8ca29fad8ff1553550584ed23f984344d37d7324a34a7c15588f8 +SHA512 (lxpanel-20241225T1813.tar.gz) = 4fa54386a95912376dcc38a763588a1e5c54540f0f1fb976ec69e7d68a2cc541449feea579683a485d07030ff285348be9f39a611c1f2f3e70875374195df77f From c5781c2e5d8b6e91aa1e4f8b71a9be27c09bc29a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:31:27 +0000 Subject: [PATCH 25/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- lxpanel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index 9ab6d4b..3c6b243 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -30,7 +30,7 @@ %dnl %global use_gcc_strict_sanitize 1 %global main_version 0.10.1 -%global baserelease 1 +%global baserelease 2 Name: lxpanel Version: %{main_version}%{git_ver_rpm} @@ -232,6 +232,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.10.1^20241223gitd45c45ae-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Dec 25 2024 Mamoru TASAKA - 0.10.1^20241223gitd45c45ae-1 - Update to the latest git From fea1bba6a5743363614f72d939f506a817122939 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Jan 2025 10:24:41 +0900 Subject: [PATCH 26/38] update to the latest git --- lxpanel-0.10.1-batt-chaging-pending.patch | 12 ------------ lxpanel.spec | 16 ++++++++-------- sources | 2 +- 3 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 lxpanel-0.10.1-batt-chaging-pending.patch diff --git a/lxpanel-0.10.1-batt-chaging-pending.patch b/lxpanel-0.10.1-batt-chaging-pending.patch deleted file mode 100644 index 10ffea2..0000000 --- a/lxpanel-0.10.1-batt-chaging-pending.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp lxpanel-0.10.1/plugins/batt.orig/batt_sys.c lxpanel-0.10.1/plugins/batt/batt_sys.c ---- lxpanel-0.10.1/plugins/batt.orig/batt_sys.c 2021-01-30 07:34:46.000000000 +0900 -+++ lxpanel-0.10.1/plugins/batt/batt_sys.c 2023-02-07 16:34:54.182239090 +0900 -@@ -396,6 +396,7 @@ gboolean battery_is_charging( battery *b - return ( strcasecmp( b->state, "Unknown" ) == 0 - || strcasecmp( b->state, "Full" ) == 0 - || strcasecmp( b->state, "Charging" ) == 0 -+ || strcasecmp( b->state, "not charging" ) == 0 - || b->current_now == 0 ); /* bug sf.net, #720 */ - } - -Only in lxpanel-0.10.1/plugins/batt: batt_sys.c~ diff --git a/lxpanel.spec b/lxpanel.spec index 9ab6d4b..63b9064 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20241225 -%global gittartime 1813 +%global gittardate 20250124 +%global gittartime 1010 -%global gitbaredate 20241223 -%global git_rev d45c45ae6515f70a7f4fc79d5f374183d7b8e4b7 +%global gitbaredate 20250123 +%global git_rev 13a51958a92130674843d728805ebc39e12062ca %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -27,7 +27,7 @@ %global git_builddir -%{git_version} %endif -%dnl %global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 1 %global main_version 0.10.1 %global baserelease 1 @@ -67,8 +67,6 @@ Patch102: lxpanel-0.8.2-battery-plugin-use-zenity.patch # volumealsa: poll alsa mixer several times at startup (for pipewire) # https://bugzilla.redhat.com/show_bug.cgi?id=1960829 Patch103: lxpanel-0.10.1-0003-volumealsa-poll-alsa-mixer-several-times-at-startup.patch -# batt: make the status green on batt when the state is "not charging" -Patch104: lxpanel-0.10.1-batt-chaging-pending.patch #BuildRequires: docbook-utils @@ -175,7 +173,6 @@ cat %PATCH103 | git am %patch -P100 -p1 -b .default #%%patch101 -p1 -b .system-config-network %patch -P102 -p1 -b .zenity -%patch -P104 -p1 -b .batt_pending git commit -m "Apply Fedora specific configulation" -a @@ -232,6 +229,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Fri Jan 24 2025 Mamoru TASAKA - 0.10.1^20250123git13a51958-1 +- Update to the latest git + * Wed Dec 25 2024 Mamoru TASAKA - 0.10.1^20241223gitd45c45ae-1 - Update to the latest git diff --git a/sources b/sources index 37fffc8..675a98b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20241225T1813.tar.gz) = 4fa54386a95912376dcc38a763588a1e5c54540f0f1fb976ec69e7d68a2cc541449feea579683a485d07030ff285348be9f39a611c1f2f3e70875374195df77f +SHA512 (lxpanel-20250124T1010.tar.gz) = 6e15e9603d25c249a5beb50457ecc42bc1f91b292f72a5e251da64d4197551113f851c243a2d7317c3d68292f1babdbe48b533434e41ca210c62996d422ed43f From f5bb3c08124dfd415c659e7149c102fc067737d0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Jan 2025 10:26:18 +0900 Subject: [PATCH 27/38] kill sanitizer --- lxpanel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index e1c50be..ed9f9ed 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -27,7 +27,7 @@ %global git_builddir -%{git_version} %endif -%global use_gcc_strict_sanitize 1 +%dnl %global use_gcc_strict_sanitize 1 %global main_version 0.10.1 %global baserelease 1 From 89892d79327fabf9bf01fcf26d2c8d4c7fad93c7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 7 Feb 2025 11:10:08 +0900 Subject: [PATCH 28/38] update to the latest git --- lxpanel-0.5.9-default.patch | 13 +++---------- lxpanel-0.8.1-Fix-pager-scroll.patch | 11 ----------- lxpanel.spec | 16 +++++++--------- sources | 2 +- 4 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 lxpanel-0.8.1-Fix-pager-scroll.patch diff --git a/lxpanel-0.5.9-default.patch b/lxpanel-0.5.9-default.patch index 898296e..f6e4080 100644 --- a/lxpanel-0.5.9-default.patch +++ b/lxpanel-0.5.9-default.patch @@ -14,7 +14,7 @@ diff -dur lxpanel-0.5.9.orig/data/default/panels/panel.in lxpanel-0.5.9/data/def backgroundfile=@prefix@/share/lxpanel/images/background.png } -@@ -37,12 +37,13 @@ +@@ -30,12 +30,13 @@ separator { } item { @@ -29,7 +29,7 @@ diff -dur lxpanel-0.5.9.orig/data/default/panels/panel.in lxpanel-0.5.9/data/def command=logout } } -@@ -75,6 +76,7 @@ +@@ -69,6 +70,7 @@ Config { Button1=iconify Button2=shade @@ -69,14 +69,7 @@ diff -dur lxpanel-0.5.9.orig/data/two_panels/panels/top.in lxpanel-0.5.9/data/tw usefontsize=0 fontsize=10 background=0 -@@ -31,19 +31,20 @@ - Plugin { - type = menu - Config { -- image = @prefix@/share/lxpanel/images/my-computer.svg -+ image=@prefix@/share/lxpanel/images/my-computer.png - system { - } +@@ -30,13 +30,14 @@ separator { } item { diff --git a/lxpanel-0.8.1-Fix-pager-scroll.patch b/lxpanel-0.8.1-Fix-pager-scroll.patch deleted file mode 100644 index 4874a9b..0000000 --- a/lxpanel-0.8.1-Fix-pager-scroll.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lxpanel-0.8.1/plugins/xkb/xkb-plugin.c.revert 2015-05-07 04:44:51.000000000 +0900 -+++ lxpanel-0.8.1/plugins/xkb/xkb-plugin.c 2015-05-24 15:58:10.987343168 +0900 -@@ -190,7 +190,7 @@ - - /* Change to next or previous group. */ - xkb_change_group(xkb, -- (((event->direction == GDK_SCROLL_UP) || (event->direction == GDK_SCROLL_RIGHT)) ? 1 : -1)); -+ (((event->direction == GDK_SCROLL_DOWN) || (event->direction == GDK_SCROLL_RIGHT)) ? 1 : -1)); - return TRUE; - } - diff --git a/lxpanel.spec b/lxpanel.spec index ed9f9ed..64acac0 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250124 -%global gittartime 1010 +%global gittardate 20250207 +%global gittartime 1023 -%global gitbaredate 20250123 -%global git_rev 13a51958a92130674843d728805ebc39e12062ca +%global gitbaredate 20250131 +%global git_rev 4dcce30a02b6112b869eabf1d226121f02ced16b %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -50,9 +50,6 @@ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{main_versi Source100: create-tarball-from-git.sh Source101: create-lxpanel-git-bare-tarball.sh -# Fedora bug: https://bugzilla.redhat.com/show_bug.cgi?id=746063 -Patch0: lxpanel-0.8.1-Fix-pager-scroll.patch - # Patches reported upstream Patch52: 0002-SF-894-task-button-correctly-find-the-window-current.patch @@ -168,8 +165,6 @@ git commit -m "base" -q cat %PATCH52 | git am cat %PATCH103 | git am -%patch -P0 -p1 -b .revert - %patch -P100 -p1 -b .default #%%patch101 -p1 -b .system-config-network %patch -P102 -p1 -b .zenity @@ -229,6 +224,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Fri Feb 07 2025 Mamoru TASAKA - 0.10.1^20250131git4dcce30a-1 +- Update to the latest git + * Fri Jan 24 2025 Mamoru TASAKA - 0.10.1^20250123git13a51958-1 - Update to the latest git diff --git a/sources b/sources index 675a98b..4e20045 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20250124T1010.tar.gz) = 6e15e9603d25c249a5beb50457ecc42bc1f91b292f72a5e251da64d4197551113f851c243a2d7317c3d68292f1babdbe48b533434e41ca210c62996d422ed43f +SHA512 (lxpanel-20250207T1023.tar.gz) = c2ed29b41cb599cb031a5599567daba1068b557e33584bbf1846dcadc5131c370bb3dadeadd94ae10c94991f8a32edbdc5565e3f21f64da5bce45354a011fd3f From 6f514737dd0959277b74ced54cf6dbd21dde8058 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Feb 2025 11:19:35 +0900 Subject: [PATCH 29/38] update to the latest git --- lxpanel.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index 64acac0..b068532 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250207 -%global gittartime 1023 +%global gittardate 20250214 +%global gittartime 1031 -%global gitbaredate 20250131 -%global git_rev 4dcce30a02b6112b869eabf1d226121f02ced16b +%global gitbaredate 20250207 +%global git_rev e4e9b89ca26aa0adef81d8984c072c4725c52c82 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -224,6 +224,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Fri Feb 14 2025 Mamoru TASAKA - 0.10.1^20250207gite4e9b89c-1 +- Update to the latest git + * Fri Feb 07 2025 Mamoru TASAKA - 0.10.1^20250131git4dcce30a-1 - Update to the latest git diff --git a/sources b/sources index 4e20045..d47b197 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20250207T1023.tar.gz) = c2ed29b41cb599cb031a5599567daba1068b557e33584bbf1846dcadc5131c370bb3dadeadd94ae10c94991f8a32edbdc5565e3f21f64da5bce45354a011fd3f +SHA512 (lxpanel-20250214T1031.tar.gz) = 1bf53931017010ce53b983604965eb4f5065613a36c17fcfb7d1feae73b8445ad81a9e53553299abaf7e72c6dbed436993960ea17b5d2d3071ac2153ff1c0d24 From b572db61c11148517bd678d74fc50a921bce0be9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 16 Feb 2025 16:43:46 +0900 Subject: [PATCH 30/38] update to the latest git --- lxpanel.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index b068532..44f80fa 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250214 -%global gittartime 1031 +%global gittardate 20250216 +%global gittartime 1636 -%global gitbaredate 20250207 -%global git_rev e4e9b89ca26aa0adef81d8984c072c4725c52c82 +%global gitbaredate 20250215 +%global git_rev 56103c8344a808c8a110ed99fdebdaf1218460ac %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -224,6 +224,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Sun Feb 16 2025 Mamoru TASAKA - 0.10.1^20250215git56103c83-1 +- Update to the latest git + * Fri Feb 14 2025 Mamoru TASAKA - 0.10.1^20250207gite4e9b89c-1 - Update to the latest git diff --git a/sources b/sources index d47b197..e1c4887 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20250214T1031.tar.gz) = 1bf53931017010ce53b983604965eb4f5065613a36c17fcfb7d1feae73b8445ad81a9e53553299abaf7e72c6dbed436993960ea17b5d2d3071ac2153ff1c0d24 +SHA512 (lxpanel-20250216T1636.tar.gz) = b4bb58f57c376b03d4560391da61a7981f901424d015562f2aebfbb2dff9feb681e4cb464161c321bea9a7df62fd2faf4dc51b19cb84a2a947d70fd45d16c410 From 3b86377dbadbce2ef828b998affccd4f96a73ae5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 6 Mar 2025 15:12:46 +0900 Subject: [PATCH 31/38] update to the latest git --- lxpanel-0.5.9-default.patch | 6 +++--- lxpanel.spec | 11 +++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lxpanel-0.5.9-default.patch b/lxpanel-0.5.9-default.patch index f6e4080..6328e3a 100644 --- a/lxpanel-0.5.9-default.patch +++ b/lxpanel-0.5.9-default.patch @@ -8,7 +8,7 @@ diff -dur lxpanel-0.5.9.orig/data/default/panels/panel.in lxpanel-0.5.9/data/def - fontcolor=#ffffff + fontcolor=#000000 usefontsize=0 - fontsize=10 + fontsize=10 - background=1 + background=0 backgroundfile=@prefix@/share/lxpanel/images/background.png @@ -47,7 +47,7 @@ diff -dur lxpanel-0.5.9.orig/data/two_panels/panels/bottom.in lxpanel-0.5.9/data - fontcolor=#ffffff + fontcolor=#000000 usefontsize=0 - fontsize=10 + fontsize=10 background=0 @@ -33,6 +33,7 @@ Config { @@ -67,7 +67,7 @@ diff -dur lxpanel-0.5.9.orig/data/two_panels/panels/top.in lxpanel-0.5.9/data/tw - fontcolor=#ffffff + fontcolor=#000000 usefontsize=0 - fontsize=10 + fontsize=10 background=0 @@ -30,13 +30,14 @@ separator { diff --git a/lxpanel.spec b/lxpanel.spec index 44f80fa..952b03c 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250216 -%global gittartime 1636 +%global gittardate 20250306 +%global gittartime 1420 -%global gitbaredate 20250215 -%global git_rev 56103c8344a808c8a110ed99fdebdaf1218460ac +%global gitbaredate 20250226 +%global git_rev eb1688daef1214f00ef7d5fb3749d09248cb39d5 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -224,6 +224,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Mar 06 2025 Mamoru TASAKA - 0.10.1^20250226giteb1688da-1 +- Update to the latest git + * Sun Feb 16 2025 Mamoru TASAKA - 0.10.1^20250215git56103c83-1 - Update to the latest git diff --git a/sources b/sources index e1c4887..19024a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20250216T1636.tar.gz) = b4bb58f57c376b03d4560391da61a7981f901424d015562f2aebfbb2dff9feb681e4cb464161c321bea9a7df62fd2faf4dc51b19cb84a2a947d70fd45d16c410 +SHA512 (lxpanel-20250306T1420.tar.gz) = 76675c91ff76c502d109d4b5021491b54fcd445a18ad57b6eb5906457e9c1b29c40f94781e2b9e03498dff86857941abaa6f6f60ae0d52c57603796f8d6c0854 From 8e52dc45025fe3aa93e5cea3153fc4aba6e8d616 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 11 Mar 2025 23:09:52 +0900 Subject: [PATCH 32/38] update to the latest git --- lxpanel.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index 952b03c..ec878f6 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250306 -%global gittartime 1420 +%global gittardate 20250311 +%global gittartime 2303 -%global gitbaredate 20250226 -%global git_rev eb1688daef1214f00ef7d5fb3749d09248cb39d5 +%global gitbaredate 20250311 +%global git_rev 30ebe893e1de03e57d06fd53447ab20eaa9b6c5a %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -224,6 +224,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Tue Mar 11 2025 Mamoru TASAKA - 0.10.1^20250311git30ebe893-1 +- Update to the latest git + * Thu Mar 06 2025 Mamoru TASAKA - 0.10.1^20250226giteb1688da-1 - Update to the latest git diff --git a/sources b/sources index 19024a4..cea8154 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20250306T1420.tar.gz) = 76675c91ff76c502d109d4b5021491b54fcd445a18ad57b6eb5906457e9c1b29c40f94781e2b9e03498dff86857941abaa6f6f60ae0d52c57603796f8d6c0854 +SHA512 (lxpanel-20250311T2303.tar.gz) = bd956548da5a29d937c44146b89a19861e0f70d6b1c50b8c592a930f5295e6acfa528a13215dbf7bbdcf343d852eebdeb47d5c2b3402ef950a62142267d8d318 From 28eab878a9c9d108598f3022a1b8959da5555305 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 22 Mar 2025 17:47:17 +0900 Subject: [PATCH 33/38] rename --- lxpanel-0.5.9-default.patch => lxpanel-0.10.2-default.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lxpanel-0.5.9-default.patch => lxpanel-0.10.2-default.patch (100%) diff --git a/lxpanel-0.5.9-default.patch b/lxpanel-0.10.2-default.patch similarity index 100% rename from lxpanel-0.5.9-default.patch rename to lxpanel-0.10.2-default.patch From 68349380b8843ceafb04f47c73903ddab60a3cb1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 22 Mar 2025 17:59:02 +0900 Subject: [PATCH 34/38] Update to the latest git --- lxpanel-0.10.2-default.patch | 14 ++++++-------- lxpanel.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/lxpanel-0.10.2-default.patch b/lxpanel-0.10.2-default.patch index 6328e3a..e4984f2 100644 --- a/lxpanel-0.10.2-default.patch +++ b/lxpanel-0.10.2-default.patch @@ -1,15 +1,13 @@ diff -dur lxpanel-0.5.9.orig/data/default/panels/panel.in lxpanel-0.5.9/data/default/panels/panel.in --- lxpanel-0.5.9.orig/data/default/panels/panel.in 2012-04-08 01:27:42.000000000 +0200 +++ lxpanel-0.5.9/data/default/panels/panel.in 2012-06-10 19:12:25.864088270 +0200 -@@ -14,10 +14,10 @@ +@@ -14,8 +14,8 @@ setdocktype=1 setpartialstrut=1 usefontcolor=1 - fontcolor=#ffffff -+ fontcolor=#000000 - usefontsize=0 - fontsize=10 - background=1 ++ fontcolor=#000000 + background=0 backgroundfile=@prefix@/share/lxpanel/images/background.png } @@ -46,9 +44,9 @@ diff -dur lxpanel-0.5.9.orig/data/two_panels/panels/bottom.in lxpanel-0.5.9/data usefontcolor=0 - fontcolor=#ffffff + fontcolor=#000000 - usefontsize=0 - fontsize=10 background=0 + backgroundfile=@prefix@/share/lxpanel/images/background.png + } @@ -33,6 +33,7 @@ Config { Button1=iconify @@ -66,9 +64,9 @@ diff -dur lxpanel-0.5.9.orig/data/two_panels/panels/top.in lxpanel-0.5.9/data/tw usefontcolor=0 - fontcolor=#ffffff + fontcolor=#000000 - usefontsize=0 - fontsize=10 background=0 + backgroundfile=@prefix@/share/lxpanel/images/background.png + } @@ -30,13 +30,14 @@ separator { } diff --git a/lxpanel.spec b/lxpanel.spec index ec878f6..dad4997 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,11 +13,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250311 -%global gittartime 2303 +%global gittardate 20250322 +%global gittartime 1006 -%global gitbaredate 20250311 -%global git_rev 30ebe893e1de03e57d06fd53447ab20eaa9b6c5a +%global gitbaredate 20250321 +%global git_rev 28b2556ccb9eadaefa7131a4aa42965c46b86864 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -55,7 +55,7 @@ Patch52: 0002-SF-894-task-button-correctly-find-the-window-current.patch ## distro specific patches # default configuration -Patch100: lxpanel-0.5.9-default.patch +Patch100: lxpanel-0.10.2-default.patch # use nm-connection-editor to edit network connections # Applied in 0.8.2 #Patch101: lxpanel-0.8.1-nm-connection-editor.patch @@ -224,6 +224,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Sat Mar 22 2025 Mamoru TASAKA - 0.10.1^20250321git28b2556c-1 +- Update to the latest git + * Tue Mar 11 2025 Mamoru TASAKA - 0.10.1^20250311git30ebe893-1 - Update to the latest git diff --git a/sources b/sources index cea8154..97ff503 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20250311T2303.tar.gz) = bd956548da5a29d937c44146b89a19861e0f70d6b1c50b8c592a930f5295e6acfa528a13215dbf7bbdcf343d852eebdeb47d5c2b3402ef950a62142267d8d318 +SHA512 (lxpanel-20250322T1006.tar.gz) = dda1d78458ac57a2fee605bc9fdebdba7622a6a53eb2eb6374fbd4ac8baf5bb279f5a985372e0c4de640d133d20d90336a8a6b916e91b1632af60a548ff69e91 From 7ceaa45926cd89ee620ffb8c36330ad1498ab92c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 4 Apr 2025 16:02:58 +0900 Subject: [PATCH 35/38] 0.11.0 --- lxpanel.spec | 16 ++++++++++------ sources | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index dad4997..161df83 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,23 +13,24 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250322 -%global gittartime 1006 +%global gittardate 20250404 +%global gittartime 1522 +%global use_gitcommit_as_rel 0 -%global gitbaredate 20250321 -%global git_rev 28b2556ccb9eadaefa7131a4aa42965c46b86864 +%global gitbaredate 20250403 +%global git_rev 4458f44605120381664d3a93c01c21d2944da0b0 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif -%if 0%{?use_gitbare} +%if 0%{?use_gitcommit_as_rel} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} %endif %dnl %global use_gcc_strict_sanitize 1 -%global main_version 0.10.1 +%global main_version 0.11.0 %global baserelease 1 Name: lxpanel @@ -224,6 +225,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Fri Apr 04 2025 Mamoru TASAKA - 0.11.0-1 +- 0.11.0 + * Sat Mar 22 2025 Mamoru TASAKA - 0.10.1^20250321git28b2556c-1 - Update to the latest git diff --git a/sources b/sources index 97ff503..7833c3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20250322T1006.tar.gz) = dda1d78458ac57a2fee605bc9fdebdba7622a6a53eb2eb6374fbd4ac8baf5bb279f5a985372e0c4de640d133d20d90336a8a6b916e91b1632af60a548ff69e91 +SHA512 (lxpanel-20250404T1522.tar.gz) = 902c2c6847376130b2ccd58006ec71df910781a864ca08cd26ce32f993da5afe4520135f36f9a334aeac71a2ced86904c576e88783230b7c352fc59b1d1aee3c From ce90b7761a84a13d8741b17659aa35c88d756d48 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 11 Apr 2025 14:28:51 +0900 Subject: [PATCH 36/38] 0.11.1 --- lxpanel.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index 161df83..627e06d 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,12 +13,12 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250404 -%global gittartime 1522 +%global gittardate 20250411 +%global gittartime 1403 %global use_gitcommit_as_rel 0 -%global gitbaredate 20250403 -%global git_rev 4458f44605120381664d3a93c01c21d2944da0b0 +%global gitbaredate 20250409 +%global git_rev b90d169002d4ac9c8b24a577c8be8f2e654409a8 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -30,7 +30,7 @@ %dnl %global use_gcc_strict_sanitize 1 -%global main_version 0.11.0 +%global main_version 0.11.1 %global baserelease 1 Name: lxpanel @@ -225,6 +225,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Fri Apr 11 2025 Mamoru TASAKA - 0.11.1-1 +- 0.11.1 + * Fri Apr 04 2025 Mamoru TASAKA - 0.11.0-1 - 0.11.0 diff --git a/sources b/sources index 7833c3e..58bb55e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20250404T1522.tar.gz) = 902c2c6847376130b2ccd58006ec71df910781a864ca08cd26ce32f993da5afe4520135f36f9a334aeac71a2ced86904c576e88783230b7c352fc59b1d1aee3c +SHA512 (lxpanel-20250411T1403.tar.gz) = 96e20dae6a729f164b7262c4ba6387a71b973c708c3390b2297a84416528965b6025f5c7b4d8c98ed1f612f28d665aa5820dac650f0e1c6a94dec716486bcc55 From 39d5f345471d0da46b95ea2f80324a40937e67b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:06:17 +0000 Subject: [PATCH 37/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- lxpanel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxpanel.spec b/lxpanel.spec index 627e06d..ac7cbf5 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -31,7 +31,7 @@ %dnl %global use_gcc_strict_sanitize 1 %global main_version 0.11.1 -%global baserelease 1 +%global baserelease 2 Name: lxpanel Version: %{main_version}%{git_ver_rpm} @@ -225,6 +225,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Apr 11 2025 Mamoru TASAKA - 0.11.1-1 - 0.11.1 From 90bb59d46e71b10c0f834a15b31969827b45a1e3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Dec 2025 11:30:03 +0900 Subject: [PATCH 38/38] update to the latest git --- lxpanel.spec | 15 +++++++++------ sources | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lxpanel.spec b/lxpanel.spec index ac7cbf5..5017495 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,12 +13,12 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250411 -%global gittartime 1403 -%global use_gitcommit_as_rel 0 +%global gittardate 20251218 +%global gittartime 1122 +%global use_gitcommit_as_rel 1 -%global gitbaredate 20250409 -%global git_rev b90d169002d4ac9c8b24a577c8be8f2e654409a8 +%global gitbaredate 20251208 +%global git_rev 94febbf1015aee8d2d718ee451f1f09df3f6150f %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -31,7 +31,7 @@ %dnl %global use_gcc_strict_sanitize 1 %global main_version 0.11.1 -%global baserelease 2 +%global baserelease 1 Name: lxpanel Version: %{main_version}%{git_ver_rpm} @@ -225,6 +225,9 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog +* Thu Dec 18 2025 Mamoru TASAKA - 0.11.1^20251208git94febbf1-1 +- Update to the latest git + * Thu Jul 24 2025 Fedora Release Engineering - 0.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 58bb55e..65dc8ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20250411T1403.tar.gz) = 96e20dae6a729f164b7262c4ba6387a71b973c708c3390b2297a84416528965b6025f5c7b4d8c98ed1f612f28d665aa5820dac650f0e1c6a94dec716486bcc55 +SHA512 (lxpanel-20251218T1122.tar.gz) = 688313f4a3a7ddd4f058d1c1b83db75fecc628453e00726d8e56cc3e72525a30d20fdbb26e175efed3cdc0d1a169c94dd31bc20d2a1cbcbaca78c5a519d91fff