From f9cf5741dbfbdc3167107cde03328df838878c812eb04c273dc7266f77f5267d Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sun, 2 Nov 2014 16:26:40 +0000
Subject: [PATCH] Accepting request 259311 from
 home:elvigia:branches:X11:Utilities

- Switch to individual pkgconfig() build requires
  instead of using metapackage xorg-x11-devel

OBS-URL: https://build.opensuse.org/request/show/259311
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpenguins?expand=0&rev=9
---
 xpenguins.changes |  6 ++++++
 xpenguins.spec    | 48 +++++++++++++++++++++++------------------------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/xpenguins.changes b/xpenguins.changes
index 1f42d87..bd3edf3 100644
--- a/xpenguins.changes
+++ b/xpenguins.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov  2 00:54:45 UTC 2014 - crrodriguez@opensuse.org
+
+- Switch to individual pkgconfig() build requires
+  instead of using metapackage xorg-x11-devel
+
 -------------------------------------------------------------------
 Tue Mar  5 11:18:02 UTC 2013 - pgajdos@suse.com
 
diff --git a/xpenguins.spec b/xpenguins.spec
index 77d386a..9e8d974 100644
--- a/xpenguins.spec
+++ b/xpenguins.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xpenguins
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,6 @@
 
 
 Name:           xpenguins
-BuildRequires:  automake
-BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-devel
 Version:        2.2
 Release:        0
 Summary:        cute little penguins that walk along the tops of your windows
@@ -28,12 +25,17 @@ Group:          Amusements/Toys/Background
 Url:            http://xpenguins.seul.org/
 Source:         xpenguins-%{version}.tar.bz2
 Source1:        README.SuSE
-Source2:        %name.desktop
-Source3:        %name-stop.desktop
-Source4:        %name.png
-Source5:        %name-stop.png
-Patch:          xpenguins-%{version}-typo.diff
+Source2:        %{name}.desktop
+Source3:        %{name}-stop.desktop
+Source4:        %{name}.png
+Source5:        %{name}-stop.png
+Patch0:         xpenguins-%{version}-typo.diff
 Patch1:         xpenguins-%{version}-automake-1.13.diff
+BuildRequires:  automake
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xpm)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -44,36 +46,32 @@ and sometimes even levitate with their genetically-modified
 go-go-gadget 'copter ability.
 
 %prep
-%setup
-%patch
+%setup -q
+%patch0
 %patch1 -p1
-cp %{S:1} %{S:4} %{S:5} .
+cp %{SOURCE1} %{SOURCE4} %{SOURCE5} .
 
 %build
 aclocal
 automake -a
 autoconf
 %configure
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
-cp %name.png %name-stop.png $RPM_BUILD_ROOT/usr/share/pixmaps
-%suse_update_desktop_file -i %name Amusement
-%suse_update_desktop_file -i %name-stop Amusement
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+cp %{name}.png %{name}-stop.png %{buildroot}%{_datadir}/pixmaps
+%suse_update_desktop_file -i %{name} Amusement
+%suse_update_desktop_file -i %{name}-stop Amusement
 
 %files
 %defattr(-,root,root)
 %doc README* AUTHORS COPYING ChangeLog
 %attr(755,root,root) %{_bindir}/xpenguins
 %doc %{_mandir}/man1/xpenguins.1*
-/usr/share/xpenguins
-/usr/share/pixmaps/*.png
-/usr/share/applications/*.desktop
+%{_datadir}/xpenguins
+%{_datadir}/pixmaps/*.png
+%{_datadir}/applications/*.desktop
 
 %changelog