packages: ConsoleKit/ConsoleKit.spec, ConsoleKit/ConsoleKit-skip_xmlto_vali...

[patrys]

Author: patrys                       Date: Thu Aug  6 14:04:23 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build
- rel 6

---- Files affected:
packages/ConsoleKit:
   ConsoleKit.spec (1.25 -> 1.26) , ConsoleKit-skip_xmlto_validation.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ConsoleKit/ConsoleKit.spec
diff -u packages/ConsoleKit/ConsoleKit.spec:1.25 packages/ConsoleKit/ConsoleKit.spec:1.26
--- packages/ConsoleKit/ConsoleKit.spec:1.25	Sun Jun 28 23:55:12 2009
+++ packages/ConsoleKit/ConsoleKit.spec	Thu Aug  6 16:04:18 2009
@@ -3,12 +3,13 @@
 Summary(pl.UTF-8):	ConsoleKit dla PolicyKit
 Name:		ConsoleKit
 Version:	0.3.0
-Release:	5
+Release:	6
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://people.freedesktop.org/~mccann/dist/%{name}-%{version}.tar.bz2
 # Source0-md5:	43b02a52212330b54cfb34c4044d9ce0
 Patch0:		%{name}-dbus.patch
+Patch1:		%{name}-skip_xmlto_validation.patch
 URL:		http://www.freedesktop.org/wiki/Software/ConsoleKit
 BuildRequires:	PolicyKit-devel >= 0.7
 BuildRequires:	autoconf >= 2.60
@@ -28,6 +29,7 @@
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus-glib >= 0.30
+Requires:	filesystem >= 3.0-25
 Requires:	glib2 >= 1:2.8.0
 Requires:	rc-scripts
 Requires:	xorg-lib-libX11 >= 1.0.0
@@ -85,6 +87,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -93,8 +96,8 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-pam-module \
 	--enable-docbook-docs \
+	--enable-pam-module \
 	--enable-static \
 	--with-pam-module-dir=/%{_lib}/security \
 	--with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid
@@ -173,6 +176,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2009/08/06 14:04:18  patrys
+- fix build
+- rel 6
+
 Revision 1.25  2009/06/28 21:55:12  patrys
 - move session dir to filesystem
 - rel 5

================================================================
Index: packages/ConsoleKit/ConsoleKit-skip_xmlto_validation.patch
diff -u /dev/null packages/ConsoleKit/ConsoleKit-skip_xmlto_validation.patch:1.1
--- /dev/null	Thu Aug  6 16:04:23 2009
+++ packages/ConsoleKit/ConsoleKit-skip_xmlto_validation.patch	Thu Aug  6 16:04:18 2009
@@ -0,0 +1,18 @@
+Because xmlto-0.0.22 adds --noent to xmllint options, it's more strict,
+and doesn't validate anymore. This is a temp. solution until upstream
+gets their documentation fixed.
+
+http://bugs.gentoo.org/show_bug.cgi?id=271678
+
+diff -ur ConsoleKit-0.3.0.orig/doc/dbus/Makefile.am ConsoleKit-0.3.0/doc/dbus/Makefile.am
+--- ConsoleKit-0.3.0.orig/doc/dbus/Makefile.am	2008-07-31 00:35:51.000000000 +0300
++++ ConsoleKit-0.3.0/doc/dbus/Makefile.am	2009-06-09 22:30:57.000000000 +0300
+@@ -16,7 +16,7 @@
+ htmldoc_DATA = ConsoleKit.html
+ 
+ ConsoleKit.html : $(SPEC_XML_FILES)
+-	$(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
++	$(XMLTO) --skip-validation xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
+ 
+ endif # DOCBOOK_DOCS_ENABLED
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ConsoleKit/ConsoleKit.spec?r1=1.25&r2=1.26&f=u