Hello community, here is the log from the commit of package liferea for openSUSE:Factory checked in at 2012-03-22 12:35:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liferea (Old) and /work/SRC/openSUSE:Factory/.liferea.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liferea", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/liferea/liferea.changes 2012-02-21 12:21:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.liferea.new/liferea.changes 2012-03-22 12:36:18.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Mar 15 09:57:11 UTC 2012 - [email protected] + +- Update to version 1.8.1b: + + Fixes Makefile problem. +- Rebase liferea-avahi.patch. + +------------------------------------------------------------------- +Sun Mar 4 11:17:40 UTC 2012 - [email protected] + +- Update to version 1.8.1: + + Fixes proxy preference not affecting the HTML widget. + + Feeds fail to update properly when entries ordered "wrong" + (sf#3363481) + + Fixes writing subscriptions into DB when importing from OPML + + Revert ISO 8601 parsing using Glib due to deb#653196 + (sf#3465106) + + Can't drag and drop feed to empty folder (sf#3484742) +- Add liferea-avahi.patch: remove all remainders of avahi after it + got stripped upstream. +- Note that libtool and call to autoreconf were still there, while + there was no patch; they're now needed for above patch. +- Clean spec file using spec-cleaner. This resulted in some + BuildRequires moving to pkgconfig() style: + + Old: gconf2-devel, glib2-devel, gtk2-devel, libnotify-devel. + + New: gconf-2.0, glib-2.0, gtk+-2.0, libnotify. + +------------------------------------------------------------------- Old: ---- liferea-1.8.0.tar.gz New: ---- liferea-1.8.1b.tar.gz liferea-avahi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liferea.spec ++++++ --- /var/tmp/diff_new_pack.J8d4S4/_old 2012-03-22 12:36:22.000000000 +0100 +++ /var/tmp/diff_new_pack.J8d4S4/_new 2012-03-22 12:36:22.000000000 +0100 @@ -17,32 +17,34 @@ Name: liferea -Version: 1.8.0 +Version: 1.8.1b Release: 0 -# FIXME: Make sure to remove liferea_dbus.xml again with next tarball. Summary: Linux Feed Reader License: GPL-2.0+ Group: Productivity/Other Url: http://liferea.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/liferea/Liferea%20Stable/1.8.0/%{name}-%{version}.tar.gz +Source: http://downloads.sourceforge.net/project/liferea/Liferea%20Stable/1.8.1/%{name}-%{version}.tar.gz # PATCH-FEATURE-OPENSUSE liferea-opensuse-feeds.patch -- Add openSUSE feeds to default feeds Patch0: liferea-opensuse-feeds.patch +# PATCH-FIX-UPSTREAM liferea-avahi.patch [email protected] -- Remove all remainders of avahi, after it was stripped by upstream. Patch sent upstream by mail (tracker down) +Patch1: liferea-avahi.patch BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gconf2-devel -BuildRequires: glib2-devel >= 2.26.0 -BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: json-glib-devel -BuildRequires: libnotify-devel BuildRequires: libsoup-devel >= 2.28.2 +# Needed for patch1 BuildRequires: libtool BuildRequires: libunique1-devel BuildRequires: libwebkit-devel >= 1.2.2 BuildRequires: libxslt-devel BuildRequires: sqlite-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.26.0 +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(sm) Requires: dbus-1 >= 0.30 Recommends: %{name}-lang @@ -62,16 +64,18 @@ %prep %setup -q %patch0 +%patch1 -p1 %build +# Needed for patch1 autoreconf -fi %configure \ --disable-static \ --disable-schemas-install -make %{?jobs:-j %jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install %suse_update_desktop_file -N "Liferea" liferea X-SuSE-RSS-News %find_lang %{name} %{?no_lang_C} %find_gconf_schemas @@ -105,9 +109,10 @@ %files -f %{name}.schemas_list %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog README -%{_bindir}/* +%{_bindir}/liferea +%{_bindir}/liferea-add-feed %{_datadir}/applications/liferea.desktop -%{_datadir}/liferea +%{_datadir}/liferea/ %{_datadir}/icons/hicolor/*/*/*.* %doc %{_mandir}/man1/liferea.1* # We can't really move the localized manpages to the lang package, since they'd ++++++ liferea-1.8.0.tar.gz -> liferea-1.8.1b.tar.gz ++++++ ++++ 25350 lines of diff (skipped) ++++++ liferea-avahi.patch ++++++ Index: liferea-1.8.1/src/conf.h =================================================================== --- liferea-1.8.1.orig/src/conf.h +++ liferea-1.8.1/src/conf.h @@ -84,11 +84,6 @@ #define GNOME_PROXY_USER "/system/http_proxy/authentication_user" #define GNOME_PROXY_PASSWD "/system/http_proxy/authentication_password" -/* other settings */ -#define SYNC_AVAHI_ENABLED "/apps/liferea/sync/use_avahi" -#define SYNC_AVAHI_SERVICE_NAME "/apps/liferea/sync/avahi_service_name" -#define SYNC_AVAHI_PASSWORD "/apps/liferea/sync/avahi_password" - /* initializing methods */ void conf_init (void); void conf_deinit (void); Index: liferea-1.8.1/src/main.c =================================================================== --- liferea-1.8.1.orig/src/main.c +++ liferea-1.8.1/src/main.c @@ -291,20 +290,6 @@ main (int argc, char *argv[]) dbus = liferea_dbus_new (); -#ifdef USE_AVAHI - if (conf_get_bool_value (SYNC_AVAHI_ENABLED)) { - LifereaAvahiPublisher *avahiPublisher = NULL; - - debug0 (DEBUG_CACHE, "Registering with AVAHI"); - avahiPublisher = liferea_avahi_publisher_new (); - liferea_avahi_publisher_publish (avahiPublisher, conf_get_str_value (SYNC_AVAHI_SERVICE_NAME), 23632); - } else { - debug0 (DEBUG_CACHE, "Avahi support available, but disabled by preferences."); - } -#else - debug0 (DEBUG_CACHE, "Compiled without AVAHI support"); -#endif - /* how to start liferea, command line takes precedence over preferences */ conf_get_bool_value (SHOW_TRAY_ICON, &show_tray_icon); conf_get_bool_value (START_IN_TRAY, &start_in_tray); Index: liferea-1.8.1/src/Makefile.am =================================================================== --- liferea-1.8.1.orig/src/Makefile.am +++ liferea-1.8.1/src/Makefile.am @@ -65,7 +65,7 @@ liferea_LDADD = parsers/libliparsers.a \ webkit/libwebkit.a \ $(SYNC_LIB) \ $(PACKAGE_LIBS) $(SM_LIBS) \ - $(INTLLIBS) $(AVAHI_LIBS) \ + $(INTLLIBS) \ $(WEBKIT_LIBS) $(LIBNOTIFY_LIBS) EXTRA_DIST = $(srcdir)/liferea-add-feed.in Index: liferea-1.8.1/src/ui/ui_prefs.c =================================================================== --- liferea-1.8.1.orig/src/ui/ui_prefs.c +++ liferea-1.8.1/src/ui/ui_prefs.c @@ -437,15 +437,6 @@ on_startintraybtn_clicked (GtkButton *bu } void -on_useAvahiSync_toggled (GtkToggleButton *button, gpointer user_data) -{ - gboolean enabled = gtk_toggle_button_get_active (button); - gtk_widget_set_sensitive (GTK_WIDGET (liferea_dialog_lookup (prefdialog, "avahiServiceNameEntry")), enabled); - gtk_widget_set_sensitive (GTK_WIDGET (liferea_dialog_lookup (prefdialog, "avahiServicePasswordEntry")), enabled); - conf_set_bool_value (SYNC_AVAHI_ENABLED, enabled); -} - -void on_hidetoolbar_toggled (GtkToggleButton *button, gpointer user_data) { conf_set_bool_value (DISABLE_TOOLBAR, gtk_toggle_button_get_active (button)); @@ -798,15 +789,6 @@ void on_prefbtn_clicked(void) { gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), GTK_SELECTION_SINGLE); - /* ================= panel 7 "sync" ======================== */ - /* FIXME: Avahi Sync is not yet imlemented - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (liferea_dialog_lookup (prefdialog, "useAvahiSync")), conf_get_bool_value (SYNC_AVAHI_ENABLED)); - gtk_entry_set_text (GTK_ENTRY (liferea_dialog_lookup (prefdialog, "avahiServiceNameEntry")), conf_get_str_value (SYNC_AVAHI_SERVICE_NAME)); - gtk_entry_set_text (GTK_ENTRY (liferea_dialog_lookup (prefdialog, "avahiServicePasswordEntry")), conf_get_str_value (SYNC_AVAHI_PASSWORD)); - gtk_widget_set_sensitive (GTK_WIDGET (liferea_dialog_lookup (prefdialog, "avahiServiceNameEntry")), conf_get_bool_value (SYNC_AVAHI_ENABLED)); - gtk_widget_set_sensitive (GTK_WIDGET (liferea_dialog_lookup (prefdialog, "avahiServicePasswordEntry")), conf_get_bool_value (SYNC_AVAHI_ENABLED)); - */ } gtk_window_present(GTK_WINDOW(prefdialog)); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
