From 42bb79b7744074fd2dfc1b0fc7ff517d3cadc5a43223f05bb2e8a6b7943c8509 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 6 Feb 2009 20:32:47 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=21 --- cairo-1.8.0.tar.bz2 | 3 --- cairo-1.8.6.tar.bz2 | 3 +++ cairo-ac.patch | 2 +- cairo.changes | 17 ++++++++++++++ cairo.spec | 54 +++++++++++++++++++++------------------------ 5 files changed, 46 insertions(+), 33 deletions(-) delete mode 100644 cairo-1.8.0.tar.bz2 create mode 100644 cairo-1.8.6.tar.bz2 diff --git a/cairo-1.8.0.tar.bz2 b/cairo-1.8.0.tar.bz2 deleted file mode 100644 index 4620911..0000000 --- a/cairo-1.8.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b9db8a09333c68b03300536b7b4a98a4a1a1ea295228d167c81328f38891c4f -size 4934905 diff --git a/cairo-1.8.6.tar.bz2 b/cairo-1.8.6.tar.bz2 new file mode 100644 index 0000000..62b6ac5 --- /dev/null +++ b/cairo-1.8.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dadecd3cbac523d4f58a2b405e5470a0bea85837bd9ac93a35e1fc3f2048d64 +size 5367354 diff --git a/cairo-ac.patch b/cairo-ac.patch index 4ef397c..4f430ff 100644 --- a/cairo-ac.patch +++ b/cairo-ac.patch @@ -5,7 +5,7 @@ index 02e8c8e..fc875a8 100644 @@ -8,6 +8,8 @@ AC_CONFIG_HEADERS(config.h) AC_CONFIG_AUX_DIR(build) AC_CONFIG_MACRO_DIR(build) - AM_INIT_AUTOMAKE([1.8 gnu -Wall no-define]) + AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define]) +m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$])dnl +AC_PROG_CC_C_O AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL diff --git a/cairo.changes b/cairo.changes index 55338b6..37acbdc 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,14 +1,31 @@ +------------------------------------------------------------------- +Wed Jan 21 14:23:25 IST 2009 - msuman@suse.de + +- Continue to provide the "la" files for SUSE releases <= 11.1 + ------------------------------------------------------------------- Tue Jan 13 21:22:00 CET 2009 - crrodriguez@suse.de - remove static libraries and "la" files +------------------------------------------------------------------- +Sat Dec 20 09:10:35 EST 2008 - mboman@suse.de + +- Update to version 1.8.6: + + Many API changes, fixes and other updates. See NEWS for full details + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) +------------------------------------------------------------------- +Mon Dec 8 12:20:35 EST 2008 - mboman@suse.de + +- Update to version 1.8.4: + + Many API changes, fixes and other updates. See NEWS for full details + ------------------------------------------------------------------- Tue Nov 11 16:54:06 CET 2008 - ro@suse.de diff --git a/cairo.spec b/cairo.spec index fe6608f..6432801 100644 --- a/cairo.spec +++ b/cairo.spec @@ -1,5 +1,5 @@ # -# spec file for package cairo (Version 1.8.0) +# spec file for package cairo (Version 1.8.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,8 @@ Name: cairo +BuildRequires: freetype2-devel gtk-doc libpng-devel pkg-config xorg-x11-devel xorg-x11-libxcb-devel # Use rpmbuild -D 'DIRECTFB_SUPPORT 1' to build wíth DirectFB support. -BuildRequires: freetype2-devel libpng-devel pkg-config xorg-x11-devel -%if %suse_version > 1020 -BuildRequires: xorg-x11-libxcb-devel -%endif %if 0%{?DIRECTFB_SUPPORT} BuildRequires: DirectFB-devel %endif @@ -34,8 +31,8 @@ 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.8.0 -Release: 6 +Version: 1.8.6 +Release: 1 Source: %{name}-%{version}.tar.bz2 Patch1: cairo-ac.patch # PATCH-NEEDS-REBASE bugzilla-104365.patch bnc104365 -- it needs a rename too! @@ -69,17 +66,10 @@ Authors: License: LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: Development environment for cairo Group: Development/Libraries/X11 -Requires: %{name} = %{version} freetype2-devel fontconfig-devel xorg-x11-devel -Requires: libpng-devel +Requires: %{name} = %{version} freetype2-devel fontconfig-devel libpng-devel xorg-x11-devel xorg-x11-libXrender-devel xorg-x11-libX11-devel xorg-x11-libxcb-devel %if 0%{?DIRECTFB_SUPPORT} Requires: DirectFB-devel %endif -### %if %(rpm -q --queryformat=%%{version} xorg-x11-devel | sed 's/\..*$//') >= 7 -Requires: xorg-x11-libXrender-devel xorg-x11-libX11-devel -%if %suse_version > 1020 -Requires: xorg-x11-libxcb-devel -%endif -### %endif # Last present in SuSE Linux 10.0 (and NLD9): Obsoletes: libpixman-devel <= 0.1.1 Provides: libpixman-devel <= 0.1.1 @@ -122,36 +112,33 @@ Authors: %build autoreconf -f -i -%if %suse_version > 1000 -export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" -%endif -# xcb-renderutil is not yet available in openSUSE 10.2 # Only for tests: --enable-pdf --enable-svg -%configure --disable-static --with-pic\ +%configure \ + --with-pic \ %if 0%{?DIRECTFB_SUPPORT} --enable-directfb \ %endif --enable-ps \ -%if %suse_version > 1020 --enable-xcb \ -%endif - --disable-gtk-doc -make %{?jobs:-j %jobs} + --disable-gtk-doc \ + --disable-static +%{__make} %{?jobs:-j %jobs} %install %makeinstall -%{__rm} -f %{buildroot}%{_libdir}/*.la +%if 0%{?suse_version} > 1110 +%{__rm} %{buildroot}/%{_libdir}/*.la +%endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean -rm -rf ${RPM_BUILD_ROOT} +%{__rm} -rf ${RPM_BUILD_ROOT} %files %defattr(-, root, root) -# %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README ROADMAP TODO %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README %{_libdir}/libcairo.so.* @@ -161,19 +148,28 @@ rm -rf ${RPM_BUILD_ROOT} %{_includedir}/cairo %{_libdir}/libcairo.so %{_libdir}/pkgconfig/*.pc +%if 0%{?suse_version} <= 1110 +%{_libdir}/*.la +%endif %files doc %defattr(-, root, root) -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/* %changelog +* Tue Jan 20 2009 msuman@suse.de +- Continue to provide the "la" files for SUSE releases <= 11.1 * Tue Jan 13 2009 crrodriguez@suse.de - remove static libraries and "la" files +* Sat Dec 20 2008 mboman@suse.de +- Update to version 1.8.6: + + Many API changes, fixes and other updates. See NEWS for full details * Wed Dec 10 2008 olh@suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) +* Mon Dec 08 2008 mboman@suse.de +- Update to version 1.8.4: + + Many API changes, fixes and other updates. See NEWS for full details * Tue Nov 11 2008 ro@suse.de - SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf * Tue Nov 04 2008 maw@suse.de