.gitignore

@@ -1,2 +1,28 @@
-/lxpanel-*.tar.xz
-/lxpanel-*.tar.gz
+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-0.5.9-default.patch

@@ -1,18 +1,20 @@
 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,8 +14,8 @@
+@@ -14,10 +14,10 @@
      setdocktype=1
      setpartialstrut=1
      usefontcolor=1
 -    fontcolor=#ffffff
--    background=1
 +    fontcolor=#000000
+     usefontsize=0
+     fontsize=10    
+-    background=1
 +    background=0
      backgroundfile=@prefix@/share/lxpanel/images/background.png
  }
  
-@@ -30,12 +30,13 @@
+@@ -37,12 +37,13 @@
          separator {
          }
          item {
@@ -27,7 +29,20 @@ diff -dur lxpanel-0.5.9.orig/data/default/panels/panel.in lxpanel-0.5.9/data/def
              command=logout
          }
      }
-@@ -69,6 +70,7 @@
+@@ -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
          Button2=shade
@@ -44,9 +59,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
@@ -64,10 +79,17 @@ 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 @@
+@@ -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 {
+         }
          separator {
          }
          item {
@@ -85,3 +107,16 @@ 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

lxpanel-0.8.1-Fix-pager-scroll.patch

@@ -0,0 +1,11 @@
+--- 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;
+ }
+ 

lxpanel.spec

@@ -1,104 +1,114 @@
 # Review: https://bugzilla.redhat.com/show_bug.cgi?id=219930
 
-%global	use_release	0
-%global	use_gitbare	1
+%global	use_release	1
+%global	use_git		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}
+%endif
 
 %if 0%{?use_gitbare}
-%global	gittardate		20251218
-%global	gittartime		1122
-%global	use_gitcommit_as_rel		1
-
-%global	gitbaredate	20251208
-%global	git_rev		94febbf1015aee8d2d718ee451f1f09df3f6150f
-%global	git_short		%(echo %{git_rev} | cut -c-8)
-%global	git_version	%{gitbaredate}git%{git_short}
+%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}
 %endif
 
-%if 0%{?use_gitcommit_as_rel}
-%global	git_ver_rpm	^%{git_version}
-%global	git_builddir	-%{git_version}
+%global	mainrel 2
+
+%if 0%{?use_release} >= 1
+%global         fedorarel   %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}
+%endif
+%if 0%{?use_git} >= 1
+%global         fedorarel   %{mainrel}.%{git_version}
+%endif
+%if 0%{?use_gitbare} >= 1
+%global         fedorarel   %{mainrel}.%{git_version}
 %endif
 
-%dnl	%global		use_gcc_strict_sanitize	1
+Name:           lxpanel
+Version:        0.10.1
+Release:        %{fedorarel}%{?dist}
+Summary:        A lightweight X11 desktop panel
 
-%global		main_version	0.11.1
-%global		baserelease	1
-
-Name:			lxpanel
-Version:		%{main_version}%{git_ver_rpm}
-Release:		%{baserelease}%{?dist}%{?use_gcc_strict_sanitize:.san}
-Summary:		A lightweight X11 desktop panel
-
-# SPDX confirmed
-License:		GPL-2.0-or-later
-URL:			http://lxde.org/
+License:        GPLv2+
+URL:            http://lxde.org/
+#VCS: git:git://lxde.git.sourceforge.net/gitroot/lxde/lxpanel
 %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
+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
+
 # Patches reported upstream
 Patch52:		0002-SF-894-task-button-correctly-find-the-window-current.patch
 
 ## distro specific patches
 # default configuration
-Patch100:		lxpanel-0.10.2-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
 
 
-#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:	/usr/bin/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:	%{_bindir}/curl-config
 
-%if 0%{?use_gitbare}
-BuildRequires:	automake
-BuildRequires:	libtool
-%endif
+# required for netstatus plugin
+BuildRequires:  wireless-tools-devel
 
-%if 0%{?use_gcc_strict_sanitize}
-BuildRequires:	libasan
-BuildRequires:	libubsan
+%if 0%{?use_git} || 0%{?use_gitbare}
+BuildRequires:  automake
+BuildRequires:  libtool
 %endif
 
 BuildRequires:	git
 BuildRequires:	gcc
 
 # required for the battery plugin with Patch102
-Recommends:	zenity
+Requires:       zenity
 
 
 %description
@@ -107,54 +117,45 @@ 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}
-%setup -q -n %{name}-%{main_version}%{git_builddir}
+%if 0%{?use_release} || 0%{?use_git}
+%setup -q %{?git_version:-n %{name}-%{version}-%{?git_version}}
 
 git init
 %endif
 
 %if 0%{?use_gitbare}
-%setup -q -c -T -n %{name}-%{main_version}%{git_builddir} -a 0
+%setup -q -c -T -a 0
 git clone ./%{name}.git/
 cd %{name}
 
-git checkout -b %{main_version}-fedora %{git_rev}
+#git checkout -b %{version}-fedora %{version}
+git checkout -b %{version}-fedora %{git_rev}
+cp -a [A-Z]* ..
 
 cat > GITHASH <<EOF
 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
 
-# Restore timestamps
-set +x
-echo "Restore timestamps"
-git ls-tree -r --name-only HEAD | while read f
-do
-	unixtime=$(git log -n 1 --pretty='%ct' -- $f)
-	touch -d "@${unixtime}" $f
-done
-set -x
-
-cp -a [A-Z]* ..
 %endif
 
 git config user.name "lxpanel Fedora maintainer"
