Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -1 +1,2 @@
 xteddy-2.0.1.tar.gz
+/xteddy-2.2.tar.gz

0001-Link-against-Xext.patch

@@ -0,0 +1,41 @@
+From 0b209bca7013ca13a28f71f36ae44d9d674ccd1d Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Wed, 6 Nov 2013 18:05:42 +0100
+Subject: [PATCH] Link against Xext
+
+Fixes build with newer ld
+/usr/bin/ld: xteddy.o: undefined reference to symbol 'XShapeCombineMask'
+---
+ Makefile.am | 2 +-
+ Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 01f02ca..2ab3ed8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,7 @@ man_MANS = xteddy.6
+ bin_SCRIPTS = xtoys xteddy_test
+ 
+ AM_CFLAGS  = @IMLIB2_CFLAGS@
+-AM_LDFLAGS = @IMLIB2_LIBS@ -lX11
++AM_LDFLAGS = @IMLIB2_LIBS@ -lX11 -lXext
+ 
+ DEFS = -DPIXMAP_PATH=\"@PIXMAP_PATH@\" -Wall
+ 
+diff --git a/Makefile.in b/Makefile.in
+index 3d41623..e670e46 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -184,7 +184,7 @@ xteddy_SOURCES = xteddy.c
+ man_MANS = xteddy.6
+ bin_SCRIPTS = xtoys xteddy_test
+ AM_CFLAGS = @IMLIB2_CFLAGS@
+-AM_LDFLAGS = @IMLIB2_LIBS@ -lX11
++AM_LDFLAGS = @IMLIB2_LIBS@ -lX11 -lXext
+ SUBDIRS = html images
+ EXTRA_DIST = $(man_MANS)  $(bin_SCRIPTS) \
+              README xteddy.README images.credit \
+-- 
+1.8.4.2
+

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xteddy
-# $Id$
-NAME := xteddy
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-d33bfe05f18259a3f7fd17ae256c5644  xteddy-2.0.1.tar.gz
+7672eb1f1e9dac1ca7cf169e43f9fe1c  xteddy-2.2.tar.gz

xteddy-2.0.1-iconname.patch

