[packages/evolution-data-server] - updated to 3.6.0 - new sonames - patch0 already applied upstream

kiesiu kiesiu at pld-linux.org
Tue Sep 25 13:21:14 CEST 2012


commit 2042f28a67909231b43684bd10d780b7b21b9a40
Author: Łukasz Kieś <kiesiu at pld-linux.org>
Date:   Tue Sep 25 13:20:18 2012 +0200

    - updated to 3.6.0
    - new sonames
    - patch0 already applied upstream

 evolution-data-server.spec | 62 +++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 28 deletions(-)
---
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 9666bc5..6a03918 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -6,31 +6,28 @@
 %bcond_without	static_libs	# do not build static libs
 %bcond_without	vala		# do not build Vala API
 #
-%define		basever		3.4
+%define		basever		3.6
 %define		apiver		1.2
 %define		apiver2		3.0
 #
 Summary:	Evolution data server
 Summary(pl.UTF-8):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	3.4.4
-Release:	3
+Version:	3.6.0
+Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.4/%{name}-%{version}.tar.xz
-# Source0-md5:	4d822c44f00d1f6327433cebdf2443f3
-Patch0:		%{name}-am-Werror.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.6/%{name}-%{version}.tar.xz
+# Source0-md5:	9b7a1443e50d3f897ac63775bfacd2a1
 URL:		http://www.gnome.org/projects/evolution/
-BuildRequires:	GConf2-devel >= 2.26.0
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
-BuildRequires:	bison
-BuildRequires:	dbus-glib-devel
 BuildRequires:	docbook-dtd412-xml
+BuildRequires:	gcr-devel >= 3.4.0
 BuildRequires:	gettext-devel >= 0.18.1
-BuildRequires:	glib2-devel >= 1:2.30.0
+BuildRequires:	glib2-devel >= 1:2.32.0
 BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-online-accounts-devel >= 3.2.0
+BuildRequires:	gnome-online-accounts-devel >= 3.5.0
 BuildRequires:	gobject-introspection-devel >= 0.10.0
 BuildRequires:	gperf
 BuildRequires:	gtk+3-devel >= 3.2.0
@@ -39,10 +36,10 @@ BuildRequires:	gtk+3-devel >= 3.2.0
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libgdata-devel >= 0.10.0
 BuildRequires:	libgnome-keyring-devel >= 2.26.0
-BuildRequires:	libgweather-devel >= 3.0.0
+BuildRequires:	libgweather-devel >= 3.5.0
 BuildRequires:	libical-devel >= 0.43
 BuildRequires:	liboauth-devel >= 0.9.4
-BuildRequires:	libsoup-devel >= 2.32.0
+BuildRequires:	libsoup-devel >= 2.38.1
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel >= 1:2.6.31
@@ -89,7 +86,7 @@ Ten pakiet zawiera evolutionperson.schema dla serwera openldap.
 Summary:	Evolution Data Server library
 Summary(pl.UTF-8):	Biblioteka Evolution Data Server
 Group:		X11/Libraries
-Requires:	libsoup >= 2.32.0
+Requires:	libsoup >= 2.38.1
 
 %description libs
 This package contains Evolution Data Server library.
@@ -102,13 +99,12 @@ Summary:	Evolution data server development files
 Summary(pl.UTF-8):	Pliki programistyczne serwera danych evolution
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	GConf2-devel >= 2.26.0
-Requires:	glib2-devel >= 1:2.30.0
+Requires:	glib2-devel >= 1:2.32.0
 Requires:	gtk+3-devel >= 3.2.0
 %{?with_kerberos5:Requires:	heimdal-devel}
 Requires:	libgdata-devel >= 0.10.0
 Requires:	libical-devel >= 0.43
-Requires:	libsoup-devel >= 2.32.0
+Requires:	libsoup-devel >= 2.38.1
 Requires:	libxml2-devel >= 1:2.6.31
 Requires:	nspr-devel
 Requires:	nss-devel
@@ -160,14 +156,12 @@ API serwera danych Evolution dla języka Vala.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # kill -L$withval/lib
 %{__sed} -i -e 's/DB_LIBS="-L[^ "]* /DB_LIBS="/;s/ICONV_LIBS="[^ "]*/ICONV_LIBS="/' configure.ac
 
 %build
 %{__gtkdocize}
