[kdemultimedia/f17] add patch to install doc correctly
Than Ngo
than at fedoraproject.org
Thu Jun 7 13:13:21 UTC 2012
commit 32057ffc54b4a7330ec40756c39dc834c0028633
Author: Than Ngo <than at redhat.com>
Date: Thu Jun 7 15:12:39 2012 +0200
add patch to install doc correctly
kdemultimedia-4.8.4-docs.patch | 21 +++++++++++++++++++++
kdemultimedia.spec | 8 +++-----
2 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/kdemultimedia-4.8.4-docs.patch b/kdemultimedia-4.8.4-docs.patch
new file mode 100644
index 0000000..bb416bc
--- /dev/null
+++ b/kdemultimedia-4.8.4-docs.patch
@@ -0,0 +1,21 @@
+diff -up kdemultimedia-4.8.4/dragonplayer/doc/CMakeLists.txt.me kdemultimedia-4.8.4/dragonplayer/doc/CMakeLists.txt
+--- kdemultimedia-4.8.4/dragonplayer/doc/CMakeLists.txt.me 2012-06-07 14:59:47.674850235 +0200
++++ kdemultimedia-4.8.4/dragonplayer/doc/CMakeLists.txt 2012-06-07 15:02:24.741945188 +0200
+@@ -1,2 +1,2 @@
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en/)
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en/ SUBDIR dragonplayer)
+
+diff -up kdemultimedia-4.8.4/juk/doc/CMakeLists.txt.me kdemultimedia-4.8.4/juk/doc/CMakeLists.txt
+--- kdemultimedia-4.8.4/juk/doc/CMakeLists.txt.me 2012-06-07 15:02:55.293962285 +0200
++++ kdemultimedia-4.8.4/juk/doc/CMakeLists.txt 2012-06-07 15:03:16.564973912 +0200
+@@ -1,2 +1,2 @@
+ ########### install files ###############
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR juk)
+diff -up kdemultimedia-4.8.4/kmix/doc/CMakeLists.txt.me kdemultimedia-4.8.4/kmix/doc/CMakeLists.txt
+--- kdemultimedia-4.8.4/kmix/doc/CMakeLists.txt.me 2012-06-07 15:03:37.224985165 +0200
++++ kdemultimedia-4.8.4/kmix/doc/CMakeLists.txt 2012-06-07 15:03:59.594997192 +0200
+@@ -1,2 +1,2 @@
+ ########### install files ###############
+-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmix)
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 4fc3791..33dd7d3 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -6,7 +6,7 @@
Name: kdemultimedia
Epoch: 6
Version: 4.8.4
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: KDE Multimedia applications
Group: Applications/Multimedia
@@ -22,6 +22,7 @@ URL: http://www.kde.org/
Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
Patch1: kdemultimedia-4.6.2-no_thumbs.patch
+Patch2: kdemultimedia-4.8.4-docs.patch
## upstream patches
@@ -138,7 +139,7 @@ Requires: %{name}-kio_audiocd = %{?epoch:%{epoch}:}%{version}-%{release}
# no mplayerthumbs/ffmpegthumbs
%patch1 -p1 -b .no_thumbs
-
+%patch2 -p1 -b .docs
%build
@@ -329,9 +330,6 @@ fi
%changelog
-* Thu Jun 07 2012 Lukáš Tinkl <ltinkl at redhat.com> - 6:4.8.4-2
-- respin, re-enable dragonplayer docs
-
* Wed Jun 06 2012 Than Ngo <than at redhat.com> - 6:4.8.4-1
- 4.8.4
More information about the scm-commits
mailing list