apply patches and fixed requirements

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
index c45c007..70dd363 100644 (file)
--- a/packaging/baselibs.conf
+++ b/packaging/baselibs.conf
@@ -1,10 +1,10 @@
-libcairo2
+libcairo
   provides "cairo-<targettype> = <version>"
   obsoletes "cairo-<targettype> < <version>"
-libcairo-gobject2
-libcairo-script-interpreter2
+libcairo-gobject
+libcairo-script-interpreter
 cairo-devel
   requires -cairo-<targettype>
-  requires "libcairo2-<targettype> = <version>"
-  requires "libcairo-gobject2-<targettype> = <version>"
-  requires "libcairo-script-interpreter2-<targettype> = <version>"
+  requires "libcairo-<targettype> = <version>"
+  requires "libcairo-gobject-<targettype> = <version>"
+  requires "libcairo-script-interpreter-<targettype> = <version>"

diff --git a/packaging/cairo-modules-no-version.patch b/packaging/cairo-modules-no-version.patch
deleted file mode 100644 (file)
index 80e9b8b..0000000
--- a/packaging/cairo-modules-no-version.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: cairo-1.10.0/util/cairo-fdr/Makefile.am
-===================================================================
---- cairo-1.10.0.orig/util/cairo-fdr/Makefile.am
-+++ cairo-1.10.0/util/cairo-fdr/Makefile.am
-@@ -9,5 +9,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- cairo_fdr_la_SOURCES = fdr.c
- cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
- cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
--cairo_fdr_la_LDFLAGS = -module -no-undefined
-+cairo_fdr_la_LDFLAGS = -module -no-undefined -avoid-version
- cairo_fdr_la_LIBADD = -ldl
-Index: cairo-1.10.0/util/cairo-trace/Makefile.am
-===================================================================
---- cairo-1.10.0.orig/util/cairo-trace/Makefile.am
-+++ cairo-1.10.0/util/cairo-trace/Makefile.am
-@@ -11,7 +11,7 @@ libcairo_trace_la_SOURCES = trace.c
- libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \
-                         $(AM_CPPFLAGS)
- libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
--libcairo_trace_la_LDFLAGS = -no-undefined
-+libcairo_trace_la_LDFLAGS = -no-undefined -module -avoid-version
- 
- libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz
- if CAIRO_HAS_DL
-Index: cairo-1.10.0/util/cairo-sphinx/Makefile.am
-===================================================================
---- cairo-1.10.0.orig/util/cairo-sphinx/Makefile.am
-+++ cairo-1.10.0/util/cairo-sphinx/Makefile.am
-@@ -11,7 +11,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- cairo_sphinx_la_SOURCES = fdr.c
- cairo_sphinx_la_CPPFLAGS = $(AM_CPPFLAGS)
- cairo_sphinx_la_CFLAGS = $(CAIRO_CFLAGS)
--cairo_sphinx_la_LDFLAGS = -module -no-undefined
-+cairo_sphinx_la_LDFLAGS = -module -no-undefined -avoid-version
- cairo_sphinx_la_LIBADD = -ldl
- 
- cairo_sphinx_SOURCES = sphinx.c

diff --git a/packaging/cairo.spec b/packaging/cairo.spec
index 0712475..dc0bdfe 100644 (file)
--- a/packaging/cairo.spec
+++ b/packaging/cairo.spec
@@ -1,5 +1,6 @@
 %define build_xcb_backend 0
 %define build_gl_backend 1
+%define enable_wayland 1
 
 Name:           cairo
 Version:        1.12.4
@@ -10,10 +11,7 @@ Url:            http://cairographics.org/
 Group:          System/Libraries
 Source:         http://cairographics.org/releases/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 dimstar@opensuse.org -- Build modules with -module -avoid-version.
-Patch0:         cairo-modules-no-version.patch
 BuildRequires:  gtk-doc
-# Needed by patch0
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  xz
@@ -29,7 +27,9 @@ BuildRequires:  pkgconfig(xcb-shm)
 %endif
 %if %build_gl_backend
 BuildRequires:  mesa-devel
-#BuildRequires:        pkgconfig(wayland-egl)
+%if enable_wayland
+BuildRequires: pkgconfig(wayland-egl)
+%endif
 %endif
 BuildRequires:  pkgconfig(xrender)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -112,7 +112,6 @@ cairo.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # Needed by patch0