diff --git a/cairo-ac.patch b/cairo-ac.patch
new file mode 100644
index 0000000..133ed01
--- /dev/null
+++ b/cairo-ac.patch
@@ -0,0 +1,20 @@
+--- configure.in
++++ configure.in
+@@ -20,6 +20,7 @@ AM_INIT_AUTOMAKE([1.7])
+ dnl ===========================================================================
+ 
+ # libtool shared library version
++m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$])dnl
+ 
+ # Increment if the interface has additions, changes, removals.
+ LT_CURRENT=13
+@@ -56,7 +57,9 @@ AC_PATH_PROG(XARGS, xargs)
+ dnl ===========================================================================
+ 
+ AC_PROG_CC
++AC_PROG_CXX
+ AC_PROG_CPP
++AM_PROG_CC_C_O
+ AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL dnl required version (1.4) DON'T REMOVE!
+ AC_STDC_HEADERS
diff --git a/cairo.changes b/cairo.changes
index 69b1066..d2a4601 100644
--- a/cairo.changes
+++ b/cairo.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Apr 14 12:57:44 CEST 2008 - aj@suse.de
+
+- Remove dependency on gtk-doc and own the directories instead.
+- Properly provide libpixman.
+- Change ldconfig usage in post scripts.
+
+-------------------------------------------------------------------
+Mon Apr 14 11:54:13 CEST 2008 - schwab@suse.de
+
+- Fix configure script with patch cairo-ac.patch.
+
 -------------------------------------------------------------------
 Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
 
diff --git a/cairo.spec b/cairo.spec
index d503f02..b1576c7 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -23,15 +23,14 @@ BuildRequires:  DirectFB-devel
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
-# Needed only for directory ownership:
-BuildRequires:  gtk-doc
 License:        LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
 Group:          Development/Libraries/X11
 Summary:        Vector Graphics Library with Cross-Device Output Support
 Url:            http://cairographics.org/
 Version:        1.4.14
-Release:        18
+Release:        20
 Source:         %{name}-%{version}.tar.bz2
+Patch1:         cairo-ac.patch
 # This fixes a problem with libpixman getting the depth wrong for some
 # 16bpp image formats but still render things correctly. Using
 # surface->depth instead of image->depth for the ximage was a quick way to
@@ -44,7 +43,8 @@ Patch6:         bugzilla-104365.patch
 Patch7:         cairo-1.4.10-lcd-filter-1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Last present in SuSE Linux 10.0 (and NLD9):
-Obsoletes:      libpixman
+Obsoletes:      libpixman <= 0.1.1
+Provides:       libpixman <= 0.1.1
 
 %description
 Cairo is a vector graphics library with cross-device output support.
@@ -75,7 +75,8 @@ Requires:       xorg-x11-libxcb-devel
 %endif
 %endif
 # Last present in SuSE Linux 10.0 (and NLD9):
-Obsoletes:      libpixman-devel
+Obsoletes:      libpixman-devel <= 0.1.1
+Provides:       libpixman-devel <= 0.1.1
 
 %description devel
 This package contains all files necessary to build binaries using
@@ -104,6 +105,7 @@ Authors:
 
 %prep
 %setup -q
+%patch1
 %patch4
 %patch6 -p1
 # %patch7 -p1
@@ -130,11 +132,9 @@ make %{?jobs:-j %jobs}
 %install
 %makeinstall
 
-%post
-%run_ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-%run_ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -154,9 +154,17 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files doc
 %defattr(-, root, root)
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Apr 14 2008 aj@suse.de
+- Remove dependency on gtk-doc and own the directories instead.
+- Properly provide libpixman.
+- Change ldconfig usage in post scripts.
+* Mon Apr 14 2008 schwab@suse.de
+- Fix configure script with patch cairo-ac.patch.
 * Thu Apr 10 2008 ro@suse.de
 - added baselibs.conf file to build xxbit packages
   for multilib support