Hello community, here is the log from the commit of package glabels for openSUSE:Factory checked in at 2012-11-02 15:11:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glabels (Old) and /work/SRC/openSUSE:Factory/.glabels.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glabels", Maintainer is "stephan.ba...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/glabels/glabels.changes 2012-07-04 09:08:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glabels.new/glabels.changes 2012-11-02 15:11:50.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Oct 24 09:53:46 UTC 2012 - p.drou...@gmail.com + +- Update to version 3.0.1: + + Fixed bug causing extra pages to be printed when doing a + document merge + + Fixed font scaling problems when doing a document merge + + Added missing dependencies to libglabels and libglbarcode + pkg-config files + + Fixed invalid gsettings schema file + + Fixed incorrect clip region for rectangular labels + + Numerous new templates and fixes + + Updated translations. +- Drop glabels-unused_screenshot.patch: fixed upstream. +- Add glabels-eds-3.6.patch: Fix build wth e-d-s 3.6. +- Add explicit (but not new) pkgconfig()-BuildRequires, to reflect + more precisely what configure checks for (avoiding issues for + future packaging changes in underlying packages): + + cairo, pangocair, gobject-2.0 +- Remove glib2-devel and libxml-devel Requires from -devel file: + they are added automatically by rpm/pkg-config. +- Drop alternative post/postun scripts for openSUSE < 11.3. +- No longer pass --disable-scrollkeeper to configure (it's an + unknown parameter) and do not delete a non-existing scrollkeeper + directory in install section. + +------------------------------------------------------------------- Old: ---- glabels-3.0.0.tar.bz2 glabels-unused_screenshot.patch New: ---- glabels-3.0.1.tar.xz glabels-eds-3.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glabels.spec ++++++ --- /var/tmp/diff_new_pack.uNIifA/_old 2012-11-02 15:11:52.000000000 +0100 +++ /var/tmp/diff_new_pack.uNIifA/_new 2012-11-02 15:11:52.000000000 +0100 @@ -17,15 +17,15 @@ Name: glabels -Version: 3.0.0 +Version: 3.0.1 Release: 0 Summary: Label Editing and Printing Tool License: GPL-3.0+ Group: Productivity/Office/Other Url: http://glabels.sourceforge.net/ -Source: http://ftp.gnome.org/pub/GNOME/sources/glabels/3.0/glabels-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM glabels-unused_screenshot.patch dims...@opensuse.org -- Remove reference to unused screenshot. Taken from upstream git. -Patch0: glabels-unused_screenshot.patch +Source: http://download.gnome.org/sources/glabels/3.0/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM glabels-eds-3.6.patch bgo#685130 dims...@opensuse.org -- Fix build with evolution-data-server 3.6 +Patch0: glabels-eds-3.6.patch BuildRequires: barcode-devel BuildRequires: fdupes BuildRequires: intltool @@ -33,12 +33,16 @@ BuildRequires: shared-mime-info BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(cairo) >= 1.10.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.28.2 BuildRequires: pkgconfig(gnome-doc-utils) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libebook-1.2) -BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(gobject-2.0) >= 2.28.2 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.9 +BuildRequires: pkgconfig(libebook-1.2) >= 2.30.3 +BuildRequires: pkgconfig(librsvg-2.0) >= 2.32.0 +BuildRequires: pkgconfig(libxml-2.0) >= 2.7.8 +BuildRequires: pkgconfig(pango) >= 1.28.1 +BuildRequires: pkgconfig(pangocairo) >= 1.28.1 Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -52,8 +56,6 @@ License: GPL-2.0+ Group: Development/Libraries/GNOME Requires: %{name} = %{version} -Requires: glib2-devel -Requires: libxml2-devel %description devel Labels is a powerful tool for editing and printing all kinds of labels. @@ -72,47 +74,32 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" # FIXME: Build as root modifies system! %configure\ - --disable-static \ - --disable-scrollkeeper + --disable-static make %{?_smp_mflags} %install -%makeinstall +%make_install find %{buildroot} -type f -name "*.la" -delete -print -# delete scrollkeeper directory. configure does not understand --disable-scrollkeeper. -rm -rf %{buildroot}%{_localstatedir}/scrollkeeper %suse_update_desktop_file glabels-3.0 WordProcessor %find_lang %{name}-3.0 %{?no_lang_C} %fdupes -s %{buildroot} %clean -%{?buildroot:%__rm -rf %{buildroot}} +%{?buildroot:rm -rf %{buildroot}} %post /sbin/ldconfig -%if 0%{?suse_version} > 1130 %glib2_gsettings_schema_post %icon_theme_cache_post %desktop_database_post %mime_database_post -%else -if test -x usr/bin/update-mime-database ; then - usr/bin/update-mime-database /usr/share/mime >/dev/null -fi -%endif %postun /sbin/ldconfig -%if 0%{?suse_version} > 1130 %glib2_gsettings_schema_postun %icon_theme_cache_postun %desktop_database_postun %mime_database_postun -%else -if test -x usr/bin/update-mime-database ; then - usr/bin/update-mime-database /usr/share/mime >/dev/null -fi -%endif %files %defattr(-,root,root) ++++++ glabels-eds-3.6.patch ++++++ diff -up glabels-3.0.0/src/merge-evolution.c.new-eds glabels-3.0.0/src/merge-evolution.c --- glabels-3.0.0/src/merge-evolution.c.new-eds 2011-04-04 01:02:48.000000000 +0200 +++ glabels-3.0.0/src/merge-evolution.c 2012-08-29 11:54:20.240577838 +0200 @@ -29,7 +29,7 @@ #include "merge-evolution.h" -#include <libebook/e-book.h> +#include <libebook/libebook.h> #include <glib/gi18n.h> #include <stdio.h> #include <string.h> @@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gcon /*--------------------------------------------------------------------------*/ /* Open merge source. */ /*--------------------------------------------------------------------------*/ +static EBook * +gl_open_system_addressbook (GError **error) +{ + ESourceRegistry *registry; + EBook *book = NULL; + ESource *source; + + registry = e_source_registry_new_sync (NULL, error); + if (!registry) + return NULL; + + source = e_source_registry_ref_builtin_address_book (registry); + if (!source) { + g_object_unref (registry); + return NULL; + } + + book = e_book_new (source, error); + + g_object_unref (source); + g_object_unref (registry); + + return book; +} + static void gl_merge_evolution_open (glMerge *merge) { @@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge) return; } - merge_evolution->priv->book = e_book_new_system_addressbook(&error); + merge_evolution->priv->book = gl_open_system_addressbook(&error); if (!merge_evolution->priv->book) { g_warning ("Couldn't open addressbook."); if (error) { - g_warning ("e_book_new_system_addressbook: %s", error->message); + g_warning ("gl_open_system_addressbook: %s", error->message); g_error_free (error); } e_book_query_unref(query); diff -up glabels-3.0.0/src/merge-vcard.c.new-eds glabels-3.0.0/src/merge-vcard.c --- glabels-3.0.0/src/merge-vcard.c.new-eds 2011-04-04 01:02:48.000000000 +0200 +++ glabels-3.0.0/src/merge-vcard.c 2012-08-29 11:54:20.241577849 +0200 @@ -27,7 +27,7 @@ #include "merge-vcard.h" -#include <libebook/e-contact.h> +#include <libebook/libebook.h> #include <stdio.h> #include <string.h> #include <errno.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
