[krusader] Update to 2.4.0-beta2

[Radek Novacek]

commit 0e506e3bc484b524ccfa463b6e0f352c56c6895d
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Mon Oct 15 08:59:30 2012 +0200

    Update to 2.4.0-beta2
    
    - Drop g++ 4.7 patch (upstreamed)
    - Add patch for generating manual page

 krusader-2.4.0-beta1-fix-for-g++47.patch    |   21 ---------------------
 krusader-2.4.0-beta2-generate-manpage.patch |    7 +++++++
 krusader.spec                               |   15 ++++++++++-----
 3 files changed, 17 insertions(+), 26 deletions(-)
---
diff --git a/krusader-2.4.0-beta2-generate-manpage.patch b/krusader-2.4.0-beta2-generate-manpage.patch
new file mode 100644
index 0000000..c7abbd7
--- /dev/null
+++ b/krusader-2.4.0-beta2-generate-manpage.patch
@@ -0,0 +1,7 @@
+diff -up krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt.generate-manpage krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt
+--- krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt.generate-manpage	2012-10-15 08:51:50.570757518 +0200
++++ krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt	2012-10-15 08:52:56.522420929 +0200
+@@ -1 +1,3 @@
+ kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR krusader )
++kde4_create_manpage(man-krusader.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
++
diff --git a/krusader.spec b/krusader.spec
index a6fb869..e1f507d 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -1,7 +1,7 @@
 Name:		krusader
 Version:	2.4.0
-%global beta beta1
-Release:	0.5.%{beta}%{?dist}
+%global beta beta2
+Release:	0.6.%{beta}%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -11,8 +11,8 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{b
 # adds default MIME type handlers for (tar.)lzma legacy archives
 # fixes bz2 (non-tar) MIME type
 Patch0:		krusader-2.3.0-beta1-default-mimetypes.patch
-# Fix build failure with g++ 4.7
-Patch1:		krusader-2.4.0-beta1-fix-for-g++47.patch
+# Generate manpage
+Patch1:		krusader-2.4.0-beta2-generate-manpage.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,7 +39,7 @@ friendly, fast and looks great on your desktop! You should give it a try.
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 # apply this one after the upstream patch since it touches the same file
 %patch0 -p1 -b .mimetypes
-%patch1 -p1 -b .fix-for-g++47
+%patch1 -p1 -b .generate-manpage
 
 %build
 mkdir -p %{_target_platform}
@@ -103,6 +103,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/krusader.1.gz
 
 %changelog
+* Mon Oct 15 2012 Radek Novacek <rnovacek at redhat.com> - 2.4.0-0.6.beta2
+- Update to 2.4.0-beta2
+- Drop g++ 4.7 patch (upstreamed)
+- Add patch for generating manual page
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-0.5.beta1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild