Hello community, here is the log from the commit of package balsa for openSUSE:Factory checked in at 2012-01-25 10:34:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/balsa (Old) and /work/SRC/openSUSE:Factory/.balsa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "balsa", Maintainer is "sbrabec@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/balsa/balsa.changes 2012-01-05 19:10:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.balsa.new/balsa.changes 2012-01-25 10:34:56.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Jan 12 08:49:00 UTC 2012 - dimstar@opensuse.org + +- Build openSUSE > 12.1 against gmime 2.6: Conditionally change + pkgconfig(gmime-2.4) BuildRequires to pkgconfig(gmime-2.6). +- Add balsa-gmime-2_6.patch: Allow building against gmime 2.6. +- Add libtool BuildRequires and call to bootstrap.sh as the patch + above touches the build system. + +------------------------------------------------------------------- New: ---- balsa-gmime-2_6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ balsa.spec ++++++ --- /var/tmp/diff_new_pack.LtFdPs/_old 2012-01-25 10:34:57.000000000 +0100 +++ /var/tmp/diff_new_pack.LtFdPs/_new 2012-01-25 10:34:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package balsa # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,18 @@ # - Name: balsa %define TOUCHSCREEN_OPTIMIZATION %(echo %{name} | grep -qv touchscreen ; echo $?) %define base_name balsa Version: 2.4.11 -Release: 1 -License: GPLv2+ +Release: 0 Summary: The GNOME Mail Program -Url: http://pawsa.fedorapeople.org/balsa/ +License: GPL-2.0+ Group: Productivity/Networking/Email/Clients +Url: http://pawsa.fedorapeople.org/balsa/ Source: http://pawsa.fedorapeople.org/balsa/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM balsa-gmime-2_6.patch dimstar@opensuse.org -- Fix build with gmime 2.6, Upstream commit 393d007. +Patch0: balsa-gmime-2_6.patch BuildRequires: compface BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel @@ -34,6 +35,8 @@ BuildRequires: intltool BuildRequires: krb5-devel BuildRequires: libesmtp-devel +# Needed by patch0 +BuildRequires: libtool BuildRequires: openldap2-devel BuildRequires: openssl-devel BuildRequires: translation-update-upstream @@ -41,7 +44,11 @@ BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(glib-2.0) +%if 0%{?suse_version} > 1210 +BuildRequires: pkgconfig(gmime-2.6) +%else BuildRequires: pkgconfig(gmime-2.4) +%endif BuildRequires: pkgconfig(gnome-icon-theme) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gtk+-2.0) @@ -78,9 +85,12 @@ %prep %setup -q -n %{base_name}-%{version} +%patch0 -p1 translation-update-upstream %build +# Needed by patch0 +./bootstrap.sh %configure\ %if %TOUCHSCREEN_OPTIMIZATION --enable-touch-ui\ ++++++ balsa-gmime-2_6.patch ++++++ ++++ 1373 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org