diff --git a/collectd-fix_new_yajl_lib.patch b/collectd-fix_new_yajl_lib.patch deleted file mode 100644 index d6e4f10..0000000 --- a/collectd-fix_new_yajl_lib.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/curl_json.c -+++ src/curl_json.c -@@ -100,11 +100,9 @@ - status = yajl_parse(db->yajl, (unsigned char *)buf, len); - if (status == yajl_status_ok) - { -- status = yajl_parse_complete(db->yajl); -+ status = yajl_complete_parse(db->yajl); - return (len); - } -- else if (status == yajl_status_insufficient_data) -- return (len); - - if (status != yajl_status_ok) - { -@@ -760,7 +758,7 @@ - char *url; - yajl_handle yprev = db->yajl; - -- db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db); -+ db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db); - if (db->yajl == NULL) - { - ERROR ("curl_json plugin: yajl_alloc failed."); diff --git a/collectd-libnotify_070.patch b/collectd-libnotify_070.patch deleted file mode 100644 index 03452b9..0000000 --- a/collectd-libnotify_070.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/notify_desktop.c b/src/notify_desktop.c -index 839bc61..31c2411 100644 ---- a/src/notify_desktop.c -+++ b/src/notify_desktop.c -@@ -95,7 +95,13 @@ static int c_notify (const notification_t *n, - : (NOTIF_WARNING == n->severity) ? "WARNING" - : (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN"); - -+#if (defined NOTIFY_CHECK_VERSION) -+#if NOTIFY_CHECK_VERSION(0, 7, 0) -+ notification = notify_notification_new (summary, n->message, NULL); -+#endif -+#else - notification = notify_notification_new (summary, n->message, NULL, NULL); -+#endif - if (NULL == notification) { - log_err ("Failed to create a new notification."); - return -1; diff --git a/collectd.changes b/collectd.changes index 3fb159a..076eb09 100644 --- a/collectd.changes +++ b/collectd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 23 10:56:57 UTC 2012 - aj@suse.de + +- Drop collectd-fix_new_yajl_lib.patch and collect-libnotify_070.patch + both are handled in the new version. + ------------------------------------------------------------------- Tue Apr 17 15:26:43 UTC 2012 - pascal.bleser@opensuse.org