From cc8935e6027dcf5a574e9406193efcc14203e9c25b1dcf493a7da21ab8c25a27 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Sat, 17 Sep 2011 12:46:19 +0000
Subject: [PATCH] Accepting request 82683 from home:jengelh:bl

- Remove redundant tags/sections from specfile
- Use %_smp_mflags for parallel build
- Fix erroneous trailing backslash

OBS-URL: https://build.opensuse.org/request/show/82683
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=11
---
 WindowMaker.changes |  7 +++++++
 WindowMaker.spec    | 29 +++++++----------------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/WindowMaker.changes b/WindowMaker.changes
index 1cd2957..3a248fb 100644
--- a/WindowMaker.changes
+++ b/WindowMaker.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep 17 10:35:01 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+- Fix erroneous trailing backslash
+
 -------------------------------------------------------------------
 Wed Aug 31 04:38:04 UTC 2011 - crrodriguez@opensuse.org
 
diff --git a/WindowMaker.spec b/WindowMaker.spec
index 3a097ee..2df15a3 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           WindowMaker
@@ -26,7 +25,6 @@ Url:            http://www.windowmaker.info/
 Obsoletes:      wmaker 
 Provides:       wmaker windowmanager
 Requires:       xdg-menu
-AutoReqProv:    on
 Summary:        A Colorful and Flexible Window Manager
 Version:        0.92.0
 Release:        219
@@ -68,21 +66,9 @@ Window Maker is a colorful and flexible window manager and
 the designated successor of AfterStep. For more details, check
 http://www.windowmaker.org.
 
-
-
-Authors:
---------
-    Alfredo K. Kojima <kojima@windowmaker.org>
-
 %description devel
 Includes and static libraries for Window Maker
 
-
-
-Authors:
---------
-    Alfredo K. Kojima <kojima@windowmaker.org>
-
 %prep
 %setup -q -n Window-Maker-5a2507602c48 -a 1
 mkdir menu.orig
@@ -123,12 +109,14 @@ export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
             --with-nlsdir=/usr/share/locale \
             --with-pixmapdir=/usr/share/WindowMaker/Pixmaps \
 	    --with-gnustepdir=/usr/lib/GNUstep
-(cd WindowMaker/Defaults; make clean; make)
-make 
+
+(cd WindowMaker/Defaults; make clean; make %{?_smp_mflags})
+make %{?_smp_mflags}
 (cd WindowMaker-extra-0.1
 %configure --disable-static --with-pic\
-            --with-pixmapdir=/usr/share/WindowMaker/Pixmaps \
-make
+            --with-pixmapdir=/usr/share/WindowMaker/Pixmaps
+
+make %{?_smp_mflags}
 )
 # ---------------------------------------------------------------------------
 
@@ -138,7 +126,7 @@ install -m 755 dockit $RPM_BUILD_ROOT/usr/bin/dockit
 install -m 755 windowmaker $RPM_BUILD_ROOT/usr/bin/windowmaker
 cd WindowMaker-extra-0.1
 make DESTDIR=$RPM_BUILD_ROOT install
-tar xfvj %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes/
+tar -xvjf %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes/
 find $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes -type f -exec chmod 644 {} \;
 find $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes -type d -exec chmod 755 {} \;
 #----------------------------------------------------------------------
@@ -154,9 +142,6 @@ cd ..
 %find_lang WINGs %{name}.lang
 %find_lang WPrefs %{name}.lang
 
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig