From 0fb4032173868e132605b6b6b9023a5bc81711ea Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Feb 2013 13:26:32 +0100 Subject: [PATCH] Add an upstream .pc files fix for a libebook split --- ...tion-data-server-3.7.90-pc-files-fix.patch | 34 +++++++++++++++++++ evolution-data-server.spec | 8 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 evolution-data-server-3.7.90-pc-files-fix.patch diff --git a/evolution-data-server-3.7.90-pc-files-fix.patch b/evolution-data-server-3.7.90-pc-files-fix.patch new file mode 100644 index 0000000..4aa3a17 --- /dev/null +++ b/evolution-data-server-3.7.90-pc-files-fix.patch @@ -0,0 +1,34 @@ +commit 794f538befedadaded6f19004738cf3babd5e9c5 +Author: Tristan Van Berkom +Date: Mon Feb 18 21:05:22 2013 +0900 + + Fixing pkg-config files for libebook & libedata-book + + This part was missed while the libebook / libebook-contacts library + splitup was done manually. + +diff --git a/addressbook/libebook/libebook.pc.in b/addressbook/libebook/libebook.pc.in +index 993870b..293cdc0 100644 +--- a/addressbook/libebook/libebook.pc.in ++++ b/addressbook/libebook/libebook.pc.in +@@ -10,7 +10,7 @@ privincludedir=@privincludedir@ + Name: libebook + Description: Client library for evolution address books + Version: @VERSION@ +-Requires: libedataserver-1.2 ++Requires: libedataserver-1.2 libebook-contacts-1.2 libedata-book-1.2 + Requires.private: camel-1.2 + Libs: -L${libdir} -lebook-1.2 + Cflags: -I${privincludedir} +diff --git a/addressbook/libedata-book/libedata-book.pc.in b/addressbook/libedata-book/libedata-book.pc.in +index 0a1aa9a..b1f871b 100644 +--- a/addressbook/libedata-book/libedata-book.pc.in ++++ b/addressbook/libedata-book/libedata-book.pc.in +@@ -14,6 +14,6 @@ backenddir=@ebook_backenddir@ + Name: libedatabook + Description: Backend library for evolution address books + Version: @VERSION@ +-Requires: libebackend-1.2 libebook-1.2 ++Requires: libebackend-1.2 libebook-contacts-1.2 + Libs: -L${libdir} -ledata-book-1.2 + Cflags: -I${privincludedir} diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 9e4b953..f3c63a6 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -27,7 +27,7 @@ Name: evolution-data-server Version: 3.7.90 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ @@ -43,6 +43,8 @@ Obsoletes: evolution-webcal < 2.24.0 # RH bug #243296 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch +Patch02: evolution-data-server-3.7.90-pc-files-fix.patch + ### Build Dependencies ### BuildRequires: libdb-devel @@ -118,6 +120,7 @@ This package contains developer documentation for %{name}. %setup -q %patch01 -p1 -b .fix-64bit-acinclude +%patch02 -p1 -b .pc-files-fix mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -365,6 +368,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/gtk-doc/html/libedataserver %changelog +* Mon Feb 18 2013 Milan Crha - 3.7.90-2 +- Add an upstream .pc files fix for a libebook split + * Mon Feb 18 2013 Milan Crha - 3.7.90-1 - Update to 3.7.90