[slim] Update to 1.3.3 version by request bz#800254

[Pavel Alexeev]

commit 392f96f544c5f809665c7efa47b340142448ae7d
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Sat Mar 17 16:16:47 2012 +0400

    Update to 1.3.3 version by request bz#800254
    
    - Step to cmake build system.
    - Drop libpng and make patches.
    - Rebase to new version Fedora patch.

 .gitignore |    3 +++
 slim.spec  |   26 ++++++++++++++------------
 sources    |    8 +++-----
 3 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1da617a..242b0ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ slim-1.3.1.tar.gz
 /slim-update_slim_wmlist
 /slim-dynwm
 /slim-1.3.2-libpng-version.patch
+/slim-1.3.3.tar.gz
+/slim-1.3.3-fedora.patch
+/slim-1.3.2-selinux.patch
diff --git a/slim.spec b/slim.spec
index 5e9f175..45a1c90 100644
--- a/slim.spec
+++ b/slim.spec
@@ -1,6 +1,6 @@
 Name:           slim
-Version:        1.3.2
-Release:        11%{?dist}
+Version:        1.3.3
+Release:        1%{?dist}
 Summary:        Simple Login Manager
 Group:          User Interface/X
 License:        GPLv2+
@@ -16,16 +16,12 @@ Source4:        slim-fedora.txt
 Source5:        slim.logrotate.d
 Source6:        slim-tmpfiles.conf
 # Fedora-specific patches
-Patch0:         slim-1.3.2-make.patch
-Patch1:         slim-1.3.2-fedora.patch
+Patch1:         slim-1.3.3-fedora.patch
 Patch2:         slim-1.3.2-selinux.patch
-# I beleave what upstream dead, so patch did not sended anywhere
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649799
-Patch3:         slim-1.3.2-libpng-version.patch
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
-BuildRequires:  pkgconfig gettext libselinux-devel pam-devel
+BuildRequires:  pkgconfig gettext libselinux-devel pam-devel cmake
 BuildRequires:  xwd xterm /sbin/shutdown
 Requires:       xwd xterm /sbin/shutdown
 Requires:       %{_sysconfdir}/pam.d
@@ -49,14 +45,14 @@ before launching slim.
 
 %prep
 %setup -q
-%patch0 -p1 -b .make
-%patch1 -p1 -b .fedora
+
+%patch1 -p0 -b .fedora
 %patch2 -p1 -b .selinux
-%patch3 -p1 -b .libpng-ver
 cp -p %{SOURCE4} README.Fedora
 
 %build
-make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" USE_PAM=1
+CXXFLAGS="%{optflags}" cmake -DUSE_PAM=yes -DCMAKE_INSTALL_PREFIX=%{_prefix} .
+make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} INSTALL='install -p' MANDIR=%{_mandir}
@@ -94,6 +90,12 @@ install -p -D %{SOURCE6} %{buildroot}%{_sysconfdir}/tmpfiles.d/slim.conf
 %endif
 
 %changelog
+* Tue Mar 6 2012 Pavel Alexeev <Pahan at Hubbitus.info> - 1.3.3-1
+- Update to 1.3.3 version by request bz#800254
+- Step to cmake build system.
+- Drop libpng and make patches.
+- Rebase to new version Fedora patch.
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-11
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index edebfa6..a53f9a8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,3 @@
-ca1ae6120e6f4b4969f2d6cf94f47b42  slim-1.3.2.tar.gz
-69a563902f84529c0b9437603c082574  slim-update_slim_wmlist
-bb11ef362ce7f27433931c51ffdc9657  slim-dynwm
-b0f6cc1ddfa4821699975edc290496ad  slim-1.3.2-libpng-version.patch
-172c9465803934d03fd530683520df06  slim-dynwm
+ce53e44c1e4a2eacf5bb7688ee2a5de8  slim-1.3.3.tar.gz
+7015bb74bbeeca45ead00db4dd1a5b02  slim-1.3.3-fedora.patch
+51ccc8bd99506c862db8583e91f2eb3c  slim-1.3.2-selinux.patch