[rpms/amarok] epel10.2: - fix/patch installation of amarok handbooks

[rpms/amarok] epel10.2: - fix/patch installation of amarok handbooks

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 02530d655364f761f50bfba603257dedda95f96c
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2010-08-17T08:33:56-05:00
Stats  : +60/-5 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/02530d655364f761f50bfba603257dedda95f96c?branch=epel10.2

Log:
- fix/patch installation of amarok handbooks

---
diff --git a/amarok-2.3.1.90-handbook_current_lang.patch b/amarok-2.3.1.90-handbook_current_lang.patch
new file mode 100644
index 0000000..6597e7f
--- /dev/null
+++ b/amarok-2.3.1.90-handbook_current_lang.patch
@@ -0,0 +1,54 @@
+diff -up amarok-2.3.1.90/doc/en_US/CMakeLists.txt.handbook amarok-2.3.1.90/doc/en_US/CMakeLists.txt
+--- amarok-2.3.1.90/doc/en_US/CMakeLists.txt.handbook	2010-08-15 11:25:49.000000000 -0500
++++ amarok-2.3.1.90/doc/en_US/CMakeLists.txt	2010-08-17 08:17:48.396919728 -0500
+@@ -1 +1 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ SUBDIR amarok )
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en/ SUBDIR amarok )
+diff -up amarok-2.3.1.90/doc/es/CMakeLists.txt.handbook amarok-2.3.1.90/doc/es/CMakeLists.txt
+--- amarok-2.3.1.90/doc/es/CMakeLists.txt.handbook	2010-08-15 11:26:28.000000000 -0500
++++ amarok-2.3.1.90/doc/es/CMakeLists.txt	2010-08-17 08:18:02.272920156 -0500
+@@ -1 +1 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ SUBDIR amarok )
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/es/ SUBDIR amarok )
+diff -up amarok-2.3.1.90/doc/et/CMakeLists.txt.handbook amarok-2.3.1.90/doc/et/CMakeLists.txt
+--- amarok-2.3.1.90/doc/et/CMakeLists.txt.handbook	2010-08-15 11:26:38.000000000 -0500
++++ amarok-2.3.1.90/doc/et/CMakeLists.txt	2010-08-17 08:18:14.200919632 -0500
+@@ -1 +1 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ SUBDIR amarok )
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/et/ SUBDIR amarok )
+diff -up amarok-2.3.1.90/doc/fr/CMakeLists.txt.handbook amarok-2.3.1.90/doc/fr/CMakeLists.txt
+--- amarok-2.3.1.90/doc/fr/CMakeLists.txt.handbook	2010-08-15 11:26:44.000000000 -0500
++++ amarok-2.3.1.90/doc/fr/CMakeLists.txt	2010-08-17 08:18:27.482170059 -0500
+@@ -1 +1 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ SUBDIR amarok )
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/fr/ SUBDIR amarok )
+diff -up amarok-2.3.1.90/doc/it/CMakeLists.txt.handbook amarok-2.3.1.90/doc/it/CMakeLists.txt
+--- amarok-2.3.1.90/doc/it/CMakeLists.txt.handbook	2010-08-15 11:27:06.000000000 -0500
++++ amarok-2.3.1.90/doc/it/CMakeLists.txt	2010-08-17 08:18:39.343919220 -0500
+@@ -1 +1 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ SUBDIR amarok )
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/it/ SUBDIR amarok )
+diff -up amarok-2.3.1.90/doc/nl/CMakeLists.txt.handbook amarok-2.3.1.90/doc/nl/CMakeLists.txt
+--- amarok-2.3.1.90/doc/nl/CMakeLists.txt.handbook	2010-08-15 11:27:40.000000000 -0500
++++ amarok-2.3.1.90/doc/nl/CMakeLists.txt	2010-08-17 08:18:51.675919691 -0500
+@@ -1 +1 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ SUBDIR amarok )
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR amarok )
+diff -up amarok-2.3.1.90/doc/pt_BR/CMakeLists.txt.handbook amarok-2.3.1.90/doc/pt_BR/CMakeLists.txt
+--- amarok-2.3.1.90/doc/pt_BR/CMakeLists.txt.handbook	2010-08-15 11:27:59.000000000 -0500
++++ amarok-2.3.1.90/doc/pt_BR/CMakeLists.txt	2010-08-17 08:19:12.566169589 -0500
+@@ -1 +1 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ SUBDIR amarok )
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/pt_BR/ SUBDIR amarok )
+diff -up amarok-2.3.1.90/doc/sv/CMakeLists.txt.handbook amarok-2.3.1.90/doc/sv/CMakeLists.txt
+--- amarok-2.3.1.90/doc/sv/CMakeLists.txt.handbook	2010-08-15 11:28:17.000000000 -0500
++++ amarok-2.3.1.90/doc/sv/CMakeLists.txt	2010-08-17 08:19:31.220919133 -0500
+@@ -1 +1 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ SUBDIR amarok )
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/sv/ SUBDIR amarok )
+diff -up amarok-2.3.1.90/doc/uk/CMakeLists.txt.handbook amarok-2.3.1.90/doc/uk/CMakeLists.txt
+--- amarok-2.3.1.90/doc/uk/CMakeLists.txt.handbook	2010-08-15 11:28:28.000000000 -0500
++++ amarok-2.3.1.90/doc/uk/CMakeLists.txt	2010-08-17 08:19:45.297919488 -0500
+@@ -1 +1 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ SUBDIR amarok )
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR amarok )

diff --git a/amarok.spec b/amarok.spec
index 62a83d0..6bc6840 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.3.1.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -11,6 +11,7 @@ Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch50: amarok-2.2.1.90-qtscript_not_required.patch
+Patch51: amarok-2.3.1.90-handbook_current_lang.patch
 
 ## upstream patches
 
@@ -81,6 +82,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
+%patch51 -p1 -b .handbook_current_lang
 
 
 %build
@@ -97,10 +99,6 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# an initial handbook is available, but it is currently fubar
-# FIXME
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/amarok
-
 %find_lang amarok --with-kde
 %find_lang amarokcollectionscanner_qt 
 %find_lang amarokpkg 
@@ -180,6 +178,9 @@ fi
 
 
 %changelog
+* Tue Aug 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.3.1.90-2
+- fix/patch installation of amarok handbooks
+
 * Mon Aug 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.3.1.90-1
 - amarok-2.3.1.90 (2.3.2 beta1)