[WindowMaker] Remove -extra again

[Andreas Bierfert]

commit eb16904c39e1ce2d0dc4b27e4c7b1fe12d5ec418
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Mon Jan 7 22:22:22 2013 +0100

    Remove -extra again
    
    Thinking about it -extra should not return as subpackage but be put to review
    so we get a separate package which is not updated each time windowmaker is
    updated.

 .gitignore       |    1 -
 WindowMaker.spec |   88 +++--------------------------------------------------
 sources          |    1 -
 3 files changed, 5 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8cd4f7a..82d733b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-WindowMaker-extra-0.1.tar.gz
 /WindowMaker-0.95.4.tar.gz
diff --git a/WindowMaker.spec b/WindowMaker.spec
index 6df7d30..736dec4 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -2,8 +2,7 @@ Summary:        A fast, feature rich Window Manager
 Name:           WindowMaker
 Version:        0.95.4
 Release:        2%{?dist}
-# source is GPLv2+, extras is GPLv2
-License:        GPLv2+ and GPLv2
+License:        GPLv2+
 Group:          User Interface/Desktops
 URL:            http://www.windowmaker.org 
 # Source0:        http://windowmaker.org/pub/source/release/WindowMaker-%{version}.tar.gz
@@ -16,7 +15,6 @@ Source2:        WindowMaker-application.desktop
 Source3:        WindowMaker-uk.po
 Source4:        WPrefs-uk.po
 
-Source5:        WindowMaker-extra-0.1.tar.gz
 # fix underlinking of libWMaker
 # http://repo.or.cz/w/wmaker-crm.git/patch/37677b2ec08c514e2234400244d15b989c4b8faf?hp=a2de2c34eea348aaff5f39434ce297a322672140
 Patch0:         0001-Fix-underlinking.patch
@@ -105,7 +103,7 @@ This is the extra data package for Window Maker. For now it only contains some
 icons and a few themes.
 
 %prep
-%setup -q -n wmaker-crm -a 5
+%setup -q -n wmaker-crm
 
 %patch0 -p1 -b .fixunderlinking
 
@@ -141,11 +139,6 @@ export CFLAGS LINGUAS NLSDIR
 
 make %{?_smp_mflags}
 
-# configure extra
-pushd %{name}-extra-0.1
-%configure
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT NLSDIR=%{_datadir}/locale install
@@ -169,11 +162,6 @@ done
 
 chrpath --delete %{buildroot}%{_libdir}/libWINGs.so.2.0.1
 
-# install extra stuff
-pushd %{name}-extra-0.1
-make DESTDIR=$RPM_BUILD_ROOT install
-popd
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -311,78 +299,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/get-wraster-flags*
 %{_mandir}/man1/get-wutil-flags*
 
-%files extra
-%defattr(-,root,root,-)
-%{_datadir}/WindowMaker/Icons/Ant.xpm
-%{_datadir}/WindowMaker/Icons/Antennae.xpm
-%{_datadir}/WindowMaker/Icons/Bee48x48.xpm
-%{_datadir}/WindowMaker/Icons/Beer.xpm
-%{_datadir}/WindowMaker/Icons/Bird.xpm
-%{_datadir}/WindowMaker/Icons/Book.xpm
-%{_datadir}/WindowMaker/Icons/Bookshelf.xpm
-%{_datadir}/WindowMaker/Icons/Brain.xpm
-%{_datadir}/WindowMaker/Icons/BulletHole.xpm
-%{_datadir}/WindowMaker/Icons/CashRegister.xpm
-%{_datadir}/WindowMaker/Icons/Clipboard.xpm
-%{_datadir}/WindowMaker/Icons/Cola.xpm
-%{_datadir}/WindowMaker/Icons/ColorGNU.xpm
-%{_datadir}/WindowMaker/Icons/Correspondence.dir.xpm
-%{_datadir}/WindowMaker/Icons/CrystalSkull.dir.xpm
-%{_datadir}/WindowMaker/Icons/Daemon.xpm
-%{_datadir}/WindowMaker/Icons/Detergent.dir.xpm
-%{_datadir}/WindowMaker/Icons/DoomII.xpm
-%{_datadir}/WindowMaker/Icons/Draw.xpm
-%{_datadir}/WindowMaker/Icons/EscherCube.xpm
-%{_datadir}/WindowMaker/Icons/EscherTriangle.xpm
-%{_datadir}/WindowMaker/Icons/Fish5.dir.xpm
-%{_datadir}/WindowMaker/Icons/Football.xpm
-%{_datadir}/WindowMaker/Icons/FootballUS.xpm
-%{_datadir}/WindowMaker/Icons/Gear.xpm
-%{_datadir}/WindowMaker/Icons/Ghost.xpm
-%{_datadir}/WindowMaker/Icons/HP-16C-48.xpm
-%{_datadir}/WindowMaker/Icons/HandOpen.xpm
-%{_datadir}/WindowMaker/Icons/HandPointing.xpm
-%{_datadir}/WindowMaker/Icons/HandPointingLeft.xpm
-%{_datadir}/WindowMaker/Icons/HandPunch.xpm
-%{_datadir}/WindowMaker/Icons/HandReach.xpm
-%{_datadir}/WindowMaker/Icons/HeroSandwich.dir.xpm
-%{_datadir}/WindowMaker/Icons/LadyBug48x48.xpm
-%{_datadir}/WindowMaker/Icons/Microphone.xpm
-%{_datadir}/WindowMaker/Icons/Netscape.xpm
-%{_datadir}/WindowMaker/Icons/NewsAgent.xpm
-%{_datadir}/WindowMaker/Icons/PDF.xpm
-%{_datadir}/WindowMaker/Icons/Padlock.xpm
-%{_datadir}/WindowMaker/Icons/Paint.xpm
-%{_datadir}/WindowMaker/Icons/Pencils.24.xpm
-%{_datadir}/WindowMaker/Icons/Penguin.xpm
-%{_datadir}/WindowMaker/Icons/Radio.xpm
-%{_datadir}/WindowMaker/Icons/Reference.xpm
-%{_datadir}/WindowMaker/Icons/Rumi.xpm
-%{_datadir}/WindowMaker/Icons/Snail.xpm
-%{_datadir}/WindowMaker/Icons/T2-Film.xpm
-%{_datadir}/WindowMaker/Icons/TagIcon.xpm
-%{_datadir}/WindowMaker/Icons/TapeIcon1.xpm
-%{_datadir}/WindowMaker/Icons/TrueDie48.xpm
-%{_datadir}/WindowMaker/Icons/WheelbarrowFull.xpm
-%{_datadir}/WindowMaker/Icons/WordEditor.xpm
-%{_datadir}/WindowMaker/Icons/Wrench-12bit.xpm
-%{_datadir}/WindowMaker/Icons/bomb2.xpm
-%{_datadir}/WindowMaker/Icons/inspect.xpm
-%{_datadir}/WindowMaker/Icons/monitor.xpm
-%{_datadir}/WindowMaker/Icons/paint.xpm
-%{_datadir}/WindowMaker/Icons/tile.black.xpm
-%{_datadir}/WindowMaker/Icons/tile.snow.xpm
-%{_datadir}/WindowMaker/Icons/tile.xpm
-%{_datadir}/WindowMaker/Icons/tile2.xpm
-%{_datadir}/WindowMaker/Themes/Checker.themed/
-%{_datadir}/WindowMaker/Themes/LeetWM.themed/
-%{_datadir}/WindowMaker/Themes/Night.themed/
-%{_datadir}/WindowMaker/Themes/STEP2000.themed/
-
 %changelog
 * Mon Jan 07 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.95.4-2
-- add extra sub-package
+- fix incorrect fsf address
+- submit extra package for review so this is not updated each time we update
+  windowmaker
 
 * Mon Jan 07 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.95.4-1
diff --git a/sources b/sources
index 7202515..55ff1fa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3ef850cfe0fb6660a55ccc8a2e408f74  WindowMaker-extra-0.1.tar.gz
 380eb3961c960eb9d8fc10aee20e8ad3  WindowMaker-0.95.4.tar.gz