From bea18895af85228adac4753365a0614db5b96837 Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert@lowlatency.de>
Date: Dec 24 2015 18:27:49 +0000
Subject: 0.95.7-1


- version upgrade
- unneeded remove patches
- adjust man pages
- enable pango
- enable ICCCM replace

---

diff --git a/.gitignore b/.gitignore
index 3648aa7..7abcead 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/WindowMaker-0.95.6.tar.gz
+/WindowMaker-0.95.7.tar.gz
diff --git a/WindowMaker.spec b/WindowMaker.spec
index 083d9a9..20f23a3 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,7 +1,7 @@
 Summary:        A fast, feature rich Window Manager
 Name:           WindowMaker
-Version:        0.95.6
-Release:        3%{?dist}
+Version:        0.95.7
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          User Interface/Desktops
 URL:            http://www.windowmaker.org 
@@ -14,20 +14,6 @@ Source4:        WPrefs-uk.po
 
 Source5:        WindowMaker-WMRootMenu-fedora
 
-# fix Workspace background pref can be tricked to run arbitrary cmds
-# http://repo.or.cz/w/wmaker-crm.git/commit/e11199d9cf45efcd52505da90c5430646de4ea26
-Patch0:         WindowMaker-fix-wmsetbg-injection.patch
-# fix maximize when dock is set 'on top' and it should be covered
-# http://repo.or.cz/w/wmaker-crm.git/commit/59537ec4cd4d7ba5060b5b2f6dad8e8f92f4c002
-Patch1:         WindowMaker-fix-maxdock.patch
-# fix maximizing window in multi screen env
-# http://repo.or.cz/w/wmaker-crm.git/commit/efb7c6b3df445a5895df5c16e2279d20895082e2
-Patch2:         WindowMaker-0.95.6-fix-maxwindow.patch
-# create custom GNUSTEP dir if needed
-# http://repo.or.cz/w/wmaker-crm.git/commit/416f5986856040881f4fef59c1170833f049e37f
-Patch3:         WindowMaker-util-create-dir.patch
-
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 # X BR
 BuildRequires:  libICE-devel
@@ -53,6 +39,7 @@ BuildRequires:  gettext-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  automake autoconf libtool
 BuildRequires:  chrpath
+BuildRequires:  pango-devel
 
 Requires:       WINGs-libs = %{version}-%{release}
 Requires:       desktop-backgrounds-compat
@@ -115,11 +102,6 @@ icons and a few themes.
 %prep
 %setup -q
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
 # add uk translation
 cp %{SOURCE3} po/uk.po
 cp %{SOURCE4} WPrefs.app/po/uk.po
@@ -140,10 +122,10 @@ done
 # fix utf8 issues
 iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
 
-for i in doc/cs/geticonset.1x doc/cs/seticons.1x doc/cs/wdwrite.1x doc/cs/wmaker.1x \
- doc/cs/wmsetbg.1x doc doc/cs/wxcopy.1x doc/cs/wxpaste.1x doc/sk/geticonset.1x \
- doc/sk/seticons.1x doc/sk/wdwrite.1x doc/sk/wmaker.1x doc/sk/wmsetbg.1x \
- doc/sk/wxcopy.1x doc/sk/wxpaste.1x; do
+for i in doc/cs/geticonset.1 doc/cs/seticons.1 doc/cs/wdwrite.1 doc/cs/wmaker.1 \
+ doc/cs/wmsetbg.1 doc doc/cs/wxcopy.1 doc/cs/wxpaste.1 doc/sk/geticonset.1 \
+ doc/sk/seticons.1 doc/sk/wdwrite.1 doc/sk/wmaker.1 doc/sk/wmsetbg.1 \
+ doc/sk/wxcopy.1 doc/sk/wxpaste.1; do
 echo $i
 iconv -f iso8859-1 -t utf-8 $i > $i.conv && mv -f $i.conv $i
 done
@@ -163,6 +145,8 @@ export CFLAGS LINGUAS NLSDIR
  --enable-randr \
  --enable-xinerama \
  --enable-usermenu \
+ --enable-pango \
+ --enable-wmreplace \
  --x-includes=%{_includedir} \
  --x-libraries=%{_libdir}
 
@@ -197,7 +181,7 @@ geticonset wmsetbg wmagnify wmgenmenu wmmenugen WPrefs ; do
 chrpath --delete %{buildroot}%{_bindir}/$f
 done
 
-chrpath --delete %{buildroot}%{_libdir}/libWINGs.so.3.0.0
+chrpath --delete %{buildroot}%{_libdir}/libWINGs.so.3.1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -304,11 +288,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/wdread*
 %{_mandir}/man1/wmgenmenu*
 %{_mandir}/man1/wmmenugen*
-%{_mandir}/man1/*.1x*
+%{_mandir}/man1/*.1*
 %{_mandir}/man8/upgrade-windowmaker-defaults*
-%lang(cs) %{_mandir}/cs/man1/*.1x*
-%lang(sk) %{_mandir}/sk/man1/*.1x*
-%lang(ru) %{_mandir}/ru/man1/*.1x*
+%lang(cs) %{_mandir}/cs/man1/*.1*
+%lang(sk) %{_mandir}/sk/man1/*.1*
+%lang(ru) %{_mandir}/ru/man1/*.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -341,6 +325,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/get-wutil-flags*
 
 %changelog
+* Thu Dec 24 2015 Andreas Bierfert <andreas.bierfert@lowlatency.de>
+- 0.95.7-1
+- version upgrade
+- unneeded remove patches
+- adjust man pages
+- enable pango
+- enable ICCCM replace
+
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.95.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 4ed3fec..2df08fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b3cf9e6cd1f4066ffa5f2f22c25aee3  WindowMaker-0.95.6.tar.gz
+082c31d4b7b573518a960e8a879679d7  WindowMaker-0.95.7.tar.gz