Hello community, here is the log from the commit of package evolution-data-server checked in at Sun Oct 26 00:46:16 CEST 2008. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2008-10-24 09:02:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/evolution-data-server/evolution-data-server.changes 2008-10-25 21:40:58.000000000 +0200 @@ -1,0 +2,14 @@ +Sat Oct 25 22:07:50 IST 2008 - msuman@suse.de + +- Use evoldap2-client only for SUSE versions above 11.0, fallback to + openldap2-client for the older versions. +- Use proper RPM macros in the spec file, clean up spec file to reduce the + number of warnings generated by rpmlint. +- Dropped the following patches: + + evolution-data-server-configure.patch - not required anymore. + + bnc-164367-gw-attachments-appts-throw-error.patch. Fixed upstream. + + bgo-530514-check-to-handle-specific-server-response.diff. Fixed upstream. + + libgnomeui-dep.patch - not required anymore, SUSE has moved away from + /opt/gnome + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bgo-530514-check-to-handle-specific-server-response.diff bnc-164367-gw-attachments-appts-throw-error.patch evolution-data-server-configure.patch libgnomeui-dep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.F27314/_old 2008-10-26 00:43:05.000000000 +0200 +++ /var/tmp/diff_new_pack.F27314/_new 2008-10-26 00:43:05.000000000 +0200 @@ -34,39 +34,38 @@ BuildRequires: libidl-devel BuildRequires: libsoup-devel BuildRequires: mozilla-nss-devel -BuildRequires: evoldap2-devel BuildRequires: perl-XML-Parser BuildRequires: python-devel BuildRequires: sgml-skel BuildRequires: sqlite3-devel +%if %suse_version > 1100 +BuildRequires: evoldap2-devel +%else +BuildRequires: openldap2-devel +%endif License: GPL v2 or later Group: Development/Libraries/GNOME AutoReqProv: on Summary: Evolution Data Server Version: 2.24.1 -Release: 1 +Release: 2 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.24/%{name}-%{version}.tar.bz2 -Patch0: evolution-data-server-configure.patch -# PATCH-NEEDS-REBASE bnc-164367-gw-attachments-appts-throw-error.patch bnc164367 -- was PATCH-FIX-UPSTREAM, and may be droppable -Patch1: bnc-164367-gw-attachments-appts-throw-error.patch # PATCH-FIX-UPSTREAM evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo. Patch3: evolution-data-server-1.11.5-cert-auth-complete.patch # PATCH-FIX-UPSTREAM bnc-304835-ex-crash-after-restart.patch bnc304835 bgo253574 -- Fix has been submitted to bgo. Patch4: bnc-304835-ex-crash-after-restart.patch # PATCH-FIX-UPSTREAM bnc-307861-calendar-auth.diff -- bnc307861 bgo253574 -- Fix has been submitted to bgo. Patch5: bnc-307861-calendar-auth.diff -# PATCH-FIX-UPSTREAM bgo-530514-check-to-handle-specific-server-response.diff bgo530514 psankar@suse.de -- Fix is in upstream svn from 2.22.2 -Patch9: bgo-530514-check-to-handle-specific-server-response.diff -# Change patch below if we move away from /opt/gnome -# PATCH-FIX-OPENSUSE libgnomeui-dep.patch -- It avoids a build dependency on libgnomeui to speed up bootstrap -Patch99: libgnomeui-dep.patch # This patch contains changes in the core code base for the MAPI provider. Patch100: eds-core-mapi-changes.diff Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libsoup >= 2.2.6 mozilla-nss Requires: %{name}-lang = %{version} +Requires: libsoup >= 2.2.6 +Requires: mozilla-nss +%if %suse_version > 1100 Requires: evoldap2-devel +%endif %description Evolution Data Server provides a central location for your address book @@ -79,14 +78,26 @@ Summary: Evolution Data Server Development Files Group: Development/Libraries/GNOME Requires: evolution-data-server = %{?epoch:}%{version}-%{release} -Requires: libgpg-error-devel libsoup-devel libbonobo-devel libgnome-devel gnome-vfs2-devel libxml2-devel orbit2-devel evoldap2-devel libglade2-devel -Requires: gtk2-devel gconf2-devel glib2-devel gnome-keyring-devel gnome-certauth-devel -Requires: sqlite3-devel -%if %suse_version >= 930 +Requires: gconf2-devel +Requires: glib2-devel +Requires: gnome-certauth-devel +Requires: gnome-keyring-devel +Requires: gnome-vfs2-devel +Requires: gtk2-devel Requires: krb5-devel -%endif -%if %suse_version >= 1000 +Requires: libbonobo-devel Requires: libcom_err +Requires: libglade2-devel +Requires: libgnome-devel +Requires: libgpg-error-devel +Requires: libsoup-devel +Requires: libxml2-devel +Requires: orbit2-devel +Requires: sqlite3-devel +%if %suse_version > 1100 +Requires: evoldap2-devel +%else +Requires: openldap2-devel %endif %description devel @@ -113,45 +124,39 @@ %lang_package %prep %setup -q -%patch0 -# %patch1 ###%patch3 ###%patch4 ###%patch5 -%patch9 -%patch99 %patch100 -p1 %build -intltoolize --force --copy -# should use autoreconf, but libdb is broken -libtoolize --force --copy -aclocal -autoconf -automake -a -autoheader -(cd calendar/libical; autoreconf -fi) -# needed for evolution-data-server-2.22.0: export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure \ - --libexecdir=%{_prefix}/lib/evolution-data-server \ +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%{configure} \ + --libexecdir=%{_libdir}/evolution-data-server \ +%if %suse_version > 1100 --with-openldap=%{_libdir}/evoldap \ - --with-krb5=/usr \ - --with-krb4=/usr \ +%else + --with-openldap=yes \ +%endif + --with-krb5=%{_prefix} \ + --with-krb4=%{_prefix} \ --enable-gnome-keyring \ --enable-gtk-doc \ + --enable-ipv6=yes \ --enable-ssl -make %{?jobs:-j%jobs} +%{__make} %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install +%{__make} DESTDIR=$RPM_BUILD_ROOT install %find_lang evolution-data-server-2.24 -rm $RPM_BUILD_ROOT/%{_libdir}/*.*a -rm $RPM_BUILD_ROOT/%{_libdir}/*/*/*.*a +%{__rm} $RPM_BUILD_ROOT/%{_libdir}/*.*a +%{__rm} $RPM_BUILD_ROOT/%{_libdir}/*/*/*.*a %fdupes $RPM_BUILD_ROOT %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig @@ -165,7 +170,7 @@ %{_datadir}/pixmaps/evolution-data-server %{_libdir}/*.so.* %{_libdir}/bonobo/servers/* -%{_prefix}/lib/evolution-data-server +%{_libdir}/evolution-data-server %{_libdir}/evolution-data-server-1.2 %files lang -f evolution-data-server-2.24.lang @@ -181,6 +186,17 @@ %{_datadir}/gtk-doc/html/* %changelog +* Sat Oct 25 2008 msuman@suse.de +- Use evoldap2-client only for SUSE versions above 11.0, fallback to + openldap2-client for the older versions. +- Use proper RPM macros in the spec file, clean up spec file to reduce the + number of warnings generated by rpmlint. +- Dropped the following patches: + + evolution-data-server-configure.patch - not required anymore. + + bnc-164367-gw-attachments-appts-throw-error.patch. Fixed upstream. + + bgo-530514-check-to-handle-specific-server-response.diff. Fixed upstream. + + libgnomeui-dep.patch - not required anymore, SUSE has moved away from + /opt/gnome * Fri Oct 24 2008 msuman@suse.de - Update to version 2.24.1 + Bugs fixed: bgo#337479, bgo#364542, bgo#497928, bgo#511947, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org