Accepting request 82742 from X11:windowmanagers

- Remove redundant tags/sections from specfile
- Use %_smp_mflags for parallel build
- Fix erroneous trailing backslash (forwarded request 82683 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/82742
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/WindowMaker?expand=0&rev=21
This commit is contained in:
Lars Vogdt 2011-09-19 13:31:41 +00:00 committed by Git OBS Bridge
commit 2a6c4c0483
2 changed files with 14 additions and 22 deletions

View File

@ -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 Wed Aug 31 04:38:04 UTC 2011 - crrodriguez@opensuse.org

View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: WindowMaker Name: WindowMaker
@ -26,7 +25,6 @@ Url: http://www.windowmaker.info/
Obsoletes: wmaker Obsoletes: wmaker
Provides: wmaker windowmanager Provides: wmaker windowmanager
Requires: xdg-menu Requires: xdg-menu
AutoReqProv: on
Summary: A Colorful and Flexible Window Manager Summary: A Colorful and Flexible Window Manager
Version: 0.92.0 Version: 0.92.0
Release: 219 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 the designated successor of AfterStep. For more details, check
http://www.windowmaker.org. http://www.windowmaker.org.
Authors:
--------
Alfredo K. Kojima <kojima@windowmaker.org>
%description devel %description devel
Includes and static libraries for Window Maker Includes and static libraries for Window Maker
Authors:
--------
Alfredo K. Kojima <kojima@windowmaker.org>
%prep %prep
%setup -q -n Window-Maker-5a2507602c48 -a 1 %setup -q -n Window-Maker-5a2507602c48 -a 1
mkdir menu.orig mkdir menu.orig
@ -123,12 +109,14 @@ export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
--with-nlsdir=/usr/share/locale \ --with-nlsdir=/usr/share/locale \
--with-pixmapdir=/usr/share/WindowMaker/Pixmaps \ --with-pixmapdir=/usr/share/WindowMaker/Pixmaps \
--with-gnustepdir=/usr/lib/GNUstep --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 (cd WindowMaker-extra-0.1
%configure --disable-static --with-pic\ %configure --disable-static --with-pic\
--with-pixmapdir=/usr/share/WindowMaker/Pixmaps \ --with-pixmapdir=/usr/share/WindowMaker/Pixmaps
make
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 install -m 755 windowmaker $RPM_BUILD_ROOT/usr/bin/windowmaker
cd WindowMaker-extra-0.1 cd WindowMaker-extra-0.1
make DESTDIR=$RPM_BUILD_ROOT install 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 f -exec chmod 644 {} \;
find $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes -type d -exec chmod 755 {} \; 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 WINGs %{name}.lang
%find_lang WPrefs %{name}.lang %find_lang WPrefs %{name}.lang
%clean
rm -rf "$RPM_BUILD_ROOT"
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig