[WindowMaker] 0.95.5-1

[Andreas Bierfert]

commit d62d99a6e0670aa7756236897e05eb094eac4335
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Sat Aug 31 09:47:05 2013 +0200

    0.95.5-1
    
    - version upgrade
    - do some more /usr/local/ replacement so that WindowMaker-extra is detected correctly

 .gitignore                                         |    2 +-
 0001-Fix-incorrect-FSF-address.patch               |  992 --------------------
 0001-Fix-underlinking.patch                        |   26 -
 ...WINGS-New-function-WMReadPropListFromPipe.patch |   97 --
 ...MENU-option-to-parse-command-generated-pr.patch |  171 ----
 0002-Include-LGPL-with-correct-FSF-address.patch   |  144 ---
 0003-Teach-WPrefs-about-OPEN_PLMENU.patch          |  210 -----
 WindowMaker.spec                                   |   53 +-
 sources                                            |    2 +-
 9 files changed, 19 insertions(+), 1678 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 82d733b..98c6f23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/WindowMaker-0.95.4.tar.gz
+/wmaker-crm-cd5e004127d4088df21bd62c20a9d6c61a27763b.tar.gz
diff --git a/WindowMaker.spec b/WindowMaker.spec
index 706070d..8911225 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,41 +1,20 @@
 Summary:        A fast, feature rich Window Manager
 Name:           WindowMaker
-Version:        0.95.4
-Release:        6%{?dist}
+Version:        0.95.5
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          User Interface/Desktops
 URL:            http://www.windowmaker.org 
 # Source0:        http://windowmaker.org/pub/source/release/WindowMaker-%{version}.tar.gz
 # pull source from git as download folder is still not populated
-# http://repo.or.cz/w/wmaker-crm.git/snapshot/a2de2c34eea348aaff5f39434ce297a322672140.tar.gz
-Source0:        WindowMaker-%{version}.tar.gz
+# http://repo.or.cz/w/wmaker-crm.git/snapshot/cd5e004127d4088df21bd62c20a9d6c61a27763b.tar.gz
+Source0:        wmaker-crm-cd5e004127d4088df21bd62c20a9d6c61a27763b.tar.gz
 Source1:        WindowMaker-xsession.desktop
 Source2:        WindowMaker-application.desktop
 
 Source3:        WindowMaker-uk.po
 Source4:        WPrefs-uk.po
 
-# fix underlinking of libWMaker
-# http://repo.or.cz/w/wmaker-crm.git/patch/37677b2ec08c514e2234400244d15b989c4b8faf?hp=a2de2c34eea348aaff5f39434ce297a322672140
-Patch0:         0001-Fix-underlinking.patch
-
-# fix incorrect fsf address
-# see
-# http://repo.or.cz/w/wmaker-crm.git/commit/085224973a3c03c184afd362273f4746c54f5db1
-# and
-# http://repo.or.cz/w/wmaker-crm.git/commit/0b74ae41944dbec80e7a26bd02312d4ae6cebff7
-Patch1:         0001-Fix-incorrect-FSF-address.patch
-Patch2:         0002-Include-LGPL-with-correct-FSF-address.patch
-
-# add proplist menu code from git
-# see
-# http://repo.or.cz/w/wmaker-crm.git/commit/cc69d2aae38b5563d39d3348cec805ed8b3d753d
-# http://repo.or.cz/w/wmaker-crm.git/commit/c21ae6b580889d247408123a5c624abf6d784232
-# http://repo.or.cz/w/wmaker-crm.git/commit/066de301df2f07c614b77e7a2bbadd9ff1342e46
-Patch3:         0001-WINGS-New-function-WMReadPropListFromPipe.patch
-Patch4:         0002-Add-OPEN_PLMENU-option-to-parse-command-generated-pr.patch
-Patch5:         0003-Teach-WPrefs-about-OPEN_PLMENU.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 # X BR
 BuildRequires:  libICE-devel
@@ -122,27 +101,23 @@ icons and a few themes.
 %prep
 %setup -q -n wmaker-crm
 
-%patch0 -p1 -b .fixunderlinking
-
-%patch1 -p1 -b .fixfsfaddress
-%patch2 -p1 -b .usecurrentlgpl
-
-%patch3 -p1 -b .wmreadproplistfrompipe
-%patch4 -p1 -b .openplmenu
-%patch5 -p1 -b .wprefsopenplmenu
-
 # add uk translation
 cp %{SOURCE3} po/uk.po
 cp %{SOURCE4} WPrefs.app/po/uk.po
 
 # cleanup menu entries
-for i in WindowMaker/*menu* ; do
+for i in WindowMaker/*menu*; do
 echo $i
 sed -i.old -e 's:/usr/local/:%{_prefix}/:g' \
   -e 's:/home/mawa:$(HOME):g' \
   -e 's:GNUstep/Applications/WPrefs.app:bin:g' $i
 done
 
+for i in util/wmgenmenu.c WindowMaker/Defaults/WindowMaker.in WPrefs.app/Paths.c; do
+echo $i
+sed -i.old -e  's:/usr/local/:%{_prefix}/:g'  $i
+done
+
 autoreconf -vfi -I m4
 
 %build
@@ -242,6 +217,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/WindowMaker/Icons/defaultAppIcon.*
 %{_datadir}/WindowMaker/Icons/defaultterm.*
 %{_datadir}/WindowMaker/Icons/draw.*
+%{_datadir}/WindowMaker/Icons/Drawer.png
 %{_datadir}/WindowMaker/Icons/Ear.png
 %{_datadir}/WindowMaker/Icons/Ftp.png
 %{_datadir}/WindowMaker/Icons/GNUstep3D.*
@@ -324,6 +300,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/get-wutil-flags*
 
 %changelog
+* Sat Aug 31 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.95.5-1
+- version upgrade
+- do some more /usr/local/ replacement so that WindowMaker-extra is detected correctly
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.95.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -492,7 +473,7 @@ rm -rf $RPM_BUILD_ROOT
 0.91.0-1
 - upgrade to 0.91.0
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Fri Nov 28 2003 Dams <anvil[AT]livna.org> - 0:0.80.2-0.fdr.6
diff --git a/sources b/sources
index 55ff1fa..0c8ea19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-380eb3961c960eb9d8fc10aee20e8ad3  WindowMaker-0.95.4.tar.gz
+0af380e1ed526e20fad6529801600a4e  wmaker-crm-cd5e004127d4088df21bd62c20a9d6c61a27763b.tar.gz