-%{__gettextize}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -213,7 +207,7 @@ install -d $RPM_BUILD_ROOT%{schemadir}
 
 install addressbook/backends/ldap/evolutionperson.schema $RPM_BUILD_ROOT%{schemadir}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{camel-providers,calendar-backends,addressbook-backends}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{camel-providers,calendar-backends,addressbook-backends,registry-modules}/*.{la,a}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name} --all-name
@@ -247,6 +241,7 @@ fi
 %attr(755,root,root) %{_libdir}/camel-lock-helper-%{apiver}
 %attr(755,root,root) %{_libdir}/evolution-addressbook-factory
 %attr(755,root,root) %{_libdir}/evolution-calendar-factory
+%{_libdir}/evolution-source-registry
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/camel-providers
 %attr(755,root,root) %{_libdir}/%{name}/camel-providers/*.so
@@ -255,6 +250,8 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/addressbook-backends/*.so
 %dir %{_libdir}/%{name}/calendar-backends
 %attr(755,root,root) %{_libdir}/%{name}/calendar-backends/*.so
+%dir %{_libdir}/evolution-data-server/registry-modules
+%attr(755,root,root) %{_libdir}/evolution-data-server/registry-modules/*.so
 
 %dir %{_libdir}/%{name}-%{basever}
 
@@ -264,13 +261,22 @@ fi
 
 %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
 %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
+%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Sources.service
 
 %dir %{_datadir}/%{name}-%{basever}
+%dir %{_datadir}/%{name}-%{basever}/ro-sources
+%dir %{_datadir}/%{name}-%{basever}/rw-sources
+%{_datadir}/%{name}-%{basever}/ro-sources/*.source
+%{_datadir}/%{name}-%{basever}/rw-sources/*.source
 %{_pixmapsdir}/%{name}
 
+%{_datadir}/GConf/gsettings/evolution-data-server.convert
 %{_datadir}/GConf/gsettings/libedataserver.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.eds-shell.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.Evolution.DefaultSources.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.addressbook.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution-data-server.calendar.gschema.xml
 
 %files -n openldap-schema-evolutionperson
 %defattr(644,root,root,755)
@@ -279,21 +285,21 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcamel-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcamel-%{apiver}.so.33
+%attr(755,root,root) %ghost %{_libdir}/libcamel-%{apiver}.so.40
 %attr(755,root,root) %{_libdir}/libebackend-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libebackend-%{apiver}.so.2
+%attr(755,root,root) %ghost %{_libdir}/libebackend-%{apiver}.so.5
 %attr(755,root,root) %{_libdir}/libebook-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libebook-%{apiver}.so.13
+%attr(755,root,root) %ghost %{_libdir}/libebook-%{apiver}.so.14
 %attr(755,root,root) %{_libdir}/libecal-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libecal-%{apiver}.so.11
+%attr(755,root,root) %ghost %{_libdir}/libecal-%{apiver}.so.15
 %attr(755,root,root) %{_libdir}/libedata-book-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libedata-book-%{apiver}.so.13
+%attr(755,root,root) %ghost %{_libdir}/libedata-book-%{apiver}.so.15
 %attr(755,root,root) %{_libdir}/libedata-cal-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libedata-cal-%{apiver}.so.15
+%attr(755,root,root) %ghost %{_libdir}/libedata-cal-%{apiver}.so.18
 %attr(755,root,root) %{_libdir}/libedataserver-%{apiver}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libedataserver-%{apiver}.so.16
+%attr(755,root,root) %ghost %{_libdir}/libedataserver-%{apiver}.so.17
 %attr(755,root,root) %{_libdir}/libedataserverui-%{apiver2}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libedataserverui-%{apiver2}.so.1
+%attr(755,root,root) %ghost %{_libdir}/libedataserverui-%{apiver2}.so.4
 %{_libdir}/girepository-1.0/EBook-%{apiver}.typelib
 %{_libdir}/girepository-1.0/ECalendar-%{apiver}.typelib
 %{_libdir}/girepository-1.0/EDataServer-%{apiver}.typelib
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/evolution-data-server.git/commitdiff/2042f28a67909231b43684bd10d780b7b21b9a40



More information about the pld-cvs-commit mailing list