From b80d4103aeafc1ed9e077e61fa6f4ab926db4976 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:48:57 +0000 Subject: [PATCH 01/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpenguins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpenguins.spec b/xpenguins.spec index 2393ab6..34e0a3f 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -1,6 +1,6 @@ Name: xpenguins Version: 2.2 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Cute little penguins that walk along the tops of your windows Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster @@ -111,6 +111,9 @@ appstream-util validate-relax --nonet \ %_datadir/metainfo/%name.appdata.xml %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.2-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e67ab9135e7fc797b24b695fc43d74c7df4c2faa Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 8 Feb 2023 17:40:35 +0100 Subject: [PATCH 02/14] Convert patches to standard -p1 --- xpenguins-2.2-format-security.patch | 4 ++-- xpenguins-2.2-no-SHAPE.patch | 4 ++-- xpenguins.spec | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xpenguins-2.2-format-security.patch b/xpenguins-2.2-format-security.patch index 4aba352..c5cde5b 100644 --- a/xpenguins-2.2-format-security.patch +++ b/xpenguins-2.2-format-security.patch @@ -1,5 +1,5 @@ ---- src/xpenguins_theme.c~ 2001-10-02 00:36:12.000000000 +0200 -+++ src/xpenguins_theme.c 2013-12-03 12:54:49.000000000 +0100 +--- a/src/xpenguins_theme.c~ 2001-10-02 00:36:12.000000000 +0200 ++++ b/src/xpenguins_theme.c 2013-12-03 12:54:49.000000000 +0100 @@ -608,7 +608,7 @@ xpm_file_name = word; } diff --git a/xpenguins-2.2-no-SHAPE.patch b/xpenguins-2.2-no-SHAPE.patch index 7271fea..cb6b814 100644 --- a/xpenguins-2.2-no-SHAPE.patch +++ b/xpenguins-2.2-no-SHAPE.patch @@ -1,5 +1,5 @@ ---- src/toon_init.cshape 2001-06-24 18:28:17.000000000 +0200 -+++ src/toon_init.c 2014-03-16 13:44:18.000000000 +0100 +--- a/src/toon_init.cshape 2001-06-24 18:28:17.000000000 +0200 ++++ b/src/toon_init.c 2014-03-16 13:44:18.000000000 +0100 @@ -29,6 +29,8 @@ Display * ToonOpenDisplay(char *display_name) diff --git a/xpenguins.spec b/xpenguins.spec index 34e0a3f..9ef0e76 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -59,7 +59,7 @@ rotfönstret inte är synligt. %prep -%autosetup -p 0 +%autosetup -p1 %build %configure From 9439f0cf417d72af5110c6f9105ab11b5b777249 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 8 Feb 2023 18:21:26 +0100 Subject: [PATCH 03/14] C99 compatibility fixes (#2168300) Related to: --- xpenguins-c99.patch | 15 +++++++++++++++ xpenguins-configure-c99.patch | 36 +++++++++++++++++++++++++++++++++++ xpenguins.spec | 7 ++++++- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 xpenguins-c99.patch create mode 100644 xpenguins-configure-c99.patch diff --git a/xpenguins-c99.patch b/xpenguins-c99.patch new file mode 100644 index 0000000..94770e9 --- /dev/null +++ b/xpenguins-c99.patch @@ -0,0 +1,15 @@ +Include for the exit function, to avoid build problems with +future compilers. + +diff --git a/src/toon_signal.c b/src/toon_signal.c +index 7135f0efcb4810d0..c093584cf6d88ae6 100644 +--- a/src/toon_signal.c ++++ b/src/toon_signal.c +@@ -16,6 +16,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include ++#include + #include "toon.h" + + /* SIGNAL AND ERROR HANDLING FUNCTIONS */ diff --git a/xpenguins-configure-c99.patch b/xpenguins-configure-c99.patch new file mode 100644 index 0000000..5226a30 --- /dev/null +++ b/xpenguins-configure-c99.patch @@ -0,0 +1,36 @@ +Fix generic C99 compatibility issues introduced by historic autoconf. +Potential future upstream releases will hopefully use a newer autoconf +version, so it's not necessary to upstream this. + +diff --git a/configure b/configure +index 7a47544bd2f9d06c..4aa7e543f1cfd747 100755 +--- a/configure ++++ b/configure +@@ -909,7 +909,7 @@ cat > conftest.$ac_ext << EOF + #line 910 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +@@ -1290,6 +1290,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null diff --git a/xpenguins.spec b/xpenguins.spec index 9ef0e76..2861f48 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -1,6 +1,6 @@ Name: xpenguins Version: 2.2 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Cute little penguins that walk along the tops of your windows Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster @@ -17,6 +17,8 @@ Patch0: xpenguins-2.2-format-security.patch # crash. This patch causes it to exit more gracefully. Sent # upstreams, in case there ever will be a new release. Patch1: xpenguins-2.2-no-SHAPE.patch +Patch2: xpenguins-configure-c99.patch +Patch3: xpenguins-c99.patch BuildRequires: make BuildRequires: gcc @@ -111,6 +113,9 @@ appstream-util validate-relax --nonet \ %_datadir/metainfo/%name.appdata.xml %changelog +* Wed Feb 08 2023 Florian Weimer - 2.2-33 +- C99 compatibility fixes (#2168300) + * Sat Jan 21 2023 Fedora Release Engineering - 2.2-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 7dbfd5e8988b279617de25944d777a230e621fb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:14:39 +0000 Subject: [PATCH 04/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpenguins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpenguins.spec b/xpenguins.spec index 2861f48..9bbb04c 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -1,6 +1,6 @@ Name: xpenguins Version: 2.2 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Cute little penguins that walk along the tops of your windows Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster @@ -113,6 +113,9 @@ appstream-util validate-relax --nonet \ %_datadir/metainfo/%name.appdata.xml %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.2-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Feb 08 2023 Florian Weimer - 2.2-33 - C99 compatibility fixes (#2168300) From d152c2d33a066b710cb63c82529c676c754f939c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:05:37 +0000 Subject: [PATCH 05/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xpenguins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpenguins.spec b/xpenguins.spec index 9bbb04c..dd9074e 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -1,6 +1,6 @@ Name: xpenguins Version: 2.2 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Cute little penguins that walk along the tops of your windows Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster @@ -113,6 +113,9 @@ appstream-util validate-relax --nonet \ %_datadir/metainfo/%name.appdata.xml %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.2-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1a71254d105ac3527753fa9447567de416d93b16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:24:48 +0000 Subject: [PATCH 06/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xpenguins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpenguins.spec b/xpenguins.spec index dd9074e..43b404c 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -1,6 +1,6 @@ Name: xpenguins Version: 2.2 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Cute little penguins that walk along the tops of your windows Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster @@ -113,6 +113,9 @@ appstream-util validate-relax --nonet \ %_datadir/metainfo/%name.appdata.xml %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.2-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8e224779ce804d59a9c7d9602e7b41209d51b365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:59:21 +0200 Subject: [PATCH 07/14] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xpenguins.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xpenguins.spec b/xpenguins.spec index 43b404c..1594055 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -1,10 +1,11 @@ Name: xpenguins Version: 2.2 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Cute little penguins that walk along the tops of your windows Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://xpenguins.seul.org/ Source0: http://xpenguins.seul.org/%name-%version.tar.gz @@ -113,6 +114,9 @@ appstream-util validate-relax --nonet \ %_datadir/metainfo/%name.appdata.xml %changelog +* Fri Jul 26 2024 Miroslav Suchý - 2.2-37 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.2-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 23437cfc1e941106e3a26aafe1f1104c1e47697b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:14:13 +0000 Subject: [PATCH 08/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xpenguins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpenguins.spec b/xpenguins.spec index 1594055..b0c2a10 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -1,6 +1,6 @@ Name: xpenguins Version: 2.2 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Cute little penguins that walk along the tops of your windows Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster @@ -114,6 +114,9 @@ appstream-util validate-relax --nonet \ %_datadir/metainfo/%name.appdata.xml %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.2-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 2.2-37 - convert license to SPDX From 931223521e6bcd4a334a891132f260464c4c6291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Uddeborg?= Date: Fri, 24 Jan 2025 23:14:10 +0100 Subject: [PATCH 09/14] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 129 +++++++++++++++++++++++++++++++++++++++++++++++ xpenguins.spec | 132 +------------------------------------------------ 2 files changed, 131 insertions(+), 130 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..697e2a5 --- /dev/null +++ b/changelog @@ -0,0 +1,129 @@ +* Sun Jan 19 2025 Fedora Release Engineering - 2.2-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 2.2-37 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 2.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 2.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 2.2-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Feb 08 2023 Florian Weimer - 2.2-33 +- C99 compatibility fixes (#2168300) + +* Sat Jan 21 2023 Fedora Release Engineering - 2.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.2-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 2.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.2-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 2.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Oct 09 2018 Göran Uddeborg 2.2-23 +- The current desktop-file-install does know about "Cinnamon"; add it as an + exclude in the desktop file. + +* Sat Jul 14 2018 Fedora Release Engineering - 2.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Feb 18 2018 Göran Uddeborg - 2.2-21 +- Add an explicit build requirement on gcc. + +* Tue Feb 13 2018 Göran Uddeborg 2.2-20 +- Obsolete scriptlets removed + +* Fri Feb 09 2018 Fedora Release Engineering - 2.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 18 2017 Göran Uddeborg 2.2-18 +- Appdata added. + +* Thu Aug 03 2017 Fedora Release Engineering - 2.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Jun 4 2016 Göran Uddeborg - 2.2-14 +- Disable in environments where XPengiuns is known not to work. Bz #1324881. +- Also clean out some obsolete SPEC file code. + +* Fri Feb 05 2016 Fedora Release Engineering - 2.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 2.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Mar 16 2014 Göran Uddeborg - 2.2-9 +- Give proper error message on displays without the SHAPE extension. Bz #1071429. + +* Tue Dec 03 2013 Göran Uddeborg - 2.2-8 +- Fix printf format security issue. Bz #1037404. + +* Sun Aug 04 2013 Fedora Release Engineering - 2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 23 2010 Göran Uddeborg - 2.2-2 +- Create a UTF-8 version of the README file to include instead. + Suggested by reviewer Manuel Wolfshant . + +* Thu Jul 22 2010 Göran Uddeborg - 2.2-1 +- Packaging updated using Fedora standards. + +* Mon Oct 1 2001 Robin Hogan - 2.1.5-1 +- Removed Lemmings (now in xpenguins_themes), added Bill, Big Penguins +- Added resize-frames.scm to docs + +* Wed Aug 22 2001 Robin Hogan - 2.1.3-1 +- Added Lemmings theme + +* Sat May 5 2001 Robin Hogan - 1.9.1-1 +- First spec file used with autoconf + +* Tue May 23 2000 Robin Hogan - 1.2-1 +- Use BuildRoot. diff --git a/xpenguins.spec b/xpenguins.spec index b0c2a10..692a557 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -1,6 +1,6 @@ Name: xpenguins Version: 2.2 -Release: 38%{?dist} +Release: %autorelease Summary: Cute little penguins that walk along the tops of your windows Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster @@ -114,132 +114,4 @@ appstream-util validate-relax --nonet \ %_datadir/metainfo/%name.appdata.xml %changelog -* Sun Jan 19 2025 Fedora Release Engineering - 2.2-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 2.2-37 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 2.2-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 2.2-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2.2-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Feb 08 2023 Florian Weimer - 2.2-33 -- C99 compatibility fixes (#2168300) - -* Sat Jan 21 2023 Fedora Release Engineering - 2.2-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.2-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.2-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.2-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 2.2-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.2-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 2.2-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.2-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.2-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Oct 09 2018 Göran Uddeborg 2.2-23 -- The current desktop-file-install does know about "Cinnamon"; add it as an - exclude in the desktop file. - -* Sat Jul 14 2018 Fedora Release Engineering - 2.2-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Feb 18 2018 Göran Uddeborg - 2.2-21 -- Add an explicit build requirement on gcc. - -* Tue Feb 13 2018 Göran Uddeborg 2.2-20 -- Obsolete scriptlets removed - -* Fri Feb 09 2018 Fedora Release Engineering - 2.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 18 2017 Göran Uddeborg 2.2-18 -- Appdata added. - -* Thu Aug 03 2017 Fedora Release Engineering - 2.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Jun 4 2016 Göran Uddeborg - 2.2-14 -- Disable in environments where XPengiuns is known not to work. Bz #1324881. -- Also clean out some obsolete SPEC file code. - -* Fri Feb 05 2016 Fedora Release Engineering - 2.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Mar 16 2014 Göran Uddeborg - 2.2-9 -- Give proper error message on displays without the SHAPE extension. Bz #1071429. - -* Tue Dec 03 2013 Göran Uddeborg - 2.2-8 -- Fix printf format security issue. Bz #1037404. - -* Sun Aug 04 2013 Fedora Release Engineering - 2.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 23 2010 Göran Uddeborg - 2.2-2 -- Create a UTF-8 version of the README file to include instead. - Suggested by reviewer Manuel Wolfshant . - -* Thu Jul 22 2010 Göran Uddeborg - 2.2-1 -- Packaging updated using Fedora standards. - -* Mon Oct 1 2001 Robin Hogan - 2.1.5-1 -- Removed Lemmings (now in xpenguins_themes), added Bill, Big Penguins -- Added resize-frames.scm to docs - -* Wed Aug 22 2001 Robin Hogan - 2.1.3-1 -- Added Lemmings theme - -* Sat May 5 2001 Robin Hogan - 1.9.1-1 -- First spec file used with autoconf - -* Tue May 23 2000 Robin Hogan - 1.2-1 -- Use BuildRoot. +%autochangelog From 46191a623e04929b524ad0eb62a9e2d2af734a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Uddeborg?= Date: Sat, 25 Jan 2025 23:32:50 +0100 Subject: [PATCH 10/14] Patch to enable building with C23 (rhbz2341580) --- xpenguins-c23.patch | 21 +++++++++++++++++++++ xpenguins.spec | 1 + 2 files changed, 22 insertions(+) create mode 100644 xpenguins-c23.patch diff --git a/xpenguins-c23.patch b/xpenguins-c23.patch new file mode 100644 index 0000000..d753d69 --- /dev/null +++ b/xpenguins-c23.patch @@ -0,0 +1,21 @@ +--- xpenguins-2.2/src/toon.h.orig 2001-09-30 20:21:45.000000000 +0200 ++++ xpenguins-2.2/src/toon.h 2025-01-24 23:17:25.000000000 +0100 +@@ -118,7 +118,6 @@ + unsigned int wid; + XRectangle pos; + } __ToonWindowData; +-typedef int __ToonErrorHandler(); + void __ToonSignalHandler(int sig); + int __ToonError(Display *toon_display, XErrorEvent *error); + void __ToonExitGracefully(int sig); +--- xpenguins-2.2/src/toon_core.c.orig 2001-06-24 19:05:34.000000000 +0200 ++++ xpenguins-2.2/src/toon_core.c 2025-01-24 23:29:46.000000000 +0100 +@@ -255,7 +255,7 @@ + } + } + XFree(children); +- XSetErrorHandler((__ToonErrorHandler *) NULL); ++ XSetErrorHandler((XErrorHandler) NULL); + return 0; + } + diff --git a/xpenguins.spec b/xpenguins.spec index 692a557..dc29e08 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -20,6 +20,7 @@ Patch0: xpenguins-2.2-format-security.patch Patch1: xpenguins-2.2-no-SHAPE.patch Patch2: xpenguins-configure-c99.patch Patch3: xpenguins-c99.patch +Patch4: xpenguins-c23.patch BuildRequires: make BuildRequires: gcc From c60147f8056922c54b0c7e6adfba556f000e1ec4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:02:42 +0000 Subject: [PATCH 11/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 15bad468685a14b14d5a100d81af026ad54d99ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Uddeborg?= Date: Tue, 6 Jan 2026 21:34:51 +0100 Subject: [PATCH 12/14] Upgrade to version 3.2.3 - This version shows the penguins also on modern desktops - Wayland windows are invisible for them, though --- .gitignore | 1 + sources | 2 +- xpenguins-2.2-format-security.patch | 11 ----- xpenguins-2.2-no-SHAPE.patch | 23 --------- xpenguins-c23.patch | 21 -------- xpenguins-c99.patch | 15 ------ xpenguins-configure-c99.patch | 36 -------------- xpenguins.appdata.xml | 2 +- xpenguins.spec | 76 ++++++++--------------------- 9 files changed, 23 insertions(+), 164 deletions(-) delete mode 100644 xpenguins-2.2-format-security.patch delete mode 100644 xpenguins-2.2-no-SHAPE.patch delete mode 100644 xpenguins-c23.patch delete mode 100644 xpenguins-c99.patch delete mode 100644 xpenguins-configure-c99.patch diff --git a/.gitignore b/.gitignore index 0a934ee..84f4bff 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xpenguins-2.2.tar.gz +/xpenguins-3.2.3.tar.gz diff --git a/sources b/sources index 8dfebf3..3f2a065 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ccf555d55f9b0377017322b3b3d27a4 xpenguins-2.2.tar.gz +SHA512 (xpenguins-3.2.3.tar.gz) = d2f22778534995d9d871296e11664fd2e945f477737e6fde365a5fd2e424bc85b9cf1344a9a2ad6f7c542b7be504074bcdd54191d725a8c4a27868c59f9a586c diff --git a/xpenguins-2.2-format-security.patch b/xpenguins-2.2-format-security.patch deleted file mode 100644 index c5cde5b..0000000 --- a/xpenguins-2.2-format-security.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/xpenguins_theme.c~ 2001-10-02 00:36:12.000000000 +0200 -+++ b/src/xpenguins_theme.c 2013-12-03 12:54:49.000000000 +0100 -@@ -608,7 +608,7 @@ - xpm_file_name = word; - } - else { -- snprintf(file_base, MAX_STRING_LENGTH, word); -+ snprintf(file_base, MAX_STRING_LENGTH, "%s", word); - xpm_file_name = file_name; - } - if (current->image) { diff --git a/xpenguins-2.2-no-SHAPE.patch b/xpenguins-2.2-no-SHAPE.patch deleted file mode 100644 index cb6b814..0000000 --- a/xpenguins-2.2-no-SHAPE.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/toon_init.cshape 2001-06-24 18:28:17.000000000 +0200 -+++ b/src/toon_init.c 2014-03-16 13:44:18.000000000 +0100 -@@ -29,6 +29,8 @@ - Display * - ToonOpenDisplay(char *display_name) - { -+ int event_base, error_base; -+ - toon_display=XOpenDisplay(display_name); - if (toon_display == NULL) { - if (display_name == NULL && getenv("DISPLAY") == NULL) -@@ -39,6 +41,11 @@ - TOON_MESSAGE_LENGTH); - return(NULL); - } -+ if (!XShapeQueryExtension(toon_display, &event_base, &error_base)) { -+ strncpy(toon_error_message, _("Display doesn't support the SHAPE extension"), -+ TOON_MESSAGE_LENGTH); -+ return(NULL); -+ } - ToonInit(toon_display); - return toon_display; - } diff --git a/xpenguins-c23.patch b/xpenguins-c23.patch deleted file mode 100644 index d753d69..0000000 --- a/xpenguins-c23.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xpenguins-2.2/src/toon.h.orig 2001-09-30 20:21:45.000000000 +0200 -+++ xpenguins-2.2/src/toon.h 2025-01-24 23:17:25.000000000 +0100 -@@ -118,7 +118,6 @@ - unsigned int wid; - XRectangle pos; - } __ToonWindowData; --typedef int __ToonErrorHandler(); - void __ToonSignalHandler(int sig); - int __ToonError(Display *toon_display, XErrorEvent *error); - void __ToonExitGracefully(int sig); ---- xpenguins-2.2/src/toon_core.c.orig 2001-06-24 19:05:34.000000000 +0200 -+++ xpenguins-2.2/src/toon_core.c 2025-01-24 23:29:46.000000000 +0100 -@@ -255,7 +255,7 @@ - } - } - XFree(children); -- XSetErrorHandler((__ToonErrorHandler *) NULL); -+ XSetErrorHandler((XErrorHandler) NULL); - return 0; - } - diff --git a/xpenguins-c99.patch b/xpenguins-c99.patch deleted file mode 100644 index 94770e9..0000000 --- a/xpenguins-c99.patch +++ /dev/null @@ -1,15 +0,0 @@ -Include for the exit function, to avoid build problems with -future compilers. - -diff --git a/src/toon_signal.c b/src/toon_signal.c -index 7135f0efcb4810d0..c093584cf6d88ae6 100644 ---- a/src/toon_signal.c -+++ b/src/toon_signal.c -@@ -16,6 +16,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - #include -+#include - #include "toon.h" - - /* SIGNAL AND ERROR HANDLING FUNCTIONS */ diff --git a/xpenguins-configure-c99.patch b/xpenguins-configure-c99.patch deleted file mode 100644 index 5226a30..0000000 --- a/xpenguins-configure-c99.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix generic C99 compatibility issues introduced by historic autoconf. -Potential future upstream releases will hopefully use a newer autoconf -version, so it's not necessary to upstream this. - -diff --git a/configure b/configure -index 7a47544bd2f9d06c..4aa7e543f1cfd747 100755 ---- a/configure -+++ b/configure -@@ -909,7 +909,7 @@ cat > conftest.$ac_ext << EOF - #line 910 "configure" - #include "confdefs.h" - --main(){return(0);} -+int main(){return(0);} - EOF - if { (eval echo configure:915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes -@@ -1290,6 +1290,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null diff --git a/xpenguins.appdata.xml b/xpenguins.appdata.xml index 8ba9412..9372a76 100644 --- a/xpenguins.appdata.xml +++ b/xpenguins.appdata.xml @@ -43,6 +43,6 @@ - http://xpenguins.seul.org/ + https://ratrabbit.nl/ratrabbit/software/xpenguins/ goeran@uddeborg.se diff --git a/xpenguins.spec b/xpenguins.spec index dc29e08..55aa653 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -1,38 +1,29 @@ Name: xpenguins -Version: 2.2 +Version: 3.2.3 Release: %autorelease Summary: Cute little penguins that walk along the tops of your windows Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -URL: http://xpenguins.seul.org/ +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} -Source0: http://xpenguins.seul.org/%name-%version.tar.gz +License: GPL-2.0-or-later +URL: https://ratrabbit.nl/ratrabbit/software/xpenguins/ + +Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %name.appdata.xml -# Mailed upstreams developer with this patch, but it is unclear if -# there ever will be a new release. This is a rather inactive -# project. -Patch0: xpenguins-2.2-format-security.patch -# If run on a display without the SHAPE extension, xpenguins will -# crash. This patch causes it to exit more gracefully. Sent -# upstreams, in case there ever will be a new release. -Patch1: xpenguins-2.2-no-SHAPE.patch -Patch2: xpenguins-configure-c99.patch -Patch3: xpenguins-c99.patch -Patch4: xpenguins-c23.patch BuildRequires: make BuildRequires: gcc +BuildRequires: gtk3-devel BuildRequires: desktop-file-utils -BuildRequires: ImageMagick BuildRequires: libappstream-glib BuildRequires: libXpm-devel -BuildRequires: libXext-devel BuildRequires: libXt-devel +BuildRequires: pkgconf-pkg-config %global desktopdir %_datadir/applications -%global icondir %_datadir/icons/hicolor/48x48/apps +%global icondir %_datadir/pixmaps %description XPenguins animates a friendly family of penguins in your root window. @@ -43,9 +34,8 @@ you are bored of penguins, try something else. The themes that come with this package are "Penguins", "Classic Penguins", "Big Penguins", "Turtles" and "Bill". -XPenguins works by drawing on the X root window. This might not have -the desired effect in modern desktop environments like Gnome where the -root window is not visible. +The penguins are able to walk on X11 windows, but are ignorant of +Wayland windows. Some of the effect is lost by this. %description -l sv XPengiuns animerar en vänlig familj av pingviner i ditt rotfönster. @@ -57,9 +47,8 @@ teman som följer med detta paket är "Penguins" (pingviner), "Classic Penguins" (klassiska pingviner), "Big Penguins" (stora pingviner), "Turtles" (sköldpaddor) och "Bill" (Bill). -XPenguins fungerar genom att rita på X rotfönster. Detta fungerar -kanske inte som önskat i moderna skrivbordsmiljöer som Gnome där -rotfönstret inte är synligt. +Pingvinerna kan gå på X11-fönster, men vet inte om Wayland-fönster. +Detta gör att lite av effekten går förlorad. %prep @@ -68,50 +57,25 @@ rotfönstret inte är synligt. %build %configure make %{?_smp_mflags} -cat << EOF > %name.desktop -[Desktop Entry] -Name=XPenguins -GenericName=Animated penguins -GenericName[sv]=Animerade pingviner -Comment=Cute little penguins that walk along the tops of your windows -Comment[sv]=Söta små pingviner som vandrar längs överkanterna på dina fönster -Exec=%name -Icon=%name -Terminal=false -Type=Application -Categories=Game;Amusement; -# Try to exclude desktops where the the X root window, and thus the penguins, -# are hidden. -# -# Sugar is not defined in -# https://standards.freedesktop.org/menu-spec/latest/apb.html -# I'm guessing at X-Sugar. -# -# Suggestions for improvements/corrections are welcome: -# https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=xpenguins -NotShowIn=Cinnamon;GNOME;KDE;LXDE;MATE;X-Sugar; -EOF -iconv -f ISO-8859-1 -t UTF-8 -o README.utf8 README %install make install DESTDIR=%buildroot -desktop-file-install --dir=%buildroot%desktopdir %name.desktop -mkdir -p %buildroot%icondir -convert themes/Big_Penguins/walker.xpm -crop 45x45+0+45 -gravity center -compose src -extent 48x48 %buildroot%icondir/%name.png -install -d %buildroot%_datadir/metainfo -cp -p %SOURCE1 %buildroot%_datadir/metainfo +desktop-file-install --dir=%buildroot%desktopdir src/%name.desktop +install -D --target-directory=%buildroot%icondir src/%name.xpm +install -D --target-directory=%buildroot%_datadir/metainfo %SOURCE1 %check appstream-util validate-relax --nonet \ %buildroot%_datadir/metainfo/%name.appdata.xml %files -%doc README.utf8 AUTHORS COPYING ChangeLog lay-out-frames.scm resize-frames.scm +%doc README AUTHORS ChangeLog lay-out-frames.scm resize-frames.scm +%license COPYING %_bindir/%name %_mandir/man1/* %_datadir/%name %desktopdir/%name.desktop -%icondir/%name.png +%icondir/%name.xpm %_datadir/metainfo/%name.appdata.xml %changelog From 2698b07b7c40e1660ae423d214eeb5026227f4d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Uddeborg?= Date: Sat, 17 Jan 2026 17:26:37 +0100 Subject: [PATCH 13/14] Upgrade to version 3.2.4 --- .gitignore | 1 + sources | 2 +- xpenguins.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 84f4bff..3ab4794 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xpenguins-2.2.tar.gz /xpenguins-3.2.3.tar.gz +/xpenguins-3.2.4.tar.gz diff --git a/sources b/sources index 3f2a065..9684403 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpenguins-3.2.3.tar.gz) = d2f22778534995d9d871296e11664fd2e945f477737e6fde365a5fd2e424bc85b9cf1344a9a2ad6f7c542b7be504074bcdd54191d725a8c4a27868c59f9a586c +SHA512 (xpenguins-3.2.4.tar.gz) = bd25975b8002dd2fa18c3b3f12241dfce0d44edd597e4ce235b61c8453d073caefd424b8ada0dad48cfca4c36dc63a1df7b838c061b07acfed4ff76d121b8f3b diff --git a/xpenguins.spec b/xpenguins.spec index 55aa653..036bace 100644 --- a/xpenguins.spec +++ b/xpenguins.spec @@ -1,5 +1,5 @@ Name: xpenguins -Version: 3.2.3 +Version: 3.2.4 Release: %autorelease Summary: Cute little penguins that walk along the tops of your windows Summary(sv): Söta små pingviner som vandrar längs överkanterna på dina fönster From d94f2e0c6e17b9e01a6b1e832e1f08d96aa04ab8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:24:41 +0000 Subject: [PATCH 14/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild