- fix build

- rel 6

Changed files:
    ConsoleKit-skip_xmlto_validation.patch -> 1.1
    ConsoleKit.spec -> 1.26

diff --git a/ConsoleKit-skip_xmlto_validation.patch b/ConsoleKit-skip_xmlto_validation.patch
new file mode 100644 (file)
index 0000000..1dfe366
--- /dev/null
+++ b/ConsoleKit-skip_xmlto_validation.patch
@@ -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
+ 

diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index a887b7d9c957ae32031cc724b748b7c723230f2f..ce6706db683368b3d1250b43e8d69ef42e39da75 100644 (file)
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -2,12 +2,13 @@ Summary:      ConsoleKit for PolicyKit
 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
@@ -27,6 +28,7 @@ BuildRequires:        zlib-devel
 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
@@ -84,6 +86,7 @@ Statyczna biblioteka ConsoleKit.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -92,8 +95,8 @@ Statyczna biblioteka ConsoleKit.
 %{__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