-git config user.email "lxpanel-maintainer@fedoraproject.org"
+git config user.email "lxpanel-owner@fedoraproject.org"
 
-%if 0%{?use_release}
+%if 0%{?use_release} || 0%{?use_git}
 git add .
 git rm --cached \
 	config.guess config.sub configure \
@@ -166,10 +167,20 @@ git commit -m "base" -q
 cat %PATCH52 | git am
 cat %PATCH103 | git am
 
-%patch -P100 -p1 -b .default
-#%%patch101 -p1 -b .system-config-network
-%patch -P102 -p1 -b .zenity
+%patch0 -p1 -b .revert
 
+%patch100 -p1 -b .default
+#%%patch101 -p1 -b .system-config-network
+%patch102 -p1 -b .zenity
+
+# 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
 git commit -m "Apply Fedora specific configulation" -a
 
 %build
@@ -177,21 +188,15 @@ git commit -m "Apply Fedora specific configulation" -a
 cd %{name}
 %endif
 
-%if 0%{?use_gitbare}
+%if 0%{?use_git} || 0%{?use_gitbare}
 bash autogen.sh
 %endif
 
-%if 0%{?use_gcc_strict_sanitize}
-export CC="${CC} -fsanitize=address -fsanitize=undefined"
-export LDFLAGS="${LDFLAGS} -pthread"
-%endif
-
 %configure \
 	--enable-indicator-support \
 	--disable-silent-rules \
-	--with-plugins='netstatus,volume,cpu,deskno,batt,kbled,xkb,thermal,cpufreq,monitors,indicator,weather' \
 	%{nil}
-%make_build
+make %{?_smp_mflags}
 
 
 %install
@@ -199,7 +204,7 @@ export LDFLAGS="${LDFLAGS} -pthread"
 cd %{name}
 %endif
 
-%make_install
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/lxpanel/*.la
 
 %if 0%{?use_gitbare}
@@ -210,9 +215,7 @@ cd ..
 
 
 %files -f %{name}.lang
-%license	COPYING
-%doc	AUTHORS
-%doc	README
+%doc AUTHORS COPYING README
 %config(noreplace)	%{_sysconfdir}/xdg/lxpanel/
 
 %{_bindir}/lxpanel*
@@ -225,97 +228,6 @@ cd ..
 %{_libdir}/pkgconfig/lxpanel.pc
 
 %changelog
-* Thu Dec 18 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.11.1^20251208git94febbf1-1
-- Update to the latest git
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Apr 11 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.11.1-1
-- 0.11.1
-
-* Fri Apr 04 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.11.0-1
-- 0.11.0
-
-* Sat Mar 22 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20250321git28b2556c-1
-- Update to the latest git
-
-* Tue Mar 11 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20250311git30ebe893-1
-- Update to the latest git
-
-* Thu Mar 06 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20250226giteb1688da-1
-- Update to the latest git
-
-* Sun Feb 16 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20250215git56103c83-1
-- Update to the latest git
-
-* Fri Feb 14 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20250207gite4e9b89c-1
-- Update to the latest git
-
-* Fri Feb 07 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20250131git4dcce30a-1
-- Update to the latest git
-
-* Fri Jan 24 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20250123git13a51958-1
-- Update to the latest git
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1^20241223gitd45c45ae-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Dec 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20241223gitd45c45ae-1
-- Update to the latest git
-
-* Fri Dec 20 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20241213git5eb39f11-1
-- Update to the latest git
-
-* Fri Sep 06 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20240825gitffd815fc-1
-- Update to the latest git
-
-* Sun Aug 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20240823git95815af3-1
-- Update to the latest git
-
-* Thu Aug 08 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20240807git65d86bec-1
-- Update to the latest git
-
-* Fri Jul 26 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20230918git633a2d46-5
-- Apply upstream PR to fix gcc14 -Werror=incompatible-pointer-types
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1^20230918git633a2d46-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1^20230918git633a2d46-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20230918git633a2d46-2
-- Change -Wincompatible-pointer-types from error to warning
-
-* Tue Sep 19 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20230918git633a2d46-1
-- Update to the latest git
-
-* Sun Aug 20 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20230817gitdd010115-1
-- Update to the latest git
-
-* Mon Aug 14 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1^20230806git41a08b51-1
-- Update to the latest git
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Feb  7 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1-4
-- batt: make the status green on batt when the state is "not charging"
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-3.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-3.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-3.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Dec 02 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 0.10.1-3
-- Disable Wireless Extensions support (Fedora 36+)
-  https://fedoraproject.org/wiki/Changes/RemoveWirelessExtensions
-
 * Sun Aug  1 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.1-2
 - volumealsa: poll alsa mixer several times at startup (for pipewire) (bug 1960829)
 

sources

@@ -1 +1 @@
-SHA512 (lxpanel-20251218T1122.tar.gz) = 688313f4a3a7ddd4f058d1c1b83db75fecc628453e00726d8e56cc3e72525a30d20fdbb26e175efed3cdc0d1a169c94dd31bc20d2a1cbcbaca78c5a519d91fff
+SHA512 (lxpanel-0.10.1.tar.xz) = 0478ca1322a6645c5120e0fdb2b6d6409799f3296d971456670eb8b23b8457ae93a966ddcb5b5e5bdbcd694442ade2252d6a3931d36296e19e5339b2d689cfef