Accepting request 870252 from X11:Utilities

- Modernise spec file
- Use fdupes
- Refresh patches

OBS-URL: https://build.opensuse.org/request/show/870252
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xpenguins?expand=0&rev=21

xpenguins-2.2-typo.diff

@@ -1,6 +1,8 @@
---- src/main.c
+Index: xpenguins-2.2/src/main.c
-+++ src/main.c
+===================================================================
-@@ -340,7 +340,7 @@
+--- xpenguins-2.2.orig/src/main.c
++++ xpenguins-2.2/src/main.c
+@@ -340,7 +340,7 @@ main (int argc, char **argv)
  	break;
        }
        else if (xpenguins_verbose) {
@@ -9,9 +11,11 @@
        }
        ToonConfigure(TOON_EXITGRACEFULLY);
        xpenguins_set_number(0);
---- xpenguins.1
+Index: xpenguins-2.2/xpenguins.1
-+++ xpenguins.1
+===================================================================
-@@ -11,7 +11,7 @@
+--- xpenguins-2.2.orig/xpenguins.1
++++ xpenguins-2.2/xpenguins.1
+@@ -11,7 +11,7 @@ By default it will be penguins - they dr
  screen, walk along the tops of your windows, up the side of your
  windows, levitate, skateboard, and do other similarly exciting
  things. Be careful when you move windows as the little guys squash
@@ -20,7 +24,7 @@
  hitting Ctrl-C) they will burst.
  .I XPenguins
  is now themeable, so it is easy to select something else to animate
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ option can be called multiple times to r
  simultaneously.
  .TP 8
  .B  "\-q, --quiet"

xpenguins.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb  8 11:24:20 UTC 2021 - Martin Pluskal <mpluskal@suse.com>
+
+- Modernise spec file
+- Use fdupes
+- Refresh patches
+
 -------------------------------------------------------------------
 Wed Nov  5 11:24:28 UTC 2014 - dimstar@opensuse.org
 

xpenguins.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xpenguins
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,17 +12,17 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           xpenguins
 Version:        2.2
 Release:        0
-Summary:        cute little penguins that walk along the tops of your windows
+Summary:        Cute little penguins that walk along the tops of your windows
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Amusements/Toys/Background
-Url:            http://xpenguins.seul.org/
+URL:            http://xpenguins.seul.org/
 Source:         xpenguins-%{version}.tar.bz2
 Source1:        README.openSUSE
 Source2:        %{name}.desktop
@@ -32,12 +32,13 @@ Source5:        %{name}-stop.png
 Patch0:         xpenguins-%{version}-typo.diff
 Patch1:         xpenguins-%{version}-automake-1.13.diff
 BuildRequires:  automake
+BuildRequires:  fdupes
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(xt)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This program animates a friendly family of penguins on your root
@@ -47,30 +48,28 @@ and sometimes even levitate with their genetically-modified
 go-go-gadget 'copter ability.
 
 %prep
-%setup -q
+%autosetup -p1
-%patch0
-%patch1 -p1
-cp %{SOURCE1} %{SOURCE4} %{SOURCE5} .
 
 %build
 aclocal
-automake -a
+autoreconf -fiv
-autoconf
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-cp %{name}.png %{name}-stop.png %{buildroot}%{_datadir}/pixmaps
+cp %{SOURCE4} %{SOURCE5} %{buildroot}%{_datadir}/pixmaps
+cp %{SOURCE4} .
 %suse_update_desktop_file -i %{name} Amusement
 %suse_update_desktop_file -i %{name}-stop Amusement
+%fdupes %{buildroot}
 
 %files
-%defattr(-,root,root)
+%license COPYING
-%doc README* AUTHORS COPYING ChangeLog
+%doc README* AUTHORS ChangeLog
 %attr(755,root,root) %{_bindir}/xpenguins
-%doc %{_mandir}/man1/xpenguins.1*
+%{_mandir}/man1/xpenguins.1%{?ext_man}
 %{_datadir}/xpenguins
 %{_datadir}/pixmaps/*.png
 %{_datadir}/applications/*.desktop