diff --git a/cairo-multilib.patch b/cairo-multilib.patch deleted file mode 100644 index 16fd96bbeff8543e7e313fa0620e366af34104e5..0000000000000000000000000000000000000000 --- a/cairo-multilib.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up cairo-1.12.14/util/cairo-trace/cairo-trace.in.multilib cairo-1.12.14/util/cairo-trace/cairo-trace.in ---- cairo-1.12.14/util/cairo-trace/cairo-trace.in.multilib 2013-07-18 16:03:38.044832193 -0400 -+++ cairo-1.12.14/util/cairo-trace/cairo-trace.in 2013-07-18 16:03:43.981882777 -0400 -@@ -2,6 +2,12 @@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ -+case `uname -m` in -+ x86_64|s390x|ppc64) libdir=@prefix@/lib64 -+ ;; -+ *) libdir=@prefix@/lib -+ ;; -+esac - - nofile= - flush= -@@ -90,7 +96,7 @@ export CAIRO_TRACE_PROG_NAME - - if test "x$CAIRO_TRACE_SO" = "x"; then - CAIRO_TRACE_SO="" -- for lib in @libdir@/cairo/libcairo-trace.@SHLIB_EXT@ @libdir@/cairo/libcairo-trace.@SHLIB_EXT@* @libdir@/cairo/libcairo-trace.*.@SHLIB_EXT@ ; do -+ for lib in $libdir/cairo/libcairo-trace.@SHLIB_EXT@ $libdir/cairo/libcairo-trace.@SHLIB_EXT@* $libdir/cairo/libcairo-trace.*.@SHLIB_EXT@ ; do - if test -h "$lib" -o -f "$lib"; then - CAIRO_TRACE_SO="$lib" - break -@@ -98,7 +104,7 @@ if test "x$CAIRO_TRACE_SO" = "x"; then - done - fi - if test "x$CAIRO_TRACE_SO" = "x"; then -- echo "Could not find the cairo-trace shared library in @libdir@/cairo/." >&2 -+ echo "Could not find the cairo-trace shared library in $libdir/cairo/." >&2 - echo "Set the CAIRO_TRACE_SO environment variable to the full path of the library." >&2 - exit 15 - fi diff --git a/cairo.spec b/cairo.spec index d7fb290cf50d4de1e86a5f9ef708c20f3a460d5e..717a61a52af7dda3f079f93090a625e4f65de49f 100644 --- a/cairo.spec +++ b/cairo.spec @@ -2,13 +2,11 @@ Name: cairo Version: 1.15.14 -Release: 2 +Release: 3 Summary: A 2D graphics library License: LGPLv2 or MPLv1.1 URL: http://cairographics.org Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.xz -# This patch comes from fedoraproject -Patch0001: cairo-multilib.patch BuildRequires: pkgconfig glib2-devel librsvg2-devel BuildRequires: libXrender-devel libX11-devel libpng-devel libxml2-devel @@ -78,5 +76,8 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_bindir}/cairo-trace %changelog +* Fri Jan 10 2020 zhangrui - 1.15.14-3 +- Remove unnecessary patch + * Thu Sep 19 2019 Alex Chao - 1.15.14-2 - Package init