.gitignore

@@ -1,2 +1,8 @@
-/lxappearance-*.tar.xz
-/lxappearance-*.tar.gz
+lxappearance-0.4.0.tar.gz
+/lxappearance-20100903gitf0945814.tar.bz2
+/lxappearance-0.5.0.tar.gz
+/lxappearance-0.5.1.tar.gz
+/lxappearance-0.5.2.tar.gz
+/lxappearance-0.6.1.tar.xz
+/lxappearance-0.6.2.tar.xz
+/lxappearance-0.6.3.tar.xz

create-lxappearance-git-bare-tarball.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -x
-set -e
-
-REPONAME=lxappearance
-GITURL=https://github.com/lxde/${REPONAME}.git
-
-DATE=$(date '+%Y%m%d')
-TIME=$(date '+%H%M')
-
-TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz
-
-PWDDIR=$(pwd)
-TMPDIR=$(mktemp -d /var/tmp/libfm-XXXXXX)
-pushd $TMPDIR
-
-git clone --mirror $GITURL
-
-pushd ${REPONAME}.git/
-git log --format=fuller | head -n 12
-popd
-
-tar czf ${TARNAME} ${REPONAME}.git/
-
-cp -p ${TARNAME} $PWDDIR
-popd
-rm -rf $TMPDIR

lxappearance-0.6.3-icon-theme-init.patch

