- updated to 1.0.4

[packages/evolution-data-server.git] / evolution-data-server.spec

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index a70b7b956bc9f6cf235e051da0cf44b17ae3b281..d145d8f6d5bb8db91310ed7a3b0a3d352d837ee4 100644 (file)
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -7,31 +7,32 @@
 Summary:       Evolution data server
 Summary(pl):   Serwer danych Evolution
 Name:          evolution-data-server
-Version:       0.0.98
+Version:       1.0.4
 Release:       1
 License:       GPL
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/0.0/%{name}-%{version}.tar.bz2
-# Source0-md5: acc604979b4b8044f8ac5360b8fa82a4
+Source0:       http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 5c9c6cac9b65d392e50ea3214022cb5b
 Patch0:                %{name}-system_db.patch
-Patch1:                %{name}-locale-names.patch
-Patch2:                %{name}-GG-IM.patch
-Patch3:                %{name}-configure.patch
+Patch1:                %{name}-GG-IM.patch
+Patch2:                %{name}-workaround-cal-backend-leak.patch
 URL:           http://www.ximian.com/products/ximian_evolution/
 BuildRequires: ORBit2-devel >= 1:2.10.3
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: db-devel
+BuildRequires: gnome-common >= 2.8.0
 BuildRequires: intltool
 BuildRequires: libgnome-devel >= 2.6.1.1
-BuildRequires: libsoup-devel >= 2.1.13
+BuildRequires: libsoup-devel >= 2.2.2
+BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: openldap-devel
 BuildRequires: pkgconfig
 Requires(post,postun): /sbin/ldconfig
 Requires(post,postun): /usr/bin/scrollkeeper-update
 Requires(post):                GConf2
-Requires:      libsoup >= 2.1.13
+Requires:      libsoup >= 2.2.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,7 +54,7 @@ Requires:     libbonobo-devel >= 2.6.2
 Requires:      libgnome-devel >= 2.6.1.1
 Requires:      libxml2-devel
 # for libegroupwise
-Requires:      libsoup-devel >= 2.1.13
+Requires:      libsoup-devel >= 2.2.2
 
 %description devel
 This package contains the files necessary to develop applications
@@ -80,16 +81,14 @@ Statyczne biblioteki serwera danych Evolution.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
-mv po/{no,nb}.po
 rm -rf libdb
 
 %build
 glib-gettextize --copy --force
 intltoolize --copy --force
 %{__libtoolize}
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
@@ -120,6 +119,8 @@ rm -rf $RPM_BUILD_ROOT
        HTML_DIR=%{_gtkdocdir} \
        pkgconfigdir=%{_pkgconfigdir}
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --all-name
 
 %clean