rpms/kphotoalbum/devel kphotoalbum-4.1.1-docbook_fix.patch, NONE, 1.1 kphotoalbum.spec, 1.51, 1.52

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18920

Modified Files:
	kphotoalbum.spec 
Added Files:
	kphotoalbum-4.1.1-docbook_fix.patch 
Log Message:
another docbook_fix try


kphotoalbum-4.1.1-docbook_fix.patch:
 doc-translations/de_kphotoalbum/kphotoalbum/index.docbook |    2 +-
 doc-translations/et_kphotoalbum/kphotoalbum/index.docbook |    2 +-
 doc-translations/it_kphotoalbum/kphotoalbum/index.docbook |    2 +-
 doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook |    2 +-
 doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook |    2 +-
 doc/index.docbook                                         |   14 +++++++-------
 6 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE kphotoalbum-4.1.1-docbook_fix.patch ---
diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix kphotoalbum-4.1.1/doc/index.docbook
--- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix	2009-11-15 15:16:29.000000000 -0600
+++ kphotoalbum-4.1.1/doc/index.docbook	2010-06-13 12:44:46.978165455 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>">
   <!ENTITY kappname "&kphotoalbum;">
   <!ENTITY package "kdeextragear-2">
@@ -41,12 +41,6 @@
     <date>2004-08-06</date>
     <releaseinfo>2.0</releaseinfo>
     
-    <keywordset>
-      <keyword>KDE</keyword>
-      <keyword>kdeextragear-2</keyword>
-      <keyword>KPhotoAlbum</keyword>
-      <keyword>Image Database</keyword>
-    </keywordset>
     <abstract><para>
   This is the user manual for &kphotoalbum;. If you are
   not the type who likes reading documentation, but rather just want to try
@@ -64,6 +58,12 @@ menu and select <guimenuitem>Run &kphoto
 on long HTML document at <ulink
 url="http://www.kphotoalbum.org/">&kphotoalbum;'s Homepage</ulink></para>
 </abstract>
+    <keywordset>
+      <keyword>KDE</keyword>
+      <keyword>kdeextragear-2</keyword>
+      <keyword>KPhotoAlbum</keyword>
+      <keyword>Image Database</keyword>
+    </keywordset>
   </bookinfo>
   
   &introduction;
diff -up kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook
--- kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:07.000000000 -0600
+++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 12:45:14.105165668 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kphotoalbum "<application
 >KPhotoAlbum</application
 >">
diff -up kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook
--- kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:20.000000000 -0600
+++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 12:46:18.196177680 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kphotoalbum "<application
 >KPhotoAlbum</application
 >">
diff -up kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook
--- kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:57.000000000 -0600
+++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 12:46:36.899166644 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kphotoalbum "<application
 >KPhotoAlbum</application
 >">
diff -up kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook
--- kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:13.000000000 -0600
+++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 12:46:51.165166035 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kphotoalbum "<application
 >KPhotoAlbum</application
 >">
diff -up kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook
--- kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:26.000000000 -0600
+++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 12:47:01.642190531 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kphotoalbum "<application
 >KPhotoAlbum</application
 >">


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/kphotoalbum.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- kphotoalbum.spec	13 Jun 2010 16:18:05 -0000	1.51
+++ kphotoalbum.spec	13 Jun 2010 17:45:36 -0000	1.52
@@ -10,7 +10,7 @@ URL:	 http://kphotoalbum.org/
 Source0:  http://kphotoalbum.org/data/download/kphotoalbum-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch100: kphotoalbum-docbook.patch
+Patch100: kphotoalbum-4.1.1-docbook_fix.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
@@ -37,9 +37,7 @@ A photo album tool. Focuses on three key
 %prep
 %setup -q 
 
-pushd doc
-%patch100 -p0
-popd
+%patch100 -p1
 
 
 %build
@@ -98,6 +96,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %changelog
 * Mon May 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.1.1-6 
 - rebuild (exiv2)
+- docbook fix (for kde-4.5.x)
 
 * Wed Feb 10 2010 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-5
  touchup marble deps