X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=evolution-data-server.spec;h=cf044d2ff33f91a5ac81a8fffa4aa29ded6bcd56;hb=6eab7a5db4cd2287f494b4a55a0ac712d47fbb3e;hp=719b7e4194328df25d50beb4bf6a585596d54054;hpb=17eb18aa565c4990c1aeb28d71e7789c321405ea;p=packages%2Fevolution-data-server.git

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 719b7e4..cf044d2 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -6,41 +6,40 @@
 %bcond_without	kerberos5	# build without kerberos5 support
 %bcond_without	ldap		# build without ldap support
 #
-%define		basever		1.4
+%define		basever		1.8
 %define		apiver		1.2
 Summary:	Evolution data server
 Summary(pl):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	1.4.2.1
+Version:	1.7.92
 Release:	1
 License:	GPL
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5:	8b058aff089cf3a6c13cc9f51f536ae8
-Patch0:		%{name}-system_db.patch
-Patch1:		%{name}-GG-IM.patch
-Patch2:		%{name}-workaround-cal-backend-leak.patch
-Patch3:		%{name}-gcc4.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.7/%{name}-%{version}.tar.bz2
+# Source0-md5:	e5cf9b7317b9b495e15b18586cacda6c
+Patch0:		%{name}-workaround-cal-backend-leak.patch
+Patch1:		%{name}-gcc4.patch
+Patch2:		%{name}-as_needed-fix.patch
 URL:		http://www.ximian.com/products/ximian_evolution/
-BuildRequires:	ORBit2-devel >= 1:2.12.1
+BuildRequires:	ORBit2-devel >= 1:2.14.2
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	db-devel
-BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	howl-devel >= 0.9.10
+BuildRequires:	gnome-common >= 2.12.0
+BuildRequires:	gnome-keyring-devel >= 0.5.2
+%{?with_kerberos5:BuildRequires:	heimdal-devel >= 0.7}
 BuildRequires:	intltool
-BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.11.2-2
-BuildRequires:	libsoup-devel >= 2.2.5
+BuildRequires:	libglade2-devel >= 1:2.6.0
+BuildRequires:	libgnomeui-devel >= 2.15.91
+BuildRequires:	libsoup-devel >= 2.2.96
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	nspr-devel
 BuildRequires:	nss-devel
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.197
-%{?with_kerberos5:BuildRequires:	heimdal-devel >= 0.7}
-%{?with_ldap:BuildRequires:	openldap-devel >= 2.0.0}
+BuildRequires:	rpmbuild(macros) >= 1.304
 Requires(post,postun):	scrollkeeper
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,7 +69,8 @@ Ten pakiet zawiera evolutionperson.schema dla serwera openldap.
 Summary:	Evolution Data Server library
 Summary(pl):	Biblioteka Evolution Data Server
 Group:		Libraries
-Requires:	libsoup >= 2.2.3
+Requires:	libgnomeui >= 2.15.91
+Requires:	libsoup >= 2.2.96
 
 %description libs
 This package contains Evolution Data Server library.
@@ -83,15 +83,15 @@ Summary:	Evolution data server development files
 Summary(pl):	Pliki programistyczne serwera danych evolution
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+%{?with_kerberos5:Requires:	heimdal-devel >= 0.7}
 # for all but libegroupwise
-Requires:	GConf2-devel >= 2.10.0
-Requires:	ORBit2-devel >= 1:2.12.1
-Requires:	glib2-devel >= 1:2.6.4
-Requires:	libbonobo-devel >= 2.8.1
-Requires:	libgnomeui-devel >= 2.11.2-2
-Requires:	libxml2-devel
+Requires:	GConf2-devel >= 2.14.0
+Requires:	ORBit2-devel >= 1:2.14.2
+Requires:	glib2-devel >= 1:2.12.1
+Requires:	libgnomeui-devel >= 2.15.91
+Requires:	libxml2-devel >= 1:2.6.26
 # for libegroupwise
-Requires:	libsoup-devel >= 2.2.5
+Requires:	libsoup-devel >= 2.2.96
 
 %description devel
 This package contains the files necessary to develop applications
@@ -113,14 +113,23 @@ Evolution data server static libraries.
 %description static -l pl
 Statyczne biblioteki serwera danych Evolution.
 
+%package apidocs
+Summary:	e-d-s API documentation
+Summary(pl):	Dokumentacja API e-d-s
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+e-d-s API documentation.
+
+%description apidocs -l pl
+Dokumentacja API e-d-s.
+
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
-rm -rf libdb
 
 %build
 %{__glib_gettextize}
@@ -138,21 +147,23 @@ cd calendar/libical
 %{__autoconf}
 %{__automake}
 cd ../..
-
 %configure \
 	%{?with_kerberos5:--with-krb5=%{_prefix}} \
 	%{!?with_kerberos5:--with-krb5=no} \
 	%{?with_ldap:--with-openldap=yes} \
 	%{!?with_ldap:--with-openldap=no} \
+	--enable-gnome-keyring=yes \
 	--enable-gtk-doc \
 	--enable-static \
 	--with-nspr-includes=%{_includedir}/nspr \
 	--with-nspr-libs=%{_libdir} \
 	--with-nss-includes=%{_includedir}/nss \
-	--with-nss-libs=%{_libdir}
+	--with-nss-libs=%{_libdir} \
+	--with-libdb=%{_libdir}
+	
 %{__make} \
 	HTML_DIR=%{_gtkdocdir} \
-	GTKHTML_DATADIR=%{_datadir}/idl 
+	GTKHTML_DATADIR=%{_datadir}/idl
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -165,8 +176,6 @@ rm -rf $RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{apiver}/{camel-providers,extensions}/*.{la,a}
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
 install -d $RPM_BUILD_ROOT%{schemadir}
 install addressbook/backends/ldap/evolutionperson.schema $RPM_BUILD_ROOT%{schemadir}
 
@@ -185,30 +194,13 @@ rm -rf $RPM_BUILD_ROOT
 %postun	libs -p /sbin/ldconfig
 
 %post -n openldap-schema-evolutionperson
-if ! grep -q %{schemadir}/evolutionperson.schema /etc/openldap/slapd.conf; then
-	sed -i -e '
-		/^include.*local.schema/{
-			i\
-include		%{schemadir}/evolutionperson.schema
-		}
-	' /etc/openldap/slapd.conf
-fi
-
-if [ -f /var/lock/subsys/ldap ]; then
-	/etc/rc.d/init.d/ldap restart >&2
-fi
+%openldap_schema_register %{schemadir}/evolutionperson.schema
+%service -q ldap restart
 
 %postun -n openldap-schema-evolutionperson
 if [ "$1" = "0" ]; then
-	if grep -q %{schemadir}/evolutionperson.schema /etc/openldap/slapd.conf; then
-		sed -i -e '
-		/^include.*\/usr\/share\/openldap\/schema\/evolutionperson.schema/d
-		' /etc/openldap/slapd.conf
-	fi
-
-	if [ -f /var/lock/subsys/ldap ]; then
-		/etc/rc.d/init.d/ldap restart >&2 || :
-	fi
+	%openldap_schema_unregister %{schemadir}/evolutionperson.schema
+	%service -q ldap restart
 fi
 
 %files -f %{name}.lang
@@ -250,8 +242,11 @@ fi
 %{_libdir}/*.la
 %{_includedir}/*
 %{_pkgconfigdir}/*
-%{_gtkdocdir}/*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/*.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/*