Hello community, here is the log from the commit of package evolution checked in at Mon Nov 3 12:03:51 CET 2008. -------- --- GNOME/evolution/evolution.changes 2008-10-31 15:54:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/evolution/evolution.changes 2008-11-03 09:16:57.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 3 10:18:56 IST 2008 - msuman@suse.de + +- Clean up the spec file to use proper RPM macros. +- Archive the SUSE specific desktop and pixmap files, unclutter the + source list. +- Do not use a custom libexec directory. It serves no purpose. +- Removed the following patches: + + evolution-2.0.1-de-po.patch - fixed upstream + + evolution-2.2.0-port-to-pilot-link-0.12.patch - fixed upstream + + evolution-morewarnings.patch - not required + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- evolution-2.0.1-de-po.patch evolution-2.2.0-port-to-pilot-link-0.12.patch evolution-addressbook.desktop evolution-calendar.desktop evolution-email.desktop evolution-morewarnings.patch evolution-tasklist.desktop ximian-evolution-addressbook.png ximian-evolution-calendar.png ximian-evolution-email.png ximian-evolution-tasks.png New: ---- evolution-desktop-files.tar.bz2 ximian-evolution-pixmaps.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.ZD7646/_old 2008-11-03 12:01:52.000000000 +0100 +++ /var/tmp/diff_new_pack.ZD7646/_new 2008-11-03 12:01:52.000000000 +0100 @@ -53,35 +53,23 @@ BuildRequires: libpst-devel License: GPL v2 or later Group: Productivity/Networking/Email/Clients -#This should be updated upon major version changes; it should match -# BASE_VERSION as defined in configure.in. +# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 2.24 Version: 2.24.1 -Release: 2 +Release: 3 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source0: %{name}-%{version}.tar.bz2 Source1: summerdance-about2.png -Source2: evolution-email.desktop -Source3: evolution-addressbook.desktop -Source4: evolution-calendar.desktop -Source5: evolution-tasklist.desktop -Source6: ximian-evolution-email.png -Source7: ximian-evolution-addressbook.png -Source8: ximian-evolution-calendar.png -Source9: ximian-evolution-tasks.png -# PATCH-NEEDS-REBASE evolution-2.0.1-de-po.patch -- Somebody who speaks German well should comment on this. -Patch1: evolution-2.0.1-de-po.patch -# PATCH-FIX-UPSTREAM evolution-2.2.0-port-to-pilot-link-0.12.patch -- Upstream has the patch already. -Patch3: evolution-2.2.0-port-to-pilot-link-0.12.patch +Source2: evolution-desktop-files.tar.bz2 +Source3: ximian-evolution-pixmaps.tar.bz2 Patch4: evolution-desktop.patch -Patch5: evolution-morewarnings.patch Patch6: remove-nm-dep.patch # PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number Patch7: calendar-sendbutton.patch Patch8: fix-exchange-menuitem.diff Patch9: fix-sendrecv.diff Patch13: pst-import.patch -# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in /usr/lib/evoldap/include +# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include Patch15: evolution-custom-openldap-includes.patch # PATCH-FEATURE-OPENSUSE evolution-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database. Patch16: evolution-shared-nss-db.patch @@ -195,7 +183,15 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: evolution = %{?epoch:}%{version}-%{release} -Requires: evolution-data-server-devel gtkhtml2-devel gail-devel libgnome-devel libgnomeui-devel libbonoboui-devel libnotify-devel libxml2-devel libopenssl-devel +Requires: evolution-data-server-devel +Requires: gtkhtml2-devel +Requires: gail-devel +Requires: libbonoboui-devel +Requires: libgnome-devel +Requires: libgnomeui-devel +Requires: libnotify-devel +Requires: libopenssl-devel +Requires: libxml2-devel Provides: evolution2-devel Obsoletes: evolution2-devel @@ -307,13 +303,7 @@ %lang_package %prep %setup -q -# %patch1 -p0 -%if %suse_version > 1000 -# FIXME: somebody with time should fix this patch up and make it apply once more -# %patch3 -p1 -%endif %patch4 -%patch5 %patch6 # %patch7 %patch8 @@ -325,20 +315,11 @@ %build autoreconf -f -i -# FIXME: Build as root modifies system! -# evolution-2.8.2: --disable-scrollkeeper does not work properly. -# needed for evolution-2.8.2: -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%if %suse_version > 1000 -export CFLAGS="$CFLAGS -fstack-protector" -export CXXFLAGS="$CXXFLAGS -fstack-protector" -export FFLAGS="$FFLAGS -fstack-protector" -%endif -sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in -%configure \ - --libexecdir=%{_prefix}/lib \ +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" +export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" +%{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in +%{configure} \ --disable-scrollkeeper \ %if %suse_version > 1100 --with-openldap=%{_libdir}/evoldap \ @@ -352,35 +333,36 @@ --enable-nss=yes \ --enable-ipv6=yes \ --enable-default-binary=yes -# Processing the files in help uses _lots_ of memory, so running that part -# in parallel is bad. +# Processing the files in help uses _lots_ of memory, so running that part in parallel is bad. pushd help -make +%{__make} popd -make %{?jobs:-j%jobs} +%{__make} %{?jobs:-j%jobs} %install -make install DESTDIR=$RPM_BUILD_ROOT -cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/%evolution_base_version/images/about-box.png +%{__make} DESTDIR=$RPM_BUILD_ROOT install +%{__cp} %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/%evolution_base_version/images/about-box.png %suse_update_desktop_file -G "Mail and Calendar" evolution Core-Office for xml in $RPM_BUILD_ROOT/%{_datadir}/gnome/help/evolution-*/*/evolution-*.xml; do meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || : done -cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/applications/ +# Install and update the SUSE desktop files. +%{__tar} --bzip2 -xf %{SOURCE2} -C $RPM_BUILD_ROOT/%{_datadir}/applications/ %suse_update_desktop_file -G "Mail" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-mail" evolution-email %suse_update_desktop_file -G "Address Book" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-contact" evolution-addressbook %suse_update_desktop_file -G "Schedule Manager" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-calendar" evolution-calendar %suse_update_desktop_file -G "Task List" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-calendar-todo" evolution-tasklist -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps -cp %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ +# Install the Ximian pixmaps. +%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/pixmaps +%{__tar} --bzip2 -xf %{SOURCE3} -C $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ %find_lang evolution-%evolution_base_version %find_lang evolution evolution-%evolution_base_version.lang %find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst -#rm $RPM_BUILD_ROOT/%{_libdir}/*.*a -rm $RPM_BUILD_ROOT//%{_libdir}/evolution/*/*.*a -rm $RPM_BUILD_ROOT//%{_libdir}/evolution/*/*/*.*a -rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info +%{__cat} %{name}.schemas_list >%{name}.lst +#%{__rm} $RPM_BUILD_ROOT/%{_libdir}/*.*a +%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*.*a +%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*/*.*a +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mime-info %fdupes $RPM_BUILD_ROOT %if %suse_version > 1100 %{__mv} $RPM_BUILD_ROOT/%{_bindir}/evolution $RPM_BUILD_ROOT/%{_bindir}/evolution.bin @@ -389,7 +371,7 @@ %endif %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre @@ -422,15 +404,10 @@ %dir %{_libdir}/evolution/* %{_libdir}/evolution/*/*.so.* %{_libdir}/evolution/*/components -%dir %{_libdir}/evolution/*/conduits %{_libdir}/evolution/*/plugins -%if "%{_libdir}" != "%{_prefix}/lib" -%dir %{_prefix}/lib/evolution -%dir %{_prefix}/lib/evolution/* -%endif -%{_prefix}/lib/evolution/*/csv2vcard -%{_prefix}/lib/evolution/*/evolution-* -%{_prefix}/lib/evolution/*/killev +%{_libdir}/evolution/*/csv2vcard +%{_libdir}/evolution/*/evolution-* +%{_libdir}/evolution/*/killev %files lang -f evolution-%evolution_base_version.lang @@ -443,9 +420,18 @@ %files pilot %defattr(-,root,root) %{_datadir}/gnome-pilot/conduits/*.conduit -%{_libdir}/evolution/*/conduits/*.so +%{_libdir}/evolution/*/conduits %changelog +* Mon Nov 03 2008 msuman@suse.de +- Clean up the spec file to use proper RPM macros. +- Archive the SUSE specific desktop and pixmap files, unclutter the + source list. +- Do not use a custom libexec directory. It serves no purpose. +- Removed the following patches: + + evolution-2.0.1-de-po.patch - fixed upstream + + evolution-2.2.0-port-to-pilot-link-0.12.patch - fixed upstream + + evolution-morewarnings.patch - not required * Fri Oct 31 2008 msuman@suse.de - Invoke the binaries from a script which sets the library path for picking the LDAP libraries. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org