[jwm/f20: 3/3] Update to 2.2.2

[Christopher Meng]

commit 411e56474a0112062548c7af0908d7c3482a0f87
Author: Christopher Meng <i at cicku.me>
Date:   Thu Sep 18 01:11:20 2014 -0400

    Update to 2.2.2

 .gitignore           |    1 +
 jwm-nostrip.patch    |   10 ----------
 jwm-timestamps.patch |   27 ---------------------------
 jwm.spec             |   47 ++++++++++++++++++++++++-----------------------
 sources              |    2 +-
 5 files changed, 26 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4b2dc6d..dfd11d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /jwm-500.tar.bz2
 /jwm-2.1.0.tar.bz2
 /jwm-2.2.0.tar.xz
+/jwm-2.2.2.tar.xz
diff --git a/jwm.spec b/jwm.spec
index e2a5066..5072e3b 100644
--- a/jwm.spec
+++ b/jwm.spec
@@ -1,62 +1,60 @@
 Name:           jwm
-Version:        2.2.0
-Release:        3%{?dist}
+Version:        2.2.2
+Release:        1%{?dist}
 Summary:        Joe's Window Manager
-
-Group:          User Interface/Desktops
 License:        GPLv2+
-URL:            http://joewing.net/programs/jwm
-Source0:        http://joewing.net/programs/jwm/releases/%{name}-%{version}.tar.xz
+URL:            http://joewing.net/projects/jwm/
+Source0:        http://joewing.net/projects/jwm/releases/%{name}-%{version}.tar.xz
 Source1:        %{name}.desktop
-Patch0:         %{name}-nostrip.patch
-Patch1:         %{name}-timestamps.patch
-
-BuildRequires:  libXext-devel
-BuildRequires:  libXmu-devel
-BuildRequires:  libXinerama-devel
-BuildRequires:  libXpm-devel
+BuildRequires:  freetype-devel
+BuildRequires:  fribidi-devel
+BuildRequires:  gettext
 BuildRequires:  libjpeg-turbo-devel
 BuildRequires:  libpng-devel
+BuildRequires:  librsvg2-devel
+BuildRequires:  libXext-devel
 BuildRequires:  libXft-devel
-BuildRequires:  fribidi-devel
-BuildRequires:  freetype-devel
-BuildRequires:  gettext
+BuildRequires:  libXinerama-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXpm-devel
 Requires:       xterm
 
 %description
-JWM is a window manager for the X11 Window System. JWM is written in C and uses
+JWM is a window manager for the X11 Window System. It's written in C and uses
 only Xlib at a minimum. The following libraries can also be used if available:
 
-* libXext for the shape extension
-* libXext for the render extension
+* libXext for the shape/render extension
 * libXmu for drawing rounded windows (shape extension also needed)
 * libXinerama for Xinerama support
 * libXpm for XPM backgrounds and icons
 * libjpeg for JPEG backgrounds and icons
 * libpng for PNG backgrounds and icons
+* libRSVG and Cairo for SVG backgrounds and icons
 * libxft for antialiased and true type fonts
 * libfribidi for right-to-left language support
 
 JWM supports MWM and Extended Window Manager Hints (EWMH).
 
+Note that Fedora package is built with all supported features enabled.
+
 %prep
 %setup -q
 
 # Do not strip binary file
-%patch0 -p0 -b .orig
+sed -i '/\tstrip/d' src/Makefile.in
 
 # Preserve timestamps in installation
-%patch1 -p0 -b .orig
+sed -i 's|install -m|install -pm|g' Makefile.in
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 
 mkdir -p %{buildroot}%{_datadir}/xsessions
-install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/
+install -pm644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/
 
 %find_lang %{name}
 
@@ -68,6 +66,9 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Wed Sep 17 2014 Christopher Meng <rpm at cicku.me> - 2.2.2-1
+- Update to 2.2.2
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 2953ac7..c2b09b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4950ed5d44d1f00e7b7386fea4657b54  jwm-2.2.0.tar.xz
+35063dbd19636cdb90335d4ec0f04cb8  jwm-2.2.2.tar.xz