From 0096f84f1c4af7e0b46bd8af8d6987bf7bb8c3e53f6fc6fb785e01121ecf755f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 27 Apr 2007 14:43:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=6 --- evolution.changes | 5 +++++ evolution.spec | 22 ++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/evolution.changes b/evolution.changes index b92d6c0..c5e21c1 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 27 12:32:12 CEST 2007 - sbrabec@suse.cz + +- Do not call meinproc (#227624). + ------------------------------------------------------------------- Fri Mar 30 14:20:52 CEST 2007 - aj@suse.de diff --git a/evolution.spec b/evolution.spec index f63d4ff..64ced9d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -11,15 +11,14 @@ # norootforbuild Name: evolution -BuildRequires: bison evolution-data-server-devel gnome-common gnome-doc-utils-devel gnome-icon-theme-devel gnome-pilot-devel gtk-doc gtkhtml2-devel intltool kdelibs3-doc libidl libnotify libnotify-devel mozilla-nss-devel notification-daemon openldap2 perl-XML-Parser psmisc python-devel scrollkeeper update-desktop-files +BuildRequires: bison evolution-data-server-devel gnome-common gnome-doc-utils-devel gnome-icon-theme-devel gnome-pilot-devel gtk-doc gtkhtml2-devel intltool libidl libnotify libnotify-devel mozilla-nss-devel notification-daemon openldap2 perl-XML-Parser psmisc python-devel scrollkeeper update-desktop-files License: GNU General Public License (GPL) Group: Productivity/Networking/Email/Clients Obsoletes: evoltn Provides: evoltn -Autoreqprov: on Obsoletes: bonobo-conf Version: 2.10.0 -Release: 3 +Release: 9 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.8/%{name}-%{version}.tar.bz2 Source1: summerdance-about2.png @@ -51,7 +50,7 @@ Patch66: fix-sendrecv.diff Patch69: bnc-339266-evo-folder-size-offline.diff Patch71: bnc-167638.patch Patch78: bnc-173186.patch -Patch88: bnc-178778-evo-open-appt-crash.diff +Patch88: bnc-178778-evo-open-appt-crash.diff Patch89: bnc-214647-add-prefer-plain-plugin.patch Patch90: fix-security-gtkhtml-moreui.diff Patch91: evo-2.8.2-build-break.fix @@ -169,7 +168,7 @@ Requires: libgnome-devel libgnomeui-devel libbonoboui-devel libnotify-deve Provides: evolution2-devel Obsoletes: evolution2-devel -%description devel +%description devel This package contains all necessary include files and libraries needed to develop applications that require these. @@ -274,7 +273,7 @@ Authors: Chris Toshok %prep -%setup -q +%setup -q #%patch0 %patch1 -p 1 #%patch15 @@ -314,7 +313,7 @@ Authors: %build autoreconf -f -i # FIXME: Build as root modifies system! -# evolution-2.8.2: --disable-scrollkeeper does not work properly. +# 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 @@ -334,12 +333,9 @@ export CFLAGS="$CFLAGS -fstack-protector" make %{?jobs:-j%jobs} %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/2.10/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/ %suse_update_desktop_file -G "Mail" -D "evolution-2.10/evolution-2.10.xml?usage-mail" evolution-email %suse_update_desktop_file -G "Address Book" -D "evolution-2.10/evolution-2.10.xml?usage-contact" evolution-addressbook @@ -415,7 +411,7 @@ fi %dir %{_datadir}/gnome/help/evolution/en_GB/figures %{_datadir}/gnome/help/evolution/en_GB/figures/*.* -%files devel +%files devel %defattr(-,root,root) %{_includedir}/* %{_libdir}/pkgconfig/*.pc @@ -428,6 +424,8 @@ fi %{_libdir}/evolution/*/conduits/*.so %changelog +* Fri Apr 27 2007 - sbrabec@suse.cz +- Do not call meinproc (#227624). * Fri Mar 30 2007 - aj@suse.de - Fix BuildRequires. * Thu Mar 22 2007 - maw@suse.de