diff --git a/libical-0.46-fix-endless-loop.patch b/libical-0.46-fix-endless-loop.patch deleted file mode 100644 index 02e8069..0000000 --- a/libical-0.46-fix-endless-loop.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: trunk/libical/src/libical/icalrecur.c -=================================================================== ---- trunk/libical/src/libical/icalrecur.c (revision 1043) -+++ trunk/libical/src/libical/icalrecur.c (revision 1044) -@@ -361,7 +361,7 @@ - char *t, *n; - int i=0; - int sign = 1; -- int weekno = 0; -+ char weekno = 0; /* note: Novell/Groupwise sends BYDAY=255SU, so we fit in a signed char to get -1 SU for last sunday. */ - icalrecurrencetype_weekday wd; - short *array = parser->rt.by_day; - char* end; diff --git a/libical-0.46-fix-fatal-error-macro-usage.patch b/libical-0.46-fix-fatal-error-macro-usage.patch deleted file mode 100644 index 07b3388..0000000 --- a/libical-0.46-fix-fatal-error-macro-usage.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: trunk/libical/src/libical/autogenex/ical.h -=================================================================== ---- trunk/libical/src/libical/autogenex/ical.h (revision 1041) -+++ trunk/libical/src/libical/autogenex/ical.h (revision 1042) -@@ -3272,7 +3272,7 @@ - void icalerror_set_errno(icalerrorenum x); - #endif - --#ifdef ICAL_ERRORS_ARE_FATAL -+#if ICAL_ERRORS_ARE_FATAL == 1 - #undef NDEBUG - #endif - -@@ -3282,7 +3282,7 @@ - #define icalerror_check_component_type(value,type); - - /* Assert with a message */ --#ifdef ICAL_ERRORS_ARE_FATAL -+#if ICAL_ERRORS_ARE_FATAL == 1 - - #ifdef __GNUC__ - #define icalerror_assert(test,message) if(!(test)){fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);icalerror_stop_here(); abort();} -Index: trunk/libical/src/libical/icalparser.c -=================================================================== ---- trunk/libical/src/libical/icalparser.c (revision 1041) -+++ trunk/libical/src/libical/icalparser.c (revision 1042) -@@ -930,10 +930,7 @@ - - /* Change for mozilla */ - /* have the option of being flexible towards unsupported parameters */ -- #ifndef ICAL_ERRORS_ARE_FATAL -- continue; -- #endif -- -+ #if ICAL_ERRORS_ARE_FATAL == 1 - insert_error(tail, str, "Cant parse parameter name", - ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR); - tail = 0; -@@ -947,6 +944,9 @@ - name = 0; - } - return 0; -+ #else -+ continue; -+ #endif - } - - /* if (pvalue) { -Index: trunk/libical/src/libical/icalerror.h -=================================================================== ---- trunk/libical/src/libical/icalerror.h (revision 1041) -+++ trunk/libical/src/libical/icalerror.h (revision 1042) -@@ -121,7 +121,7 @@ - void icalerror_set_errno(icalerrorenum x); - #endif - --#ifdef ICAL_ERRORS_ARE_FATAL -+#if ICAL_ERRORS_ARE_FATAL == 1 - #undef NDEBUG - #endif - -@@ -131,7 +131,7 @@ - #define icalerror_check_component_type(value,type); - - /* Assert with a message */ --#ifdef ICAL_ERRORS_ARE_FATAL -+#if ICAL_ERRORS_ARE_FATAL == 1 - - #ifdef __GNUC__ - #define icalerror_assert(test,message) if(!(test)){fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);icalerror_stop_here(); abort();} diff --git a/libical-0.46-fix-race.patch b/libical-0.46-fix-race.patch deleted file mode 100644 index ed4bc07..0000000 --- a/libical-0.46-fix-race.patch +++ /dev/null @@ -1,93 +0,0 @@ -Index: trunk/libical/src/libical/icaltimezone.c -=================================================================== ---- trunk/libical/src/libical/icaltimezone.c (revision 1038) -+++ trunk/libical/src/libical/icaltimezone.c (revision 1039) -@@ -45,6 +45,11 @@ - - #include - -+#ifdef HAVE_PTHREAD -+#include -+static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER; -+#endif -+ - #ifdef WIN32 - #include - #include -@@ -453,8 +458,7 @@ - - int changes_end_year; - -- if (!zone->component) -- icaltimezone_load_builtin_timezone (zone); -+ icaltimezone_load_builtin_timezone (zone); - - if (icaltimezone_minimum_expansion_year == -1) { - struct icaltimetype today = icaltime_today(); -@@ -1140,8 +1144,7 @@ - if (!zone) - return NULL; - -- if (!zone->tzid) -- icaltimezone_load_builtin_timezone (zone); -+ icaltimezone_load_builtin_timezone (zone); - - return zone->tzid; - } -@@ -1167,8 +1170,7 @@ - if (!zone) - return NULL; - -- if (!zone->component) -- icaltimezone_load_builtin_timezone (zone); -+ icaltimezone_load_builtin_timezone (zone); - - return zone->tznames; - } -@@ -1210,8 +1212,7 @@ - if (!zone) - return NULL; - -- if (!zone->component) -- icaltimezone_load_builtin_timezone (zone); -+ icaltimezone_load_builtin_timezone (zone); - - return zone->component; - } -@@ -1449,8 +1450,7 @@ - for (i=0; icomponent) -- icaltimezone_load_builtin_timezone (zone); -+ icaltimezone_load_builtin_timezone (zone); - - z_offset = get_offset(zone); - -@@ -1745,6 +1745,12 @@ - if (!zone->location || !zone->location[0]) - return; - -+#ifdef HAVE_PTHREAD -+ pthread_mutex_lock(&builtin_mutex); -+ if (zone->component) -+ goto out; -+#endif -+ - #ifdef USE_BUILTIN_TZDATA - { - char *filename; -@@ -1801,8 +1807,11 @@ - icalcomponent_remove_component(comp,subcomp); - icalcomponent_free(comp); - } --#endif -- -+#endif -+#ifdef HAVE_PTHREAD -+ out: -+ pthread_mutex_unlock(&builtin_mutex); -+#endif - } - - diff --git a/libical-0.46.tar.bz2 b/libical-0.46.tar.bz2 deleted file mode 100644 index 22e6c92..0000000 --- a/libical-0.46.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc9c9b6dd822d294d72a730015b13784e2ae6967dba52fbf731f7653c917f959 -size 758365 diff --git a/libical-0.48.tar.bz2 b/libical-0.48.tar.bz2 new file mode 100644 index 0000000..4bd7d7a --- /dev/null +++ b/libical-0.48.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfbc62a723feb735aa1b812a5431e72f4197d91dca702b6d77917b0e8e942c85 +size 819404 diff --git a/libical.changes b/libical.changes index b942271..96501dd 100644 --- a/libical.changes +++ b/libical.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sat Jan 28 18:37:35 UTC 2012 - jengelh@medozas.de + +- Changed: The -devel subpackage should require the lib package, + not the main one + +------------------------------------------------------------------- +Sat Jan 28 17:40:52 UTC 2012 - tabraham@novell.com + +- Update to version 0.48 + + Allow duration specifications containing week along with day and + time. even though this is against the RFC, but apparently we + generate such durations so we need to be able to read them back. + + handle the case of the ATTACH type be explicitly set to URI + + added a lock to avoid threading problems when icaltimezone_parse_zone_tab + is called on multiple threads + + bugfixes + +- removed patches deprecated by this release: + - libical-0.46-fix-race.patch + - libical-0.46-fix-fatal-error-macro-usage.patch + - libical-0.46-fix-endless-loop.patch + ------------------------------------------------------------------- Mon Jan 23 17:50:24 UTC 2012 - cdenicolo@suse.com diff --git a/libical.spec b/libical.spec index 3fbd13c..d893847 100644 --- a/libical.spec +++ b/libical.spec @@ -16,27 +16,21 @@ # + Name: libical BuildRequires: db-devel BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-devel Url: http://sourceforge.net/projects/freeassociation/ -Version: 0.46 +Version: 0.48 Release: 0 Summary: An Implementation of Basic iCAL Protocols License: MPL-1.1 or LGPL-2.1 Group: Development/Libraries/C and C++ Source: libical-%{version}.tar.bz2 Source2: baselibs.conf -# libical-0.46-fix-race.patch gber@opensuse.org -- Fixes a race in populating builtin timezone components (from upstream svn) -Patch0: libical-0.46-fix-race.patch -# libical-0.46-fix-fatal-error-macro-usage.patch sf#3140405 gber@opensuse.org -- Replace broken ICAL_ERRORS_ARE_FATAL preprocessor conditions with the correct check for the macros value -Patch1: libical-0.46-fix-fatal-error-macro-usage.patch -# libical-0.46-fix-endless-loop.patch sf#3177380 gber@opensuse.org -- Fixes endless loop in recurrence calculation -Patch2: libical-0.46-fix-endless-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libical0 = %{version} %description Libical is an open source implementation of the IETF's iCalendar @@ -59,7 +53,7 @@ component properties, parameters, and subcomponents. %package devel Summary: An implementation of basic iCAL protocols Group: Development/Libraries/C and C++ -Requires: libical = %{version} +Requires: libical0 = %{version} %description devel Libical is an Open Source implementation of the IETF's iCalendar @@ -70,7 +64,7 @@ component properties, parameters, and subcomponents. %package doc Summary: An Implementation of Basic iCAL Protocols Group: Development/Libraries/C and C++ -Requires: libical = %{version} +Requires: libical0 = %{version} %description doc Libical is an open source implementation of the IETF's iCalendar @@ -80,9 +74,6 @@ component properties, parameters, and subcomponents. %prep %setup -q -%patch0 -p2 -%patch1 -p2 -%patch2 -p2 %build # triger autoreconf since the 0.46 tarball is missing autotools bootstrap files