@@ -0,0 +1,18 @@
+--- lxappearance-0.6.3/src/icon-theme.c.init	2016-02-21 07:48:38.000000000 +0900
++++ lxappearance-0.6.3/src/icon-theme.c	2017-03-16 14:34:45.543111563 +0900
+@@ -171,7 +171,6 @@
+     if(gtk_tree_selection_get_selected(sel, &model, &it))
+     {
+         IconTheme* theme;
+-        gboolean both = theme->has_icon && theme->has_cursor;
+ 
+         if(gtk_tree_model_iter_n_children(model, NULL) < 2)
+         {
+@@ -190,6 +189,7 @@
+             gtk_tree_selection_select_iter(sel, &it);
+ 
+             /* FIXME: in rare case, a theme can contain both icons and cursors */
++            gboolean both = theme->has_icon && theme->has_cursor;
+             if(both) /* we need to remove item in another list store, too */
+             {
+                 model = GTK_TREE_MODEL(model == (GtkTreeModel*)app.icon_theme_store ? app.cursor_theme_store : app.icon_theme_store);

lxappearance.spec

@@ -1,75 +1,45 @@
 # Review: https://bugzilla.redhat.com/show_bug.cgi?id=442269
 
-%global		use_release	0
-%global		use_git		0
-%global		use_gitbare	1
+%global git_snapshot 0
 
-%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_gitbare}
-%global		gittardate		20250325
-%global		gittartime		1621
-%define		use_gitcommit_as_rel		0
-
-%global		gitbaredate	20250324
-%global		git_rev		96e09b05b1897bdca72d8fdfeb1bd8ec68942c42
-%global		git_short		%(echo %{git_rev} | cut -c-8)
-%global		git_version	%{gitbaredate}git%{git_short}
+%if 0%{?git_snapshot}
+%global git_rev f0945814186b2903c9899e8d91e640e3341fd2b9
+%global git_date 20100903
+%global git_short %(echo %{git_rev} | cut -c-8)
+%global git_version %{git_date}git%{git_short}
 %endif
 
+# Source0 was generated as follows: 
+# git clone git://lxde.git.sourceforge.net/gitroot/lxde/%{name}
+# cd %{name}
+# git archive --format=tar --prefix=%{name}/ %{git_short} | bzip2 > %{name}-%{?git_version}.tar.bz2
  
-%if 0%{?use_gitcommit_as_rel}
-%global		git_ver_rpm	^%{git_version}
-%global		git_builddir	-%{git_version}
+Name:           lxappearance
+Version:        0.6.3
+Release:        6%{?git_version:.%{?git_version}}%{?dist}
+Summary:        Feature-rich GTK+ theme switcher for LXDE
+
+Group:          User Interface/Desktops
+License:        GPLv2+
+URL:            http://lxde.org/
+#VCS: git:git://lxde.git.sourceforge.net/gitroot/lxde/lxappearance
+%if 0%{?git_snapshot}
+Source0:        %{name}-%{?git_version}.tar.bz2
+%else
+Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz
 %endif
+# https://sourceforge.net/p/lxde/bugs/866/
+Patch0:		https://sourceforge.net/p/lxde/bugs/_discuss/thread/ecb5ef0c/9b37/attachment/lxappearance-0.6.3-icon-theme-init.patch
 
-
-%global		main_version	0.6.4
-
-Name:			lxappearance
-Version:		%{main_version}%{git_ver_rpm}
-Release:		3%{?dist}
-Summary:		Feature-rich GTK+ theme switcher for LXDE
-
-# SPDX confirmed
-License:		GPL-2.0-or-later
-URL:			http://lxde.org/
-%if 0%{?use_gitbare}
-Source0:		%{name}-%{gittardate}T%{gittartime}.tar.gz
-%endif
-%if 0%{?use_git}
-Source0:		%{name}-%{main_version}-%{?git_version}.tar.bz2
-%endif
-%if 0%{?use_release}
-Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{main_version}.tar.xz
-%endif
-
-BuildRequires:  make
-BuildRequires:  gcc
-BuildRequires:  pkgconfig(glib-2.0) >= 2.26.0
-BuildRequires:  pkgconfig(gtk+-2.0) >= 2.12.0
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(libmenu-cache) >= 0.3.2
+BuildRequires:  pkgconfig(gtk+-2.0) > 2.6
+BuildRequires:	  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(libmenu-cache)
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  docbook-utils
 BuildRequires:  docbook-style-xsl
-BuildRequires:  /usr/bin/xsltproc
-
-BuildRequires:  automake
-BuildRequires:  autoconf
-BuildRequires:  /usr/bin/git
-
 Requires:       lxsession >= 0.4.0
 
 %description
@@ -83,6 +53,7 @@ reload their themes.
 
 %package        devel
 Summary:        Development files for %{name}
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
@@ -91,186 +62,52 @@ for LXAppearance.
 
 
 %prep
-%if 0%{?use_release}
-%setup -q -n %{name}-%{main_version}%{git_builddir}
-
-git init
-%endif
-
-%if 0%{?use_gitbare}
-%setup -q -c -T  -n %{name}-%{main_version}%{git_builddir} -a 0
-git clone ./%{name}.git/
-cd %{name}
-
-#git checkout -b %{version}-fedora %{version}
-git checkout -b %{main_version}-fedora %{git_rev}
-
-# Restore timestamps
-set +x
-echo "Restore timestamps"
-git ls-tree -r --name-only HEAD | while read f
-do
-	unixtime=$(git log -n 1 --pretty='%ct' -- $f)
-	touch -d "@${unixtime}" $f
-done
-set -x
-
-
-cp -a [A-Z]* ..
-cp -a data/ ..
-
-cat > GITHASH <<EOF
-EOF
-
-cat GITHASH | while read line
-do
-	commit=$(echo "$line" | sed -e 's|[ \t].*||')
-	git cherry-pick $commit
-done
-
-%endif
-
-git config user.name "lxpanel Fedora maintainer"
-git config user.email "lxpanel-maintainers@fedoraproject.org"
-
-%if 0%{?use_release}
-git add .
-git commit -m "base" -q
-%endif
-
-# Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708)
-export ACLOCAL_PATH=%{_datadir}/gettext/m4/
-sh autogen.sh
+%setup -q %{?git_version:-n %{name}}
+%patch0 -p1 -b .init
 
 
 %build
-%if 0%{?use_gitbare}
-pushd %{name}
-%endif
-
+%{?git_version:sh autogen.sh}
 %configure \
+	--enable-dbus \
 	--disable-silent-rules \
-	--enable-man \
-%if 0
-	--enable-gtk3 \
-%endif
 	%{nil}
-%make_build
+make %{?_smp_mflags}
 
 
 %install
-%if 0%{?use_gitbare}
-pushd %{name}
-%endif
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 
-%make_install
-
-%if 0%{?use_gitbare}
-popd
-%endif
-
-# Own plugin directory
-mkdir -p %{buildroot}%{_libdir}/%{name}/plugins/
+desktop-file-install \
+    %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+    --vendor fedora \
+    %endif
+    --delete-original \
+    --dir=%{buildroot}%{_datadir}/applications \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-%files	-f %{name}.lang
-%doc		AUTHORS
-%license	COPYING
 
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS
+%license COPYING
 %{_bindir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
-%dir	%{_datadir}/%{name}/
-%{_datadir}/%{name}/ui/
-%dir	%{_libdir}/%{name}/plugins/
+%{_datadir}/%{name}/
 %{_mandir}/man1/%{name}*.1.*
 
-%files	devel
+
+%files devel
+%defattr(-,root,root,-)
 %{_includedir}/%{name}/
 %{_libdir}/pkgconfig/%{name}.pc
 
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon May 26 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.4-2
-- Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708)
-
-* Tue Mar 25 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.4-1
-- 0.6.4
-
-* Tue Feb 11 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.3^20241025gitb51af4c5-1
-- Update to the latest git
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3^20240817git95d5b02e-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Aug 30 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.3^20240817git95d5b02e-2
-- Own plugin directory
-
-* Sun Aug 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.3^20240817git95d5b02e-1
-- Update to the latest git
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3^20230917git655fd083-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3^20230917git655fd083-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3^20230917git655fd083-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Dec 31 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.3^20230917git655fd083-1
-- Update to the latest git
-
-* Fri Sep 15 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.3^20230913git5423cc46-1
-- Update to the latest git
-
-* Mon Aug 14 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.3^20230801git8e634d03-1
-- Update to the latest git
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-14.D20200807gitd132fdd8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-13.D20200807gitd132fdd8.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-13.D20200807gitd132fdd8.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-13.D20200807gitd132fdd8.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-13.D20200807gitd132fdd8.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sun Mar 21 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.3-13.D20200807gitd132fdd8
-- Update to the latest git
-- Fix segfault with GLib 2.68
-- Fix segfault when removing icon theme
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (lxappearance-20250325T1621.tar.gz) = ab48ed776beff4ce6d5a5419306669dab5af91c8bdac794454535b5eb2993ec66ab110b5356c69c2be95ca3d1403d350466b2bbe97b87731d0fa61b0822fa294
+SHA512 (lxappearance-0.6.3.tar.xz) = 035cc952a33ac25408a4158cb4e745b17af3f29b5ceedfbe6b37235d16c801658403e862cd35ad7c8ca20fe6186fab1dce74a6e8d3b2eec12a30d532fc21662c