rpms/evolution-data-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Work around libical's broken pkg-config file.

Browse Source
This commit is contained in:
Matthew Barnes 2009-02-04 18:14:23 +00:00
parent d504182f26
commit a1b8ec0521
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
evolution-data-server-2.25.90-libical-includedir.patch Normal file
View File

@ -0,0 +1,29 @@
diff -up evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in.libical-includedir evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in
--- evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in.libical-includedir 2009-01-27 21:57:57.000000000 -0500
+++ evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in 2009-02-04 12:46:35.000000000 -0500
@@ -9,10 +9,11 @@ idldir=@idldir@
IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
privincludedir=@privincludedir@
+libical_includedir=@libical_includedir@
Name: libecal
Description: Client library for evolution calendars
Version: @VERSION@
Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libical >= @LIBICAL_REQUIRED@ libedataserver-1.2
Libs: -L${libdir} -lecal-1.2
-Cflags: -I${privincludedir}
+Cflags: -I${privincludedir} -I${libical_includedir}
diff -up evolution-data-server-2.25.90/configure.in.libical-includedir evolution-data-server-2.25.90/configure.in
--- evolution-data-server-2.25.90/configure.in.libical-includedir 2009-02-04 12:26:26.000000000 -0500
+++ evolution-data-server-2.25.90/configure.in 2009-02-04 12:46:35.000000000 -0500
@@ -1534,6 +1534,9 @@ dnl --- evolution-calendar flags
if test "x${enable_calendar}" = "xyes"; then
EVOLUTION_CALENDAR_DEPS="libical >= libical_minimum_version libxml-2.0 libbonobo-2.0 gio-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
+ libical_includedir=`$PKG_CONFIG --variable=includedir libical`
+ AC_SUBST(libical_includedir)
+
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)

9
evolution-data-server.spec
View File

@ -31,7 +31,7 @@
Name: evolution-data-server Name: evolution-data-server
Version: 2.25.90 Version: 2.25.90
Release: 2%{?dist} Release: 3%{?dist}
License: LGPLv2 License: LGPLv2
Group: System Environment/Libraries Group: System Environment/Libraries
Summary: Backend data server for Evolution Summary: Backend data server for Evolution
@ -56,6 +56,9 @@ Patch12: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
# RH bug #243296 # RH bug #243296
Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
# Work around broken libical.pc
Patch14: evolution-data-server-2.25.90-libical-includedir.patch
### Build Dependencies ### ### Build Dependencies ###
BuildRequires: GConf2-devel BuildRequires: GConf2-devel
@ -138,6 +141,7 @@ This package contains developer documentation for %{name}.
%patch11 -p1 -b .fix-ldap-query %patch11 -p1 -b .fix-ldap-query
%patch12 -p1 -b .camel-folder-summary-crash %patch12 -p1 -b .camel-folder-summary-crash
%patch13 -p1 -b .fix-64bit-acinclude %patch13 -p1 -b .fix-64bit-acinclude
%patch14 -p1 -b .libical-includedir
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -383,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/libedataserverui %{_datadir}/gtk-doc/html/libedataserverui
%changelog %changelog
* Wed Feb 04 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.90-3.fc11
- Work around libical's broken pkg-config file.
* Mon Feb 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.90-2.fc11 * Mon Feb 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.90-2.fc11
- Forgot the libical requirement in devel subpackage. - Forgot the libical requirement in devel subpackage.