Hello community, here is the log from the commit of package cairo for openSUSE:Factory checked in at 2015-01-20 12:27:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cairo (Old) and /work/SRC/openSUSE:Factory/.cairo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cairo" Changes: -------- --- /work/SRC/openSUSE:Factory/cairo/cairo.changes 2015-01-08 23:05:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2015-01-20 12:27:10.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 9 13:50:03 UTC 2015 - tchva...@suse.com + +- Spec-cleanify +- Remove the obsoletes for sle10 64bit subpackages on ppc +- Remove libtool archive always + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cairo.spec ++++++ --- /var/tmp/diff_new_pack.1lzDum/_old 2015-01-20 12:27:12.000000000 +0100 +++ /var/tmp/diff_new_pack.1lzDum/_new 2015-01-20 12:27:12.000000000 +0100 @@ -18,7 +18,6 @@ %define build_xcb_backend 1 %define build_gl_backend 1 - Name: cairo Version: 1.14.0 Release: 0 @@ -38,12 +37,6 @@ Patch3: cairo-xlib-endianness.patch # PATCH-FIX-UPSTREAM cairo-tor-scan-convertor.patch fdo#85151 dims...@opensuse.org -- tor-scan-converter: can't do_fullrow when intersection in row + 0.5subrow Patch4: cairo-tor-scan-convertor.patch -# These libraries are needed only for tests. -# Do not enable tests in build systems, it causes build loop! -#BuildRequires: librsvg-devel poppler-devel -%if %build_gl_backend -BuildRequires: Mesa-devel -%endif BuildRequires: gtk-doc # Needed by patch0 BuildRequires: libtool @@ -54,13 +47,19 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(pixman-1) >= 0.30.0 BuildRequires: pkgconfig(x11) -%if %build_xcb_backend -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xcb-shm) -%endif BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xrender) BuildRoot: %{_tmppath}/%{name}-%{version}-build +# These libraries are needed only for tests. +# Do not enable tests in build systems, it causes build loop! +#BuildRequires: librsvg-devel poppler-devel +%if %{build_gl_backend} +BuildRequires: Mesa-devel +%endif +%if %{build_xcb_backend} +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-shm) +%endif %description Cairo is a vector graphics library with cross-device output support. @@ -75,11 +74,6 @@ Group: System/Libraries Provides: cairo = %{version} Obsoletes: cairo < %{version} -# bug437293 -%ifarch ppc64 -Obsoletes: cairo-64bit -%endif -# %description -n libcairo2 Cairo is a vector graphics library with cross-device output support. @@ -143,11 +137,6 @@ Requires: libcairo2 = %{version} Provides: cairo-doc = %{version} Obsoletes: cairo-doc < %{version} -# bug437293 -%ifarch ppc64 -Obsoletes: cairo-devel-64bit -%endif -# %description devel This package contains all files necessary to build binaries using @@ -171,7 +160,7 @@ --with-pic \ --enable-fc \ --enable-ft \ -%if %build_gl_backend +%if %{build_gl_backend} --enable-gl \ %endif --enable-ps \ @@ -179,7 +168,7 @@ --enable-script \ --enable-svg \ --enable-tee \ -%if %build_xcb_backend +%if %{build_xcb_backend} --enable-xcb \ %endif --enable-xlib \ @@ -188,10 +177,8 @@ make %{?_smp_mflags} V=1 %install -%makeinstall -%if 0%{?suse_version} > 1110 +make DESTDIR=%{buildroot} install %{?_smp_mflags} find %{buildroot} -type f -name "*.la" -delete -print -%endif %post -n libcairo2 -p /sbin/ldconfig @@ -236,8 +223,5 @@ %{_includedir}/cairo/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%if 0%{?suse_version} <= 1110 -%{_libdir}/*.la -%endif %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org