rpms/knutclient/devel knutclient-1.0.1-docbook_fix.patch, NONE, 1.1 knutclient-1.0.1-docbook_fix2.patch, NONE, 1.1 knutclient.spec, 1.4, 1.5

[thomasj]

Author: thomasj

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

Modified Files:
	knutclient.spec 
Added Files:
	knutclient-1.0.1-docbook_fix.patch 
	knutclient-1.0.1-docbook_fix2.patch 
Log Message:
docbook fix and cosmetic spec cleanup

knutclient-1.0.1-docbook_fix.patch:
 index.docbook |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE knutclient-1.0.1-docbook_fix.patch ---
--- doc/cs/index.docbook	2010-03-12 21:02:22.000000000 +0100
+++ doc/cs/index.docbook.old	2010-06-15 21:35:19.000000000 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF8" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" 
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.22-Based Variant V1.0//EN" 
 "dtd/kdex.dtd" [
   <!ENTITY knutclient '<application>KNutClient</application>'>
   <!ENTITY kappname "&knutclient;"><!-- replace knutclient here -->

knutclient-1.0.1-docbook_fix2.patch:
 index.docbook |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE knutclient-1.0.1-docbook_fix2.patch ---
--- doc/en/index.docbook	2010-03-12 20:53:09.000000000 +0100
+++ doc/en/index.docbook.old	2010-06-15 21:35:39.000000000 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN"
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.0//EN"
 "dtd/kdex.dtd" [
   <!ENTITY knutclient '<application>KNutClient</application>'>
   <!ENTITY kappname "&knutclient;"><!-- replace knutclient here -->


Index: knutclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knutclient/devel/knutclient.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- knutclient.spec	12 Jun 2010 19:56:02 -0000	1.4
+++ knutclient.spec	15 Jun 2010 19:44:53 -0000	1.5
@@ -19,11 +19,17 @@ BuildRequires:  kdelibs-devel >= 4.4.1
 BuildRequires:  qt-devel >= 4.6
 BuildRequires:  desktop-file-utils >= 0.15
 
+#Upstreamable patches
+Patch10:	knutclient-1.0.1-docbook_fix.patch
+Patch20:	knutclient-1.0.1-docbook_fix2.patch
+
 %description
 KNutClient is a visual KDE client for UPS systems using NUT - Network UPS Tools
 
 %prep
 %setup -q
+%patch10 -p0
+%patch20 -p0
 
 # to prevent spurious-executable-perm
 chmod -x src/knutdock.h
@@ -77,50 +83,39 @@ update-desktop-database -q &> /dev/null
 
 %changelog
 * Fri Jun 11 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0.1-7
-- FTBFS testbuild
+- docbook fix
+- cosmetic spec fixes
 
-* Sat Apr 24 2010 Eli Wapniarski <eli at orbsky.homelinux.org>
--1.0.1-6
+* Sat Apr 24 2010 Eli Wapniarski <eli at orbsky.homelinux.org> -1.0.1-6
 - Initial release to repository
 - Last SPEC file corrections
 
-* Fri Apr 23 2010 Eli Wapniarski <eli at orbsky.homelinux.org>
--1.0.1-5
+* Fri Apr 23 2010 Eli Wapniarski <eli at orbsky.homelinux.org> -1.0.1-5
 - And yet more SPEC file corrections
 
-* Fri Apr 23 2010 Eli Wapniarski <eli at orbsky.homelinux.org>
--1.0.1-4
+* Fri Apr 23 2010 Eli Wapniarski <eli at orbsky.homelinux.org> -1.0.1-4
 - Yet more SPEC file corrections
 
-* Thu Apr 22 2010 Eli Wapniarski <eli at orbsky.homelinux.org>
--1.0.1-3
+* Thu Apr 22 2010 Eli Wapniarski <eli at orbsky.homelinux.org> -1.0.1-3
 - More SPEC file corrections
 
-* Thu Apr 22 2010 Eli Wapniarski <eli at orbsky.homelinux.org>
--1.0.1-2
+* Thu Apr 22 2010 Eli Wapniarski <eli at orbsky.homelinux.org> -1.0.1-2
 - Corrected SPEC issues to conform to guidelines
 
-
-* Sat Apr 10 2010 Eli Wapniarski <eli at orbsky.homelinux.org>
--1.0.1-1
+* Sat Apr 10 2010 Eli Wapniarski <eli at orbsky.homelinux.org> -1.0.1-1
 - Correction to CMakeList.txt
 - patch for dso-linking no longer required
 
-* Fri Apr 9 2010 Eli Wapniarski <eli at orbsky.homelinux.org>
--1.0-4
+* Fri Apr 9 2010 Eli Wapniarski <eli at orbsky.homelinux.org> -1.0-4
 - Corrected %%find_lang macro
 
-
-* Fri Apr 9 2010 Eli Wapniarski <eli at orbsky.homelinux.org>
--1.0-3
+* Fri Apr 9 2010 Eli Wapniarski <eli at orbsky.homelinux.org> -1.0-3
 - Added patch to handle dso-linking for Fedora 13
 
-* Mon Apr 5 2010 Eli Wapniarski <eli at orbsky.homelinux.org>
--1.0-2
+* Mon Apr 5 2010 Eli Wapniarski <eli at orbsky.homelinux.org> -1.0-2
 - Corrected naming conventions
 - Corrected rpm installation conventions
 
-
-* Mon Apr 5 2010 Eli Wapniarski <eli at orbsky.homelinux.org>
--1.0-1
+* Mon Apr 5 2010 Eli Wapniarski <eli at orbsky.homelinux.org> -1.0-1
 - Initial Release
+