Accepting request 111686 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/111686
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=124
This commit is contained in:
Stephan Kulow 2012-03-29 09:37:44 +00:00 committed by Git OBS Bridge
commit 52c1415474
4 changed files with 47 additions and 13 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce469d8a11e21d581b11dd2e878f0600b76b7c2b3ec5f4f73e1a31fcd17e55e8
size 11837968

3
evolution-3.4.0.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:364eacfc54912ba26738729d0f662a821140a712e3607cf569eb342f1dab4f7a
size 12733312

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Wed Mar 28 06:41:35 UTC 2012 - vuntz@opensuse.org
- Update to version 3.4.0.1:
+ Re-release 3.4.0 to fix a build bug in 3.4.0 tarball caused by
gnome-doc-utils.
- Remove xz BuildRequires now that it comes for free in the build
system.
- Disable call to gnome-autogen.sh as it's not needed anymore for
now.
-------------------------------------------------------------------
Mon Mar 26 08:16:11 UTC 2012 - vuntz@opensuse.org
- Update to version 3.4.0:
+ Bugs fixed: bgo#672474, bgo#672593.
+ Updated translations.
- Use gnome-autogen.sh instead of calls to intltoolize and
autoreconf: that's better for GNOME packages, and it comes with
the benefit that it fixes the build for this tarball (else,
things break because of a gnome-doc-utils bug that got fixed in
newer gnome-doc-utils).
- Also remove hack editing help/Makefile.in in %build: there's no
need for that.
-------------------------------------------------------------------
Tue Mar 20 16:40:01 UTC 2012 - vuntz@opensuse.org
- Update to version 3.3.92:
+ Various code changes.
+ User documentation improvements.
+ Bugs fixed: bgo#659756, bgo#661654, bgo#664169, bgo#664205,
bgo#664323, bgo#664326, bgo#665008, bgo#665106, bgo#665129,
bgo#665130, bgo#665399, bgo#669246, bgo#669490, bgo#671068,
bgo#671233, bgo#671509, bgo#671509, bgo#671633, bgo#671716.
- Add pkgconfig(dbus-glib-1) BuildRequires: new dependency
upstream, needed to initialize thread for GConf.
-------------------------------------------------------------------
Tue Mar 6 09:38:24 UTC 2012 - vuntz@opensuse.org

View File

@ -20,8 +20,7 @@
# wait for port of gtkimageview to gtk3
%define use_gtkimageview 0
# Set to 1 for patch0
%define need_autogen 1
%define need_autogen 0
Name: evolution
BuildRequires: bison
@ -34,7 +33,7 @@ BuildRequires: fdupes
%if %USE_EVOLDAP || %{need_autogen}
BuildRequires: gnome-common
%endif
BuildRequires: gnome-doc-utils-devel
BuildRequires: gnome-doc-utils-devel >= 0.20.10
BuildRequires: gtk-doc
BuildRequires: intltool
BuildRequires: krb5-devel
@ -45,10 +44,9 @@ BuildRequires: python-devel
BuildRequires: sqlite3-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
BuildRequires: xz
BuildRequires: pkgconfig(NetworkManager)
BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(dbus-glib-1) >= 0.6
BuildRequires: pkgconfig(gail)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gio-2.0)
@ -79,7 +77,7 @@ BuildRequires: pkgconfig(shared-mime-info)
BuildRequires: pkgconfig(sm)
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 3.4
Version: 3.3.91
Version: 3.4.0.1
Release: 0
# FIXME: check if note on license is still valid (comment before license)
# FIXME: check with upstream/meego if we want to enable clutter for express mode
@ -87,7 +85,7 @@ Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
License: LGPL-2.0 ; LGPL-3.0
Group: Productivity/Networking/Email/Clients
# NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
Source0: http://download.gnome.org/sources/evolution/3.3/%{name}-%{version}.tar.xz
Source0: http://download.gnome.org/sources/evolution/3.4/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include
Patch15: evolution-custom-openldap-includes.patch
# PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column.
@ -186,9 +184,7 @@ translation-update-upstream
%build
%if %USE_EVOLDAP || %{need_autogen}
autoreconf -f -i
intltoolize --copy --force
%{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
NOCONFIGURE=1 gnome-autogen.sh
%endif
%{configure} \
--disable-scrollkeeper \