Accepting request 49799 from home:vuntz:branches:GNOME:Factory

Hmmm. should I accept it or you? I wrote it (mostly), you submitted it fixed... so I think we're both fine with it.

OBS-URL: https://build.opensuse.org/request/show/49799
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=81
This commit is contained in:
Dominique Leuenberger 2010-10-06 14:07:17 +00:00 committed by Git OBS Bridge
parent 6d60497f3f
commit 2885f56c47
2 changed files with 213 additions and 24 deletions

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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

View File

@ -18,6 +18,17 @@
%define USE_EVOLDAP 0
# Shared Library soNUMs, to make it easier for updates
%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
@ -27,6 +38,8 @@ BuildRequires: evoldap2-devel
%else
BuildRequires: openldap2-devel
%endif
License: LGPLv2+
Group: Development/Libraries/GNOME
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gperf
@ -44,8 +57,6 @@ BuildRequires: nss-shared-helper-devel
BuildRequires: python-devel
BuildRequires: sqlite3-devel
BuildRequires: translation-update-upstream
License: LGPLv2+
Group: Development/Libraries/GNOME
# bug437293
%ifarch ppc64
Obsoletes: evolution-data-server-64bit
@ -53,18 +64,18 @@ Obsoletes: evolution-data-server-64bit
%ifarch %ix86 ppc
Obsoletes: evolution-data-server-32bit
%endif
Summary: Evolution Data Server
Version: 2.32.0
Release: 1
Summary: Evolution Data Server
Url: http://www.gnome.org
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
@ -74,13 +85,110 @@ 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
Summary: Evolution Data Server - Development Files
Group: Development/Libraries/GNOME
Requires: evolution-data-server = %{?epoch:}%{version}-%{release}
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}
%if %USE_EVOLDAP
Requires: evoldap2-devel
%else
@ -93,20 +201,17 @@ 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: Additional Package Documentation for the evolution-data-server
Summary: Evolution Data Server - Developer Documentation
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. This package contains additional
documentation.
and calendar in the GNOME Desktop.
This package contains developer documentation.
%lang_package
%prep
@ -135,7 +240,7 @@ translation-update-upstream
--enable-exchange=yes \
--with-e2k-debug \
--disable-static
%{__make} %{?jobs:-j%jobs}
%{__make} %{?_smp_mflags}
%install
%{makeinstall}
@ -157,25 +262,93 @@ find %{buildroot} -name '*.la' -type f -delete -print
%clean
%{__rm} -rf %{buildroot}
%post -p /sbin/ldconfig
%post -n libcamel-1_2-%{so_camel} -p /sbin/ldconfig
%postun -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
%files
%defattr(-,root,root)
%doc COPYING ChangeLog NEWS TODO
%{_datadir}/evolution-data-server-%{_evo_version}
%{_datadir}/pixmaps/evolution-data-server
# 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}/dbus-1/services/org.gnome.evolution.dataserver.*.service
%{_libdir}/*.so.*
%{_libdir}/evolution-data-server-1.2
%{_libexecdir}/evolution-data-server
%{_libdir}/evolution-data-server-1.2/
%{_libexecdir}/evolution-data-server/
%files lang -f evolution-data-server-%{_evo_version}.lang
%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 devel
%defattr(-, root, root)
%{_includedir}/evolution-data-server-%{_evo_version}
%{_includedir}/evolution-data-server-%{_evo_version}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
@ -183,4 +356,6 @@ 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