@@ -1,25 +0,0 @@
-Fix use of uninitialized value, which causes random crashes on startup.
-
-Lubomir Rintel <lkundrak@v3.sk>
-
-diff -up xteddy-2.0.1/xteddy.c.iconname xteddy-2.0.1/xteddy.c
---- xteddy-2.0.1/xteddy.c.iconname	2009-03-08 23:01:59.000000000 -0400
-+++ xteddy-2.0.1/xteddy.c	2009-03-08 23:02:12.000000000 -0400
-@@ -109,7 +109,7 @@ int main(int argc, char **argv)
-   XSizeHints           size_hints;
-   XWMHints             wm_hints;
-   XClassHint           class_hints;
--  XTextProperty        windowName, iconName;
-+  XTextProperty        windowName;
-   int                  argnum;
-   int                  use_wm, float_up, allow_quit;
-   XEvent               report;
-@@ -237,7 +237,7 @@ int main(int argc, char **argv)
-   class_hints.res_name = progname;
-   class_hints.res_class = "Xteddy";
-   
--  XSetWMProperties(display, win, &windowName, &iconName,
-+  XSetWMProperties(display, win, &windowName, NULL,
- 		   argv, argc, &size_hints, &wm_hints, &class_hints);
- 
-   /* Select event types wanted */

xteddy-2.0.1-visual.patch

@@ -1,32 +0,0 @@
-Imlib picks visual with highest possible depth, which are ARGB visuals in
-case Composite extensions are in use, and which it can not handle. Use the
-default, RGB, instead.
-
-Lubomir Rintel <lkundrak@v3.sk>
-
-diff -up xteddy-2.0.1/xteddy.c.visual xteddy-2.0.1/xteddy.c
---- xteddy-2.0.1/xteddy.c.visual	2008-12-04 12:30:18.000000000 +0100
-+++ xteddy-2.0.1/xteddy.c	2008-12-04 12:30:21.000000000 +0100
-@@ -122,6 +122,8 @@ int main(int argc, char **argv)
-   Cursor               cursor;
-   char                *teddy;
-   char                *file;
-+  ImlibInitParams      params;
-+  Visual              *visual;
- 
-   /* Window movement variables */
-   XWindowChanges       winchanges;
-@@ -172,7 +174,12 @@ int main(int argc, char **argv)
-   display_width  = DisplayWidth(display, screen_num);
-   display_height = DisplayHeight(display, screen_num);
- 
--  if ( !(id=Imlib_init(display)) ) return -1;
-+  /* Determine the correct visual */
-+  visual = DefaultVisual(display, screen_num);
-+  params.flags = PARAMS_VISUALID;
-+  params.visualid = visual->visualid;
-+
-+  if ( !(id=Imlib_init_with_params(display, &params)) ) return -1;
-   if ( !(file = InitTeddy(teddy)) ) {
-     fprintf(stderr, "Can not find any image with name %s.\n", teddy);
-     return -1;

xteddy.spec

@@ -1,29 +1,29 @@
 Name:           xteddy
-Version:        2.0.1
-Release:        4%{?dist}
+Version:        2.2
+Release:        28%{?dist}
 Summary:        Tool to sit around silently, look cute, and make you smile
 
-Group:          Amusements/Games
-License:        GPL+
+License:        GPL-1.0-or-later
 URL:            http://fam-tille.de/debian/xteddy.html
 Source0:        http://webstaff.itn.liu.se/~stegu/xteddy/%{name}-%{version}.tar.gz
-# Both submitted upstream by mail
-Patch0:         xteddy-2.0.1-visual.patch
-Patch1:         xteddy-2.0.1-iconname.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# This is original artwork by Lubomir Rintel, distributed under same
+# terms and condition as xteddy
+Source1:        kacicka.png
+Patch0:         0001-Link-against-Xext.patch
 
-BuildRequires:  imlib-devel libpng-devel
+BuildRequires: make
+BuildRequires:  gcc
+BuildRequires:  imlib2-devel libpng-devel
 
 %description
 Xteddy is your virtual comfort when things get rough. It can do everything
 a real teddy bear can do. That is, I can sit around silently, look cute,
-and make you smile. 
+and make you smile.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .visual
-%patch1 -p1 -b .iconname
+%patch -P0 -p1
 
 
 %build
@@ -32,26 +32,138 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
+install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/xteddy/
 
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/xteddy
 %{_bindir}/xteddy_test
 %{_bindir}/xtoys
-%{_mandir}/man1/xteddy.1*
+%{_mandir}/man6/xteddy.6*
 %{_datadir}/xteddy
 %doc COPYING README AUTHORS ChangeLog NEWS
-%doc xteddy.README xtuxxy.credit
+%doc xteddy.README images.credit
 
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jun 17 2024 Miroslav Suchý <msuchy@redhat.com> - 2.2-23
+- convert license to SPDX
+
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Leigh Scott <leigh123linux@gmail.com> - 2.2-20
+- Rebuild fo new imlib2
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Nov 06 2013 Lubomir Rintel <lkundrak@v3.sk> - 2.2-1
+- New release
+
+* Wed Nov 06 2013 Lubomir Rintel <lkundrak@v3.sk> - 2.0.1-15
+- Add a picture
+
+* Thu Oct 24 2013 Lubomir Rintel <lkundrak@v3.sk> - 2.0.1-14
+- Bulk sad and useless attempt at consistent SPEC file formatting
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 2.0.1-11
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 2.0.1-10
+- rebuild against new libjpeg
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 2.0.1-7
+- Rebuild for new libpng
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Mar 08 2009 Lubomir Rintel <lkundrak@v3.sk> 2.0.1-4
 - Fix startup crash