Hello community, here is the log from the commit of package evolution checked in at Tue Jan 9 17:43:54 CET 2007. -------- --- GNOME/evolution/evolution.changes 2006-11-21 12:04:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/evolution/evolution.changes 2007-01-09 11:44:02.000000000 +0100 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 9 11:43:53 CET 2007 - sbrabec@suse.cz + +- More spec file cleanups. + +------------------------------------------------------------------- +Wed Dec 13 18:54:47 CST 2006 - maw@suse.de + +- Move to /usr +- Some specfile cleanup. + Old: ---- evolution-2.8.2.tar.gz New: ---- evolution-2.8.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.W14607/_old 2007-01-09 17:43:42.000000000 +0100 +++ /var/tmp/diff_new_pack.W14607/_new 2007-01-09 17:43:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package evolution (Version 2.8.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,9 +11,7 @@ # norootforbuild Name: evolution -BuildRequires: evolution-data-server-devel gnome-common gnome-pilot-devel gtkdoc gtkhtml2-devel intltool kdelibs3-doc libidl libnotify libnotify-devel mDNSResponder-devel mozilla-nss-devel openldap2 perl-XML-Parser python-devel scrollkeeper update-desktop-files -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} +BuildRequires: evolution-data-server-devel gnome-common gnome-icon-theme-devel gnome-pilot-devel gtk-doc gtkhtml2-devel intltool kdelibs3-doc libidl libnotify libnotify-devel mDNSResponder-devel mozilla-nss-devel openldap2 perl-XML-Parser python-devel scrollkeeper update-desktop-files License: GNU General Public License (GPL) Group: Productivity/Networking/Email/Clients Obsoletes: evoltn @@ -21,9 +19,9 @@ Autoreqprov: on Obsoletes: bonobo-conf Version: 2.8.2 -Release: 2 +Release: 5 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite -Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.8/%{name}-%{version}.tar.gz +Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.8/%{name}-%{version}.tar.bz2 Source1: summerdance-about2.png Source2: evolution-email.desktop Source3: evolution-addressbook.desktop @@ -61,13 +59,14 @@ Patch999: build-fixes.diff URL: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: filesystem gconf2 shared-mime-info Requires: yelp Requires: spamassassin >= 2.60 Requires: gtkhtml2 >= 3.10.0 Requires: evolution-data-server >= 1.6.0 Requires: gnome-icon-theme >= 2.10.0 +%gconf_schemas_prereq + %description Evolution consists of modular components (at the moment: mailer, calendar, and address book) that should make daily life easier. Because @@ -307,122 +306,108 @@ %patch999 %build -autoconf -aclocal -automake --add-missing +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" %if %suse_version > 1000 -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector" +export CFLAGS="$CFLAGS -fstack-protector" %endif -CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing -DLDAP_DEPRECATED" \ -./configure --with-gnome=/opt/gnome --prefix=%{prefix} \ - --libdir=%{prefix}/%_lib \ - --libexecdir=%{prefix}/%_lib \ - --sysconfdir=%{sysconfdir} \ - --with-openldap \ - --with-pisock --enable-pilot-conduits=yes \ - --with-krb5=/usr \ - --with-static-ldap=no \ - --enable-nss=yes \ - --enable-ipv6=yes \ - --enable-default-binary \ - --enable-exchange=yes \ - --disable-gtk-doc - -#(cd addressbook/gui/component/select-names/; make Evolution-Addressbook-SelectNames.h) +%configure\ + --libexecdir=%{_prefix}/lib\ + --disable-scrollkeeper\ + --with-openldap\ + --with-pisock\ + --enable-pilot-conduits=yes\ + --with-krb5=/usr\ + --with-static-ldap=no\ + --enable-nss=yes\ + --enable-ipv6=yes\ + --enable-default-binary=yes make %{?jobs:-j%jobs} %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -# Remove the groupwise camel provider -#rm -f $RPM_BUILD_ROOT%{prefix}/%_lib/evolution/*/camel-providers/*groupwise* -#mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema/ -#cp addressbook/backend/pas/evolutionperson.schema \ -# $RPM_BUILD_ROOT/etc/openldap/schema/evolutionperson.schema -#cp addressbook/backend/pas/evolutionperson.schema \ -# $RPM_BUILD_ROOT/etc/openldap/schema/evolutionperson.schema.default -#rm $RPM_BUILD_ROOT%{prefix}/share/evolution/*/evolutionperson.schema -cp %{SOURCE1} $RPM_BUILD_ROOT/opt/gnome/share/evolution/*/images/about-box.png +cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/*/images/about-box.png %suse_update_desktop_file -G "Mail and Calendar" evolution Core-Office -for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/evolution-*/*/evolution-*.xml; do +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/opt/gnome/share/applications/ +cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/applications/ %suse_update_desktop_file -G "Mail" -D "evolution-2.8/evolution-2.8.xml?usage-mail" evolution-email %suse_update_desktop_file -G "Address Book" -D "evolution-2.8/evolution-2.8.xml?usage-contact" evolution-addressbook %suse_update_desktop_file -G "Schedule Manager" -D "evolution-2.8/evolution-2.8.xml?usage-calendar" evolution-calendar %suse_update_desktop_file -G "Task List" -D "evolution-2.8/evolution-2.8.xml?usage-calendar-todo" evolution-tasklist -mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/pixmaps/ -cp %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT/opt/gnome/share/pixmaps/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps +cp %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ %find_lang evolution-2.8 - -%post -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/apps_evolution_addressbook-*.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/apps_evolution_calendar-*.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/apps_evolution_shell-*.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/evolution-mail-*.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/apps-evolution-mail-prompts-checkdefault-2.8.schemas >/dev/null +%find_gconf_schemas +cat evolution-2.8.lang %{name}.schemas_list >%{name}.lst +# FIXME: Modules should be unversioned +rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/*.so +rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/*.*a $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.*a +rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info %clean rm -rf $RPM_BUILD_ROOT -%files -f evolution-2.8.lang +%pre -f %{name}.schemas_pre + +%post +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi + +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun + +%postun +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi + +%files -f %{name}.lst %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS NEWS-1.0 README -%{sysconfdir}/gconf/schemas/apps_evolution_addressbook-*.schemas -%{sysconfdir}/gconf/schemas/apps_evolution_calendar-*.schemas -%{sysconfdir}/gconf/schemas/apps_evolution_shell-*.schemas -%{sysconfdir}/gconf/schemas/evolution-mail-*.schemas -%{sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-2.8.schemas -%{prefix}/bin/* -%{prefix}/%_lib/bonobo/servers/*.server -%dir %{prefix}/%_lib/evolution -%dir %{prefix}/%_lib/evolution/* -#%dir %{prefix}/%_lib/evolution/*/camel* -%dir %{prefix}/%_lib/evolution/*/components -#%dir %{prefix}/%_lib/evolution/*/evolution-*-importers -%{prefix}/%_lib/evolution/*/csv2vcard -%{prefix}/%_lib/evolution/*/evolution-addressbook-clean -%{prefix}/%_lib/evolution/*/evolution-addressbook-export -%{prefix}/%_lib/evolution/*/evolution-alarm-notify -#%{prefix}/%_lib/evolution/*/camel/camel-* -%{prefix}/%_lib/evolution/*/k* -%{prefix}/%_lib/evolution/*/*.so.* -#%{prefix}/%_lib/evolution/*/*/*.urls -#%{prefix}/%_lib/evolution/*/*/*.so -%{prefix}/%_lib/evolution/*/components/*.so -#%{prefix}/%_lib/evolution/evolution-*-importers/*.so -%{prefix}/%_lib/evolution/*/plugins/*.so -%dir %{prefix}/%_lib/evolution/2.8/plugins -%dir %{prefix}/%_lib/evolution/2.8/plugins/*.eplug -%dir %{prefix}/%_lib/evolution/2.8/plugins/*.xml -#%{prefix}/%_lib/evolution/2.6/evolution-addressbook-importers -%{prefix}/share/applications/*.desktop -%{prefix}/share/evolution -# already in find_lang -#%{prefix}/share/gnome/help/* -%{prefix}/share/idl/* -%{prefix}/share/mime-info/*.* -%{prefix}/share/omf/* -%{prefix}/share/pixmaps/*.png +%{_bindir}/* +%{_datadir}/applications/*.desktop +%{_datadir}/evolution +%{_datadir}/idl/* +%{_datadir}/omf/* +%{_datadir}/pixmaps/*.png +%{_libdir}/bonobo/servers/*.server +%dir %{_libdir}/evolution +%dir %{_libdir}/evolution/* +%{_libdir}/evolution/*/lib* +%{_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 %files devel %defattr(-,root,root) -%{prefix}/include/* -%dir %{prefix}/%_lib/evolution/2.8/conduits -%{prefix}/%_lib/evolution/*/*.so -%{prefix}/%_lib/evolution/*/*.*a -%{prefix}/%_lib/evolution/*/*/*.*a -%{prefix}/%_lib/pkgconfig/*.pc +%{_includedir}/* +%{_libdir}/pkgconfig/*.pc %files pilot %defattr(-,root,root) -%{prefix}/%_lib/evolution/*/conduits/*.so -%{prefix}/share/gnome-pilot/conduits/*.conduit +%{_datadir}/gnome-pilot/conduits/*.conduit +%{_libdir}/evolution/*/conduits/*.so %changelog -n evolution +* Tue Jan 09 2007 - sbrabec@suse.cz +- More spec file cleanups. +* Wed Dec 13 2006 - maw@suse.de +- Move to /usr +- Some specfile cleanup. * Tue Nov 21 2006 - vvaradhan@novell.com - Build break fix - evo-2.8.2-build-break.fix added - Regression fix - evo-2.8.2-regression-fix.patch added ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org