From 9fb1c4d7f9a10cf0433e04e8757ed4a0a51039257b88cf116cd79fa69baa5719 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 15 Oct 2010 11:59:30 +0000 Subject: [PATCH] Accepting request 50665 from GNOME:Factory checked in (request 50665) OBS-URL: https://build.opensuse.org/request/show/50665 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=83 --- baselibs.conf | 10 +- evolution-data-server-2.31.92.1.tar.bz2 | 3 + evolution-data-server-2.32.0.tar.bz2 | 3 - evolution-data-server.changes | 29 --- evolution-data-server.spec | 232 +++--------------------- 5 files changed, 32 insertions(+), 245 deletions(-) create mode 100644 evolution-data-server-2.31.92.1.tar.bz2 delete mode 100644 evolution-data-server-2.32.0.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index 1ac2d4c..d0d3dc6 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,9 +1 @@ -libcamel-1_2-19 -libebackend-1_2-0 -libebook-1_2-10 -libecal-1_2-8 -libedata-book-1_2-8 -libedata-cal-1_2-10 -libedataserver-1_2-14 -libedataserverui-1_2-11 -libegroupwise-1_2-13 +evolution-data-server diff --git a/evolution-data-server-2.31.92.1.tar.bz2 b/evolution-data-server-2.31.92.1.tar.bz2 new file mode 100644 index 0000000..aee4bfd --- /dev/null +++ b/evolution-data-server-2.31.92.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17313717afe5723e0cef8b128cedcb1edfdfc425cb4d9612a499b5b3e747e880 +size 4261525 diff --git a/evolution-data-server-2.32.0.tar.bz2 b/evolution-data-server-2.32.0.tar.bz2 deleted file mode 100644 index 182ae14..0000000 --- a/evolution-data-server-2.32.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31ea1097a7bb1190b4aa51d16ec27b24207cf6421314c9c1320196752f02c0de -size 4269713 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 909ce2c..4ebed8a 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,32 +1,3 @@ -------------------------------------------------------------------- -Mon Oct 11 18:20:14 CEST 2010 - vuntz@opensuse.org - -- Update baselibs.conf after the shared library packaging change. - -------------------------------------------------------------------- -Mon Oct 4 21:53:11 UTC 2010 - dimstar@opensuse.org - -- Apply Shared Library Packaging Policy, create sub-packages: - + libcamel-1_2-19 - + libebackend-1_2-0 - + libebook-1_2-10 - + libecal-1_2-8 - + libedata-book-1_2-8 - + libedata-cal-1_2-10 - + libedataserver-1_2-14 - + libedataserverui-1_2-11 - + libegroupwise-1_2-13 - -------------------------------------------------------------------- -Mon Sep 27 16:36:50 CEST 2010 - vuntz@opensuse.org - -- Update to version 2.32.0: - + Various imapx fixes (bgo#629714, bgo#629726, bgo#629916, - bgo#630135, bgo#630150, bgo#630152). - + Update some files to be LGPLv2. - + Updated translations. -- Change License tags to LGPLv2+, since this is the right license. - ------------------------------------------------------------------- Tue Sep 14 10:10:00 CEST 2010 - dimstar@opensuse.org diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 85160f2..1de4122 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution-data-server (Version 2.32.0) +# spec file for package evolution-data-server (Version 2.31.92.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,18 +18,6 @@ %define USE_EVOLDAP 0 -# Shared Library soNUMs, to make it easier for updates -# When updating the sonums, do not forget to also update baselibs.conf -%define so_camel 19 -%define so_ebackend 0 -%define so_ebook 10 -%define so_ecal 8 -%define so_edata_book 8 -%define so_edata_cal 10 -%define so_edataserver 14 -%define so_edataserverui 11 -%define so_egroupwise 13 - Name: evolution-data-server %define _evo_version 2.32 BuildRequires: bison @@ -39,8 +27,6 @@ BuildRequires: evoldap2-devel %else BuildRequires: openldap2-devel %endif -License: LGPLv2+ -Group: Development/Libraries/GNOME BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gperf @@ -58,6 +44,8 @@ BuildRequires: nss-shared-helper-devel BuildRequires: python-devel BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream +License: GPLv2+ +Group: Development/Libraries/GNOME # bug437293 %ifarch ppc64 Obsoletes: evolution-data-server-64bit @@ -65,18 +53,18 @@ Obsoletes: evolution-data-server-64bit %ifarch %ix86 ppc Obsoletes: evolution-data-server-32bit %endif -Version: 2.32.0 -Release: 1 Summary: Evolution Data Server -Url: http://www.gnome.org +Version: 2.31.92.1 +Release: 1 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2 Source99: baselibs.conf # PATCH-FEATURE-OPENSUSE dice-eds-changes.patch pchenthill@novell.com -- Patch yet to be pushed upstream Patch0: dice-eds-changes.patch +Url: http://www.gnome.org +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: %{name}-lang = %{version} Requires: libsoup >= 2.2.6 Requires: mozilla-nss -Recommends: %{name}-lang = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %USE_EVOLDAP Requires: libevoldap-2_4-2 %endif @@ -86,110 +74,13 @@ Requires: libical0 >= 0.43 Evolution Data Server provides a central location for your address book and calendar in the GNOME Desktop. -%package -n libcamel-1_2-%{so_camel} -Summary: Evolution Data Server - Messaging Library -Group: System/Libraries -%description -n libcamel-1_2-%{so_camel} -Evolution Data Server provides a central location for your address book -and calendar in the GNOME Desktop. - -This package contains a shared system library for messaging. - -%package -n libebackend-1_2-%{so_ebackend} -Summary: Evolution Data Server - Backend Utilities Library -Group: System/Libraries - -%description -n libebackend-1_2-%{so_ebackend} -Evolution Data Server provides a central location for your address book -and calendar in the GNOME Desktop. - -This package contains a shared system library for backends. - -%package -n libebook-1_2-%{so_ebook} -Summary: Evolution Data Server - Address Book Client Library -Group: System/Libraries - -%description -n libebook-1_2-%{so_ebook} -Evolution Data Server provides a central location for your address book -and calendar in the GNOME Desktop. - -This package contains a shared system library to access address books. - -%package -n libecal-1_2-%{so_ecal} -Summary: Evolution Data Server - Calendar Client Library -Group: System/Libraries - -%description -n libecal-1_2-%{so_ecal} -Evolution Data Server provides a central location for your address book -and calendar in the GNOME Desktop. - -This package contains a shared system library to access calendars. - -%package -n libedata-book-1_2-%{so_edata_book} -Summary: Evolution Data Server - Address Book Backend Library -Group: System/Libraries - -%description -n libedata-book-1_2-%{so_edata_book} -Evolution Data Server provides a central location for your address book -and calendar in the GNOME Desktop. - -This package contains a shared system library for address book backends. - -%package -n libedata-cal-1_2-%{so_edata_cal} -Summary: Evolution Data Server - Calendar Backend Library -Group: System/Libraries - -%description -n libedata-cal-1_2-%{so_edata_cal} -Evolution Data Server provides a central location for your address book -and calendar in the GNOME Desktop. - -This package contains a shared system library for calendar backends. - -%package -n libedataserver-1_2-%{so_edataserver} -Summary: Evolution Data Server - Utilities Library -Group: System/Libraries - -%description -n libedataserver-1_2-%{so_edataserver} -Evolution Data Server provides a central location for your address book -and calendar in the GNOME Desktop. - -This package contains a shared system library. - -%package -n libedataserverui-1_2-%{so_edataserverui} -Summary: Evolution Data Server - Graphical Utilities Library -Group: System/Libraries - -%description -n libedataserverui-1_2-%{so_edataserverui} -Evolution Data Server provides a central location for your address book -and calendar in the GNOME Desktop. - -This package contains a shared system library. - -%package -n libegroupwise-1_2-%{so_egroupwise} -Summary: Evolution Data Server - Groupwise Library -Group: System/Libraries - -%description -n libegroupwise-1_2-%{so_egroupwise} -Evolution Data Server provides a central location for your address book -and calendar in the GNOME Desktop. - -This package contains a shared system library for Groupwise support. %package devel -License: LGPLv2+ -Summary: Evolution Data Server - Development Files +License: GPLv2+ +Summary: Evolution Data Server Development Files Group: Development/Libraries/GNOME -Requires: evolution-data-server = %{?epoch:}%{version} -Requires: libcamel-1_2-%{so_camel} = %{version} -Requires: libebackend-1_2-%{so_ebackend} = %{version} -Requires: libebook-1_2-%{so_ebook} = %{version} -Requires: libecal-1_2-%{so_ecal} = %{version} -Requires: libedata-book-1_2-%{so_edata_book} = %{version} -Requires: libedata-cal-1_2-%{so_edata_cal} = %{version} -Requires: libedataserver-1_2-%{so_edataserver} = %{version} -Requires: libedataserverui-1_2-%{so_edataserverui} = %{version} -Requires: libegroupwise-1_2-%{so_egroupwise} = %{version} +Requires: evolution-data-server = %{?epoch:}%{version}-%{release} %if %USE_EVOLDAP Requires: evoldap2-devel %else @@ -202,17 +93,20 @@ libraries, headers, and other files for developing applications which use the Evolution Data Server for storing contact and calendar information. + + %package doc -License: LGPLv2+ -Summary: Evolution Data Server - Developer Documentation +License: GPLv2+ +Summary: Additional Package Documentation for the evolution-data-server Group: Development/Libraries/GNOME Requires: %{name} = %{version} %description doc Evolution Data Server provides a central location for your address book -and calendar in the GNOME Desktop. +and calendar in the GNOME Desktop. This package contains additional +documentation. + -This package contains developer documentation. %lang_package %prep @@ -241,7 +135,7 @@ translation-update-upstream --enable-exchange=yes \ --with-e2k-debug \ --disable-static -%{__make} %{?_smp_mflags} +%{__make} %{?jobs:-j%jobs} %install %{makeinstall} @@ -263,93 +157,25 @@ find %{buildroot} -name '*.la' -type f -delete -print %clean %{__rm} -rf %{buildroot} -%post -n libcamel-1_2-%{so_camel} -p /sbin/ldconfig +%post -p /sbin/ldconfig -%postun -n libcamel-1_2-%{so_camel} -p /sbin/ldconfig - -%post -n libebackend-1_2-%{so_ebackend} -p /sbin/ldconfig - -%postun -n libebackend-1_2-%{so_ebackend} -p /sbin/ldconfig - -%post -n libebook-1_2-%{so_ebook} -p /sbin/ldconfig - -%postun -n libebook-1_2-%{so_ebook} -p /sbin/ldconfig - -%post -n libecal-1_2-%{so_ecal} -p /sbin/ldconfig - -%postun -n libecal-1_2-%{so_ecal} -p /sbin/ldconfig - -%post -n libedata-book-1_2-%{so_edata_book} -p /sbin/ldconfig - -%postun -n libedata-book-1_2-%{so_edata_book} -p /sbin/ldconfig - -%post -n libedata-cal-1_2-%{so_edata_cal} -p /sbin/ldconfig - -%postun -n libedata-cal-1_2-%{so_edata_cal} -p /sbin/ldconfig - -%post -n libedataserver-1_2-%{so_edataserver} -p /sbin/ldconfig - -%postun -n libedataserver-1_2-%{so_edataserver} -p /sbin/ldconfig - -%post -n libedataserverui-1_2-%{so_edataserverui} -p /sbin/ldconfig - -%postun -n libedataserverui-1_2-%{so_edataserverui} -p /sbin/ldconfig - -%post -n libegroupwise-1_2-%{so_egroupwise} -p /sbin/ldconfig - -%postun -n libegroupwise-1_2-%{so_egroupwise} -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc COPYING ChangeLog NEWS TODO -# ui/ subdir is used by libedataserverui -%{_datadir}/evolution-data-server-%{_evo_version}/ -# Category icons that are used by libedataserver -%{_datadir}/pixmaps/evolution-data-server/ +%{_datadir}/evolution-data-server-%{_evo_version} +%{_datadir}/pixmaps/evolution-data-server %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.*.service -%{_libdir}/evolution-data-server-1.2/ -%{_libexecdir}/evolution-data-server/ +%{_libdir}/*.so.* +%{_libdir}/evolution-data-server-1.2 +%{_libexecdir}/evolution-data-server -%files -n libcamel-1_2-%{so_camel} -%defattr(-, root, root) -%{_libdir}/libcamel-1.2.so.%{so_camel}* -%{_libdir}/libcamel-provider-1.2.so.%{so_camel}* - -%files -n libebackend-1_2-%{so_ebackend} -%defattr(-, root, root) -%{_libdir}/libebackend-1.2.so.%{so_ebackend}* - -%files -n libebook-1_2-%{so_ebook} -%defattr(-, root, root) -%{_libdir}/libebook-1.2.so.%{so_ebook}* - -%files -n libecal-1_2-%{so_ecal} -%defattr(-, root, root) -%{_libdir}/libecal-1.2.so.%{so_ecal}* - -%files -n libedata-book-1_2-%{so_edata_book} -%defattr(-, root, root) -%{_libdir}/libedata-book-1.2.so.%{so_edata_book}* - -%files -n libedata-cal-1_2-%{so_edata_cal} -%defattr(-, root, root) -%{_libdir}/libedata-cal-1.2.so.%{so_edata_cal}* - -%files -n libedataserver-1_2-%{so_edataserver} -%defattr(-, root, root) -%{_libdir}/libedataserver-1.2.so.%{so_edataserver}* - -%files -n libedataserverui-1_2-%{so_edataserverui} -%defattr(-, root, root) -%{_libdir}/libedataserverui-1.2.so.%{so_edataserverui}* - -%files -n libegroupwise-1_2-%{so_egroupwise} -%defattr(-, root, root) -%{_libdir}/libegroupwise-1.2.so.%{so_egroupwise}* +%files lang -f evolution-data-server-%{_evo_version}.lang %files devel %defattr(-, root, root) -%{_includedir}/evolution-data-server-%{_evo_version}/ +%{_includedir}/evolution-data-server-%{_evo_version} %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -357,6 +183,4 @@ find %{buildroot} -name '*.la' -type f -delete -print %defattr(-, root, root) %{_datadir}/gtk-doc/html/* -%files lang -f evolution-data-server-%{_evo_version}.lang - %changelog