Hello community, here is the log from the commit of package menu-cache for openSUSE:Factory checked in at Mon Mar 1 01:44:43 CET 2010. -------- --- menu-cache/menu-cache.changes 2010-02-17 16:53:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/menu-cache/menu-cache.changes 2010-02-27 10:18:52.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Feb 27 09:19:32 UTC 2010 - andrea@opensuse.org + +- new upstream version 0.3.2 + * several bug fix + * API changes + * soname changed + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- menu-cache-0.3.1.tar.bz2 New: ---- menu-cache-0.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ menu-cache.spec ++++++ --- /var/tmp/diff_new_pack.XQ9130/_old 2010-03-01 01:44:39.000000000 +0100 +++ /var/tmp/diff_new_pack.XQ9130/_new 2010-03-01 01:44:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package menu-cache (Version 0.3.1) +# spec file for package menu-cache (Version 0.3.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: menu-cache -Version: 0.3.1 +Version: 0.3.2 Release: 1 License: GPL Source0: %{name}-%{version}.tar.bz2 @@ -38,18 +38,18 @@ Group: Development/Libraries/C and C++ Requires: glib2-devel Requires: %name = %version -Requires: libmenu-cache0 = %version +Requires: libmenu-cache1 = %version Summary: Menu-cache Headers %description devel %name development files -%package -n libmenu-cache0 +%package -n libmenu-cache1 License: GPL Group: Development/Libraries/C and C++ Summary: Menu-cache libraries -%description -n libmenu-cache0 +%description -n libmenu-cache1 %name libraries for development %prep @@ -66,9 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/menu-cache-gen -%post -n libmenu-cache0 -p /sbin/ldconfig +%post -n libmenu-cache1 -p /sbin/ldconfig -%postun -n libmenu-cache0 -p /sbin/ldconfig +%postun -n libmenu-cache1 -p /sbin/ldconfig %clean rm -rf "$RPM_BUILD_ROOT" @@ -88,9 +88,9 @@ %{_libdir}/libmenu-cache.so %{_libdir}/pkgconfig/libmenu-cache.pc -%files -n libmenu-cache0 +%files -n libmenu-cache1 %defattr(-,root,root) -%{_libdir}/libmenu-cache.so.0 -%{_libdir}/libmenu-cache.so.0.0.0 +%{_libdir}/libmenu-cache.so.1 +%{_libdir}/libmenu-cache.so.1.0.0 %changelog ++++++ menu-cache-0.3.1.tar.bz2 -> menu-cache-0.3.2.tar.bz2 ++++++ ++++ 1614 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/menu-cache-0.3.1/compile new/menu-cache-0.3.2/compile --- old/menu-cache-0.3.1/compile 2010-02-16 14:20:30.000000000 +0100 +++ new/menu-cache-0.3.2/compile 2010-02-11 04:56:21.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2009-04-28.21; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software # Foundation, Inc. @@ -124,9 +124,9 @@ ret=$? if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" + mv "$cofile" "$ofile" elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" + mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/menu-cache-0.3.1/configure.in new/menu-cache-0.3.2/configure.in --- old/menu-cache-0.3.1/configure.in 2010-02-16 14:18:34.000000000 +0100 +++ new/menu-cache-0.3.2/configure.in 2010-02-27 09:51:45.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([menu-cache], [0.3.1], +AC_INIT([menu-cache], [0.3.2], [http://lxde.org/]) AC_CONFIG_SRCDIR(menu-cache-gen/gmenu-tree.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/menu-cache-0.3.1/libmenu-cache/Makefile.am new/menu-cache-0.3.2/libmenu-cache/Makefile.am --- old/menu-cache-0.3.1/libmenu-cache/Makefile.am 2010-02-16 14:17:51.000000000 +0100 +++ new/menu-cache-0.3.2/libmenu-cache/Makefile.am 2010-02-27 09:51:45.000000000 +0100 @@ -22,6 +22,7 @@ libmenu_cache_la_LDFLAGS = \ -no-undefined \ -export-symbols-regex menu_cache \ + -version-info 1:0:0 \ $(NULL) lib_menu_cache_includedir = $(includedir)/menu-cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/menu-cache-0.3.1/libmenu-cache/menu-cache.c new/menu-cache-0.3.2/libmenu-cache/menu-cache.c --- old/menu-cache-0.3.1/libmenu-cache/menu-cache.c 2010-02-16 14:17:51.000000000 +0100 +++ new/menu-cache-0.3.2/libmenu-cache/menu-cache.c 2010-02-17 05:16:08.000000000 +0100 @@ -908,6 +908,27 @@ return register_menu_to_server( menu_name, FALSE ); } +static void on_menu_cache_reload(MenuCache* mc, gpointer user_data) +{ + GMainLoop* mainloop = (GMainLoop*)user_data; + g_main_loop_quit(mainloop); +} + +MenuCache* menu_cache_lookup_sync( const char* menu_name ) +{ + MenuCache* mc = menu_cache_lookup(menu_name); + /* ensure that the menu cache is loaded */ + if(! menu_cache_get_root_dir(mc)) /* if it's not yet loaded */ + { + GMainLoop* mainloop = g_main_loop_new(NULL, FALSE); + gpointer notify_id = menu_cache_add_reload_notify(mc, on_menu_cache_reload, mainloop); + g_main_loop_run(mainloop); + g_main_loop_unref(mainloop); + menu_cache_remove_reload_notify(mc, notify_id); + } + return mc; +} + static GSList* list_app_in_dir(MenuCacheDir* dir, GSList* list) { GSList* l; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/menu-cache-0.3.1/libmenu-cache/menu-cache.h new/menu-cache-0.3.2/libmenu-cache/menu-cache.h --- old/menu-cache-0.3.1/libmenu-cache/menu-cache.h 2010-02-16 14:17:51.000000000 +0100 +++ new/menu-cache-0.3.2/libmenu-cache/menu-cache.h 2010-02-17 05:16:08.000000000 +0100 @@ -70,6 +70,7 @@ void menu_cache_init(int flags); MenuCache* menu_cache_lookup( const char* menu_name ); +MenuCache* menu_cache_lookup_sync( const char* menu_name ); /* MenuCache* menu_cache_lookup_by_cache_id( const char* md5 ); */ MenuCache* menu_cache_ref(MenuCache* cache); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org