rpms/libical/devel libical-0.43-cflags.patch, NONE, 1.1 libical.spec, 1.19, 1.20

Sun Mar 15 18:43:57 UTC 2009

Author: rishi

Update of /cvs/pkgs/rpms/libical/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20302

Modified Files:
	libical.spec 
Added Files:
	libical-0.43-cflags.patch 
Log Message:
* Sun Mar 15 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.43-4
- Updated patch to fix #includes in the headers to work with
  'pkg-config --cflags libical'. (Red Hat Bugzilla #484091)


libical-0.43-cflags.patch:

--- NEW FILE libical-0.43-cflags.patch ---
diff -urNp libical-0.43.orig/libical.pc.in libical-0.43/libical.pc.in
--- libical-0.43.orig/libical.pc.in	2009-03-15 21:58:49.000000000 +0530
+++ libical-0.43/libical.pc.in	2009-03-15 22:11:13.000000000 +0530
@@ -7,5 +7,5 @@ Name: libical
 Description: An implementation of basic iCAL protocols
 Version: @VERSION@
 Libs: -L${libdir} -lical -licalss -licalvcal
-Cflags: -I${includedir}/libical
+Cflags: -I${includedir}
 
diff -urNp libical-0.43.orig/src/libical/icaltz-util.c libical-0.43/src/libical/icaltz-util.c
--- libical-0.43.orig/src/libical/icaltz-util.c	2009-03-15 21:58:49.000000000 +0530
+++ libical-0.43/src/libical/icaltz-util.c	2009-03-15 22:08:03.000000000 +0530
@@ -81,8 +81,8 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <libical/icalerror.h>
-#include <icaltz-util.h>
+#include "icalerror.h"
+#include "icaltz-util.h"
 
 typedef struct 
 {
diff -urNp libical-0.43.orig/src/libicalcap/icalcap.h libical-0.43/src/libicalcap/icalcap.h
--- libical-0.43.orig/src/libicalcap/icalcap.h	2009-03-15 21:58:49.000000000 +0530
+++ libical-0.43/src/libicalcap/icalcap.h	2009-03-15 22:08:48.000000000 +0530
@@ -1,7 +1,7 @@
 #ifndef __ICALCAP_H__
 #define __ICALCAP_H__
 
-#include <ical.h>
+#include <libical/ical.h>
 
 /*
  * Opaque objects
diff -urNp libical-0.43.orig/src/libicalcap/icalcap_message_impl.h libical-0.43/src/libicalcap/icalcap_message_impl.h
--- libical-0.43.orig/src/libicalcap/icalcap_message_impl.h	2009-03-15 21:58:49.000000000 +0530
+++ libical-0.43/src/libicalcap/icalcap_message_impl.h	2009-03-15 22:09:16.000000000 +0530
@@ -3,7 +3,7 @@
 
 #ifdef WITH_RR
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <librr/rr.h>
 
 #define	ICALCAP_MESSAGE_CMD	1
diff -urNp libical-0.43.orig/src/libicalss/icalcalendar.h libical-0.43/src/libicalss/icalcalendar.h
--- libical-0.43.orig/src/libicalss/icalcalendar.h	2009-03-15 21:58:49.000000000 +0530
+++ libical-0.43/src/libicalss/icalcalendar.h	2009-03-15 22:02:47.000000000 +0530
@@ -30,7 +30,7 @@
 #define ICALCALENDAR_H
 
 #include <libical/ical.h>
-#include <icalset.h>
+#include "icalset.h"
 
 /* icalcalendar
  * Routines for storing calendar data in a file system. The calendar 
diff -urNp libical-0.43.orig/src/libicalss/icalclassify.h libical-0.43/src/libicalss/icalclassify.h
--- libical-0.43.orig/src/libicalss/icalclassify.h	2009-03-15 21:58:49.000000000 +0530
+++ libical-0.43/src/libicalss/icalclassify.h	2009-03-15 22:03:39.000000000 +0530
@@ -28,8 +28,8 @@
 #define ICALCLASSIFY_H
 
 #include <libical/ical.h>
-#include <icalset.h>
-#include <icalcomponent.h>
+#include "icalset.h"
+#include "icalcomponent.h"
 
 icalproperty_xlicclass icalclassify(icalcomponent* c,icalcomponent* match, 
 			      const char* user);
diff -urNp libical-0.43.orig/src/libicalss/icalcluster.h libical-0.43/src/libicalss/icalcluster.h
--- libical-0.43.orig/src/libicalss/icalcluster.h	2009-03-15 21:58:48.000000000 +0530
+++ libical-0.43/src/libicalss/icalcluster.h	2009-03-15 22:01:36.000000000 +0530
@@ -30,7 +30,7 @@
 #define ICALCLUSTER_H
 
 #include <libical/ical.h>
-#include <icalset.h>
+#include "icalset.h"
 
 typedef struct icalcluster_impl icalcluster;
 
diff -urNp libical-0.43.orig/src/libicalss/icaldirset.h libical-0.43/src/libicalss/icaldirset.h
--- libical-0.43.orig/src/libicalss/icaldirset.h	2009-03-15 21:58:49.000000000 +0530
+++ libical-0.43/src/libicalss/icaldirset.h	2009-03-15 22:04:53.000000000 +0530
@@ -30,9 +30,9 @@
 #define ICALDIRSET_H
 
 #include <libical/ical.h>
-#include <icalset.h>
-#include <icalcluster.h>
-#include <icalgauge.h>
+#include "icalset.h"
+#include "icalcluster.h"
+#include "icalgauge.h"
 
 /* icaldirset Routines for storing, fetching, and searching for ical
  * objects in a database */
diff -urNp libical-0.43.orig/src/libicalss/icalfileset.h libical-0.43/src/libicalss/icalfileset.h
--- libical-0.43.orig/src/libicalss/icalfileset.h	2009-03-15 21:58:49.000000000 +0530
+++ libical-0.43/src/libicalss/icalfileset.h	2009-03-15 22:03:13.000000000 +0530
@@ -30,9 +30,9 @@
 #define ICALFILESET_H
 
 #include <libical/ical.h>
-#include <icalset.h>
-#include <icalcluster.h>
-#include <icalgauge.h>
+#include "icalset.h"
+#include "icalcluster.h"
+#include "icalgauge.h"
 #include <sys/types.h> /* For open() flags and mode */
 #include <sys/stat.h> /* For open() flags and mode */
 #include <fcntl.h> /* For open() flags and mode */
diff -urNp libical-0.43.orig/src/libicalss/icalgauge.h libical-0.43/src/libicalss/icalgauge.h
--- libical-0.43.orig/src/libicalss/icalgauge.h	2009-03-15 21:58:49.000000000 +0530
+++ libical-0.43/src/libicalss/icalgauge.h	2009-03-15 22:04:12.000000000 +0530
@@ -29,7 +29,7 @@
 #ifndef ICALGAUGE_H
 #define ICALGAUGE_H
 
-#include <icalcomponent.h>
+#include "icalcomponent.h"
 
 /** @file icalgauge.h
  *  @brief Routines implementing a filter for ical components
diff -urNp libical-0.43.orig/src/libicalss/icalset.h libical-0.43/src/libicalss/icalset.h
--- libical-0.43.orig/src/libicalss/icalset.h	2009-03-15 21:58:49.000000000 +0530
+++ libical-0.43/src/libicalss/icalset.h	2009-03-15 22:04:29.000000000 +0530
@@ -41,7 +41,7 @@
 
 #include <limits.h> /* For PATH_MAX */
 #include <libical/ical.h>
-#include <icalgauge.h>
+#include "icalgauge.h"
 
 #ifdef PATH_MAX
 #define ICAL_PATH_MAX PATH_MAX
diff -urNp libical-0.43.orig/src/libicalss/icalspanlist.h libical-0.43/src/libicalss/icalspanlist.h
--- libical-0.43.orig/src/libicalss/icalspanlist.h	2009-03-15 21:58:48.000000000 +0530
+++ libical-0.43/src/libicalss/icalspanlist.h	2009-03-15 22:02:29.000000000 +0530
@@ -26,7 +26,7 @@
 #define ICALSPANLIST_H
 
 #include <libical/ical.h>
-#include <icalset.h>
+#include "icalset.h"
 
 /** @file icalspanlist.h
  *  @brief Code that supports collections of free/busy spans of time


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/devel/libical.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libical.spec	25 Feb 2009 15:45:40 -0000	1.19
+++ libical.spec	15 Mar 2009 18:43:26 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		libical
 Version:	0.43
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
 
@@ -13,7 +13,7 @@
 Patch0:		%{name}-%{version}-implicit-pointer-conversion.patch
 Patch1:		%{name}-%{version}-makefile.patch
 # https://bugzilla.redhat.com/484091
-Patch2:		%{name}-%{version}-pkgconfig.patch
+Patch2:		%{name}-%{version}-cflags.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -107,16 +107,20 @@
 %{_includedir}/%{name}/vobject.h
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.43-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sun Mar 15 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.43-4
+- Updated patch to fix #includes in the headers to work with
+  'pkg-config --cflags libical'. (Red Hat Bugzilla #484091)
+
+* Wed Feb 25 2009 Release Engineering <rel-eng at .fedoraproject.org> - 0.43-3
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Feb 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.43-2
-- Added patch to fix CFLAGS in libical.pc. Closes Red Hat Bugzilla bug #484091.
+- Added patch to fix CFLAGS in libical.pc. (Red Hat Bugzilla #484091)
 
 * Tue Jan 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.43-1
 - Version bump to 0.43.
-- Added patch to fix implicit pointer conversion from Debian. Fixes Debian BTS
-  bug #511598.
+- Added patch to fix implicit pointer conversion from Debian. (Debian BTS
+  #511598)
 - Upstream has switched off ICAL_ERRORS_ARE_FATAL by default. This behaviour
   is being retained across all distributions, including Fedora 11.
 - Added 'Requires: tzdata'.
@@ -124,14 +128,14 @@
 
 * Thu Jan 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.41-2
 - Switched off ICAL_ERRORS_ARE_FATAL for all distributions, except Fedora 11.
-  Closes Red Hat Bugzilla bug #478331.
+  (Red Hat Bugzilla #478331)
 
 * Sun Nov 23 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.41-1
-- Version bump to 0.41. Closes Red Hat Bugzilla bug #469252.
+- Version bump to 0.41. (Red Hat Bugzilla #469252)
 - Disabled C++ bindings.
 
 * Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.40-1
-- Version bump to 0.40. Closes Red Hat Bugzilla bug #466359.
+- Version bump to 0.40. (Red Hat Bugzilla #466359)
 - Add patch from upstream to fix crash in icalvalue.c.
 - Update makefile patch, remove the test part (already applied).
 - Package libical.pc, add Requires: pkgconfig to -devel.


