From 7aec05f1c740258bd02a885796cae3f81b477ced Mon Sep 17 00:00:00 2001 From: Renich Bon Ciric Date: May 05 2012 11:03:07 +0000 Subject: Update to 0.3.18 --- diff --git a/.gitignore b/.gitignore index e1f855b..88c2ad1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libzeitgeist-0.3.10.tar.gz /libzeitgeist-0.3.12.tar.gz /libzeitgeist-0.3.14.tar.gz +/libzeitgeist-0.3.18.tar.gz diff --git a/libzeitgeist-disable-log-test.patch b/libzeitgeist-disable-log-test.patch new file mode 100644 index 0000000..7d81e03 --- /dev/null +++ b/libzeitgeist-disable-log-test.patch @@ -0,0 +1,86 @@ +diff -u libzeitgeist-0.3.18/tests.ORIG/Makefile.am libzeitgeist-0.3.18/tests/Makefile.am +--- libzeitgeist-0.3.18/tests.ORIG/Makefile.am 2012-05-05 05:50:06.815816354 -0500 ++++ libzeitgeist-0.3.18/tests/Makefile.am 2012-05-05 05:50:41.530773132 -0500 +@@ -39,10 +39,6 @@ + test_monitor_SOURCES = test-monitor.c $(helper_sources) + test_monitor_LDADD = $(zeitgeist_libs) + +-TEST_PROGS += test-log +-test_log_SOURCES = test-log.c $(helper_sources) +-test_log_LDADD = $(zeitgeist_libs) +- + TEST_PROGS += test-event + test_event_SOURCES = test-event.c $(helper_sources) + test_event_LDADD = $(zeitgeist_libs) $(GIO_UNIX_LIBS) +diff -u libzeitgeist-0.3.18/tests.ORIG/Makefile.in libzeitgeist-0.3.18/tests/Makefile.in +--- libzeitgeist-0.3.18/tests.ORIG/Makefile.in 2012-04-05 05:05:58.000000000 -0500 ++++ libzeitgeist-0.3.18/tests/Makefile.in 2012-05-05 05:52:11.276661357 -0500 +@@ -52,7 +52,7 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + am__EXEEXT_1 = test-timerange$(EXEEXT) test-timestamp$(EXEEXT) \ +- test-symbols$(EXEEXT) test-monitor$(EXEEXT) test-log$(EXEEXT) \ ++ test-symbols$(EXEEXT) test-monitor$(EXEEXT) \ + test-event$(EXEEXT) test-datasource$(EXEEXT) \ + test-mimetypes$(EXEEXT) + PROGRAMS = $(noinst_PROGRAMS) +@@ -70,9 +70,6 @@ + am_test_event_OBJECTS = test-event.$(OBJEXT) $(am__objects_1) + test_event_OBJECTS = $(am_test_event_OBJECTS) + test_event_DEPENDENCIES = $(am__DEPENDENCIES_2) +-am_test_log_OBJECTS = test-log.$(OBJEXT) $(am__objects_1) +-test_log_OBJECTS = $(am_test_log_OBJECTS) +-test_log_DEPENDENCIES = $(am__DEPENDENCIES_2) + am_test_mimetypes_OBJECTS = test-mimetypes.$(OBJEXT) $(am__objects_1) + test_mimetypes_OBJECTS = $(am_test_mimetypes_OBJECTS) + test_mimetypes_DEPENDENCIES = $(am__DEPENDENCIES_2) +@@ -115,11 +112,11 @@ + am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) + am__v_GEN_0 = @echo " GEN " $@; + SOURCES = $(test_datasource_SOURCES) $(test_event_SOURCES) \ +- $(test_log_SOURCES) $(test_mimetypes_SOURCES) \ ++ $(test_mimetypes_SOURCES) \ + $(test_monitor_SOURCES) $(test_symbols_SOURCES) \ + $(test_timerange_SOURCES) $(test_timestamp_SOURCES) + DIST_SOURCES = $(test_datasource_SOURCES) $(test_event_SOURCES) \ +- $(test_log_SOURCES) $(test_mimetypes_SOURCES) \ ++ $(test_mimetypes_SOURCES) \ + $(test_monitor_SOURCES) $(test_symbols_SOURCES) \ + $(test_timerange_SOURCES) $(test_timestamp_SOURCES) + ETAGS = etags +@@ -270,7 +267,7 @@ + # initialize variables for unconditional += appending + EXTRA_DIST = test.desktop + TEST_PROGS = test-timerange test-timestamp test-symbols test-monitor \ +- test-log test-event test-datasource test-mimetypes ++ test-event test-datasource test-mimetypes + INCLUDES = \ + -I$(top_srcdir)/src -I$(top_builddir)/src \ + $(GIO_UNIX_CFLAGS) \ +@@ -296,8 +293,6 @@ + test_symbols_LDADD = $(zeitgeist_libs) + test_monitor_SOURCES = test-monitor.c $(helper_sources) + test_monitor_LDADD = $(zeitgeist_libs) +-test_log_SOURCES = test-log.c $(helper_sources) +-test_log_LDADD = $(zeitgeist_libs) + test_event_SOURCES = test-event.c $(helper_sources) + test_event_LDADD = $(zeitgeist_libs) $(GIO_UNIX_LIBS) + test_datasource_SOURCES = test-datasource.c $(helper_sources) +@@ -354,9 +349,6 @@ + test-event$(EXEEXT): $(test_event_OBJECTS) $(test_event_DEPENDENCIES) $(EXTRA_test_event_DEPENDENCIES) + @rm -f test-event$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_event_OBJECTS) $(test_event_LDADD) $(LIBS) +-test-log$(EXEEXT): $(test_log_OBJECTS) $(test_log_DEPENDENCIES) $(EXTRA_test_log_DEPENDENCIES) +- @rm -f test-log$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(test_log_OBJECTS) $(test_log_LDADD) $(LIBS) + test-mimetypes$(EXEEXT): $(test_mimetypes_OBJECTS) $(test_mimetypes_DEPENDENCIES) $(EXTRA_test_mimetypes_DEPENDENCIES) + @rm -f test-mimetypes$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_mimetypes_OBJECTS) $(test_mimetypes_LDADD) $(LIBS) +@@ -381,7 +373,6 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-datasource.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-event.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-log.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mimetypes.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-monitor.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-symbols.Po@am__quote@ diff --git a/libzeitgeist-log_fix.patch b/libzeitgeist-log_fix.patch deleted file mode 100644 index b441a33..0000000 --- a/libzeitgeist-log_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libzeitgeist-0.3.6/src/zeitgeist-log.c.debug 2011-03-07 23:25:43.000000000 +0900 -+++ libzeitgeist-0.3.6/src/zeitgeist-log.c 2011-03-23 01:32:50.000000000 +0900 -@@ -1048,7 +1048,7 @@ - self = ZEITGEIST_LOG (user_data); - priv = ZEITGEIST_LOG_GET_PRIVATE (self); - -- g_object_unref (priv->log); -+ if (priv->log) g_object_unref (priv->log); - priv->log = NULL; - - g_object_notify (G_OBJECT (self), "connected"); diff --git a/libzeitgeist.spec b/libzeitgeist.spec index dd43d57..4dddbbd 100644 --- a/libzeitgeist.spec +++ b/libzeitgeist.spec @@ -1,5 +1,5 @@ Name: libzeitgeist -Version: 0.3.14 +Version: 0.3.18 Release: 1%{?dist} Summary: Client library for applications that want to interact with the Zeitgeist daemon @@ -7,12 +7,12 @@ Group: System Environment/Libraries License: LGPLv3 and GPLv3 URL: https://launchpad.net/libzeitgeist Source0: http://launchpad.net/%{name}/0.3/%{version}/+download/%{name}-%{version}.tar.gz - +Patch0: %{name}-disable-log-test.patch BuildRequires: glib2-devel%{?_isa} >= 2.26 BuildRequires: gtk-doc -# zeitgeist is just a runtime and the reason to install libzeitgeist -Requires: zeitgeist + +Requires: zeitgeist %description This project provides a client library for applications that want to interact @@ -31,6 +31,7 @@ developing applications that use %{name}. %prep %setup -q +%patch0 -p1 %build @@ -85,6 +86,12 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name} %changelog +* Sat May 5 2012 Renich Bon Ciric - 0.3.18-1 +- Updated to version 0.3.18. +- Disabled a log test since it's failing because no libzeitgeist daemon is present at build time. +- Added missing Result Type constant (*CurrentUri and *EventOrigin). +- Now async functions fail instead of lingering indefinitely if Zeitgeist isn't available. + * Mon Mar 19 2012 Renich Bon Ciric - 0.3.14-1 - Updated to version 0.3.14 - Update to shared-desktop-ontologies-0.8 diff --git a/sources b/sources index 5851f6f..2a7ea4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5988b464e1fe13595cb7874053db649b libzeitgeist-0.3.14.tar.gz +d63a37295d01a58086d0d4ae26e604c2 libzeitgeist-0.3.18.tar.gz