rpms/libical/EL-5 libical-0.43-cflags.patch, NONE, 1.1 libical-0.43-implicit-pointer-conversion.patch, NONE, 1.1 libical-0.43-makefile.patch, NONE, 1.1 libical.spec, 1.9, 1.10 libical-0.32-makefile.patch, 1.1, NONE

Sat May 2 09:54:30 UTC 2009

Author: lkundrak

Update of /cvs/pkgs/rpms/libical/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32560

Modified Files:
	libical.spec 
Added Files:
	libical-0.43-cflags.patch 
	libical-0.43-implicit-pointer-conversion.patch 
	libical-0.43-makefile.patch 
Removed Files:
	libical-0.32-makefile.patch 
Log Message:
Merge from devel (#498688)

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

libical-0.43-implicit-pointer-conversion.patch:

--- NEW FILE libical-0.43-implicit-pointer-conversion.patch ---
diff -urNp libical-0.43.orig/src/test/regression.c libical-0.43/src/test/regression.c
--- libical-0.43.orig/src/test/regression.c	2009-01-13 09:34:39.000000000 +0530
+++ libical-0.43/src/test/regression.c	2009-01-13 09:54:37.000000000 +0530
@@ -34,6 +34,8 @@
 #include <libical/ical.h>
 #include <libical/icalss.h>
 #include <libicalvcal/vobject.h>
+#include <libicalvcal/icalvcal.h>
+#include <libicalvcal/vcc.h>
 
 #include "regression.h"
 

libical-0.43-makefile.patch:

--- NEW FILE libical-0.43-makefile.patch ---
diff -urNp libical-0.43.orig/src/libicalss/Makefile.in libical-0.43/src/libicalss/Makefile.in
--- libical-0.43.orig/src/libicalss/Makefile.in	2009-01-13 09:34:39.000000000 +0530
+++ libical-0.43/src/libicalss/Makefile.in	2009-01-13 09:52:10.000000000 +0530
@@ -308,7 +308,7 @@ INCLUDES = \
 	$(BDB_INCLUDE)
 
 libicalss_la_LDFLAGS = -version-info 43:0:43
-libicalss_la_LIBADD = $(BDB_LIBFILES) 
+libicalss_la_LIBADD = $(BDB_LIBFILES) ../libical/libical.la
 @DEV_FALSE at libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
 @DEV_TRUE at libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
 libicalss_la_SOURCES = \


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/EL-5/libical.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libical.spec	2 Sep 2008 22:18:02 -0000	1.9
+++ libical.spec	2 May 2009 09:54:00 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		libical
-Version:	0.32
-Release:	1%{?dist}
+Version:	0.43
+Release:	4%{?dist}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
 
@@ -9,10 +9,16 @@ License:	LGPLv2 or MPLv1.1
 URL:		http://freeassociation.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-makefile.patch
+# http://bugs.debian.org/511598
+Patch0:		%{name}-%{version}-implicit-pointer-conversion.patch
+Patch1:		%{name}-%{version}-makefile.patch
+# https://bugzilla.redhat.com/484091
+Patch2:		%{name}-%{version}-cflags.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Requires: 	tzdata
+
 BuildRequires:	bison
 BuildRequires:	byacc
 BuildRequires:	flex
@@ -30,6 +36,7 @@ Summary:	Development files for libical
 Summary(pl):	Pliki deweloperskie dla libical
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig
 
 %description devel
 The libical-devel package contains libraries and header files for developing 
@@ -42,12 +49,11 @@ korzystajÄ…cych z libical.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-%configure --disable-static -enable-cxx --enable-reentrant
-
-# Omit unused direct shared library dependencies.
-sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
+%configure --disable-static --enable-reentrant --with-backtrace
 
 make %{?_smp_mflags}
 
@@ -70,7 +76,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS
 %doc ChangeLog
 %doc COPYING
 %doc LICENSE
@@ -79,9 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc THANKS
 %doc TODO
 %{_libdir}/%{name}.so.*
-%{_libdir}/%{name}_cxx.so.*
 %{_libdir}/libicalss.so.*
-%{_libdir}/libicalss_cxx.so.*
 %{_libdir}/libicalvcal.so.*
 
 %files devel
@@ -89,27 +92,54 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/UsingLibical.txt
 %{_includedir}/ical.h
 %{_libdir}/%{name}.so
-%{_libdir}/%{name}_cxx.so
 %{_libdir}/libicalss.so
-%{_libdir}/libicalss_cxx.so
 %{_libdir}/libicalvcal.so
+%{_libdir}/pkgconfig/libical.pc
 
 %dir %{_includedir}/%{name}
-%{_includedir}/%{name}/ical.h
 %{_includedir}/%{name}/ical*.h
-%{_includedir}/%{name}/icptrholder.h
 %{_includedir}/%{name}/pvl.h
 %{_includedir}/%{name}/sspm.h
-%{_includedir}/%{name}/vcomponent.h
 
-%dir %{_includedir}/libicalvcal
-%{_includedir}/libicalvcal/icalvcal.h
-%{_includedir}/libicalvcal/port.h
-%{_includedir}/libicalvcal/vcaltmp.h
-%{_includedir}/libicalvcal/vcc.h
-%{_includedir}/libicalvcal/vobject.h
+%{_includedir}/%{name}/port.h
+%{_includedir}/%{name}/vcaltmp.h
+%{_includedir}/%{name}/vcc.h
+%{_includedir}/%{name}/vobject.h
 
 %changelog
+* 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. (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. (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'.
+- Enabled backtrace dumps in the syslog.
+
+* 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.
+  (Red Hat Bugzilla #478331)
+
+* Sun Nov 23 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.41-1
+- 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. (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.
+
 * Tue Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.32-1
 - Version bump to 0.32.
 - Parallel build problems fixed.


--- libical-0.32-makefile.patch DELETED ---


