- 1.7.90.1, removed obsoleted gg-im and libdb patches,

  unfortuneltely --as-needed is broken with this release.
  NOTE: ABI/API breakage, new sonames

Changed files:
    evolution-data-server.spec -> 1.81

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 6c27fcfc2c2288b9ec492cc3acb0a5bed08c1340..21f9b4c44aaf665162efb728ef66f6045a52e36e 100644 (file)
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -11,18 +11,16 @@
 Summary:       Evolution data server
 Summary(pl):   Serwer danych Evolution
 Name:          evolution-data-server
-Version:       1.7.4
+Version:       1.7.90.1
 Release:       1
 License:       GPL
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.7/%{name}-%{version}.tar.bz2
-# Source0-md5: b992845da75badd6eb5fecea022b5a50
-Patch0:                %{name}-GG-IM.patch
-Patch1:                %{name}-workaround-cal-backend-leak.patch
-Patch2:                %{name}-gcc4.patch
-Patch3:                %{name}-no_libdb_la.patch
+# Source0-md5: 07fa3db5725d41093b22d4e90c2ced87
+Patch0:                %{name}-workaround-cal-backend-leak.patch
+Patch1:                %{name}-gcc4.patch
 URL:           http://www.ximian.com/products/ximian_evolution/
-BuildRequires: ORBit2-devel >= 1:2.14.0
+BuildRequires: ORBit2-devel >= 1:2.14.2
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: bison
@@ -32,8 +30,8 @@ BuildRequires:        gnome-keyring-devel >= 0.5.1
 %{?with_kerberos5:BuildRequires:       heimdal-devel >= 0.7}
 BuildRequires: intltool
 BuildRequires: libglade2-devel >= 1:2.6.0
-BuildRequires: libgnomeui-devel >= 2.15.2
-BuildRequires: libsoup-devel >= 2.2.95.1
+BuildRequires: libgnomeui-devel >= 2.15.90
+BuildRequires: libsoup-devel >= 2.2.96
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: nspr-devel
@@ -45,6 +43,7 @@ Requires(post,postun):        scrollkeeper
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                no_build_with_as_needed 1
 %define                schemadir       /usr/share/openldap/schema
 
 %description
@@ -70,8 +69,8 @@ Ten pakiet zawiera evolutionperson.schema dla serwera openldap.
 Summary:       Evolution Data Server library
 Summary(pl):   Biblioteka Evolution Data Server
 Group:         Libraries
-Requires:      libgnomeui >= 2.15.2
-Requires:      libsoup >= 2.2.95.1
+Requires:      libgnomeui >= 2.15.90
+Requires:      libsoup >= 2.2.96
 
 %description libs
 This package contains Evolution Data Server library.
@@ -87,12 +86,12 @@ Requires:   %{name}-libs = %{version}-%{release}
 %{?with_kerberos5:Requires:    heimdal-devel >= 0.7}
 # for all but libegroupwise
 Requires:      GConf2-devel >= 2.14.0
-Requires:      ORBit2-devel >= 1:2.14.0
-Requires:      glib2-devel >= 1:2.12.0
-Requires:      libgnomeui-devel >= 2.15.2
+Requires:      ORBit2-devel >= 1:2.14.2
+Requires:      glib2-devel >= 1:2.12.1
+Requires:      libgnomeui-devel >= 2.15.90
 Requires:      libxml2-devel >= 1:2.6.26
 # for libegroupwise
-Requires:      libsoup-devel >= 2.2.95.1
+Requires:      libsoup-devel >= 2.2.96
 
 %description devel
 This package contains the files necessary to develop applications
@@ -118,8 +117,6 @@ Statyczne biblioteki serwera danych Evolution.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__glib_gettextize}
@@ -137,7 +134,6 @@ cd calendar/libical
 %{__autoconf}
 %{__automake}
 cd ../..
-LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure \
        %{?with_kerberos5:--with-krb5=%{_prefix}} \
        %{!?with_kerberos5:--with-krb5=no} \