From 44f3c6eb3814ae433f0e20bd7b611a52f86f9c9916288af2abd3fca9b3118092 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 9 May 2007 22:48:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=7 --- evolution-2.10.0.tar.bz2 | 3 --- evolution-2.10.1.tar.bz2 | 3 +++ evolution.changes | 21 ++++++++++++++++++++ evolution.spec | 43 ++++++++++++++++++++++++++++++---------- 4 files changed, 56 insertions(+), 14 deletions(-) delete mode 100644 evolution-2.10.0.tar.bz2 create mode 100644 evolution-2.10.1.tar.bz2 diff --git a/evolution-2.10.0.tar.bz2 b/evolution-2.10.0.tar.bz2 deleted file mode 100644 index fed8f78..0000000 --- a/evolution-2.10.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46035f6ea64c9310d6f5c9ebe0cdd851e3a3d6748d0e7d545e088dd2682251c7 -size 15525569 diff --git a/evolution-2.10.1.tar.bz2 b/evolution-2.10.1.tar.bz2 new file mode 100644 index 0000000..a4d59d5 --- /dev/null +++ b/evolution-2.10.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d396190136e6322c2ae820993467bf41a8e188f9597ccf00e3411560280b5cda +size 15689020 diff --git a/evolution.changes b/evolution.changes index c5e21c1..21fdc46 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,8 +1,29 @@ +------------------------------------------------------------------- +Wed May 9 15:09:12 CEST 2007 - mauro@novell.com + +- Removed xsltproc-no-net.patch +- Created a small fix in the evolution.spec for not getting xml issues. + ------------------------------------------------------------------- Fri Apr 27 12:32:12 CEST 2007 - sbrabec@suse.cz - Do not call meinproc (#227624). +------------------------------------------------------------------- +Mon Apr 23 10:54:22 CDT 2007 - maw@suse.de + +- Add xsltproc-no-net.patch. + +------------------------------------------------------------------- +Wed Apr 11 10:36:03 CDT 2007 - maw@suse.de + +- Update to version 2.10.1 +- Fixes for bugzilla.gnome.org #343195, #332765, #424795, #352713, + #400241, #415562, #401539, #356523, #426487, #426829, #406933, + #380843, #388789, and #301149 +- Updated translations for the eu, fr, cs, dz, es, da, and gl + locales. + ------------------------------------------------------------------- Fri Mar 30 14:20:52 CEST 2007 - aj@suse.de diff --git a/evolution.spec b/evolution.spec index 64ced9d..4f72587 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.10.0) +# spec file for package evolution (Version 2.10.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,11 +16,13 @@ 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: 9 +Version: 2.10.1 +Release: 1 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 +#Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Source1: summerdance-about2.png Source2: evolution-email.desktop Source3: evolution-addressbook.desktop @@ -50,12 +52,13 @@ 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 Patch92: evo-2.8.2-regression-fix.patch Patch100: abuild.patch +#Patch101: xsltproc-no-net.patch Patch999: build-fixes.diff URL: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -164,11 +167,11 @@ Authors: Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/C and C++ Requires: evolution = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libgnome-devel libgnomeui-devel libbonoboui-devel libnotify-devel evolution-data-server-devel gtkhtml2-devel gail-devel +Requires: evolution-data-server-devel gtkhtml2-devel gail-devel libgnome-devel libgnomeui-devel libbonoboui-devel libnotify-devel libxml2-devel libopenssl-devel 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. @@ -273,7 +276,7 @@ Authors: Chris Toshok %prep -%setup -q +%setup -q #%patch0 %patch1 -p 1 #%patch15 @@ -308,17 +311,19 @@ Authors: #%patch91 # %patch92 %patch100 -p1 +#%patch101 -p1 %patch999 %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 export CFLAGS="$CFLAGS -fstack-protector" %endif +sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in %configure\ --libexecdir=%{_prefix}/lib\ --disable-scrollkeeper\ @@ -333,9 +338,12 @@ export CFLAGS="$CFLAGS -fstack-protector" make %{?jobs:-j%jobs} %install -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT 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 @@ -410,8 +418,9 @@ fi %{_datadir}/gnome/help/evolution/en_GB/*.* %dir %{_datadir}/gnome/help/evolution/en_GB/figures %{_datadir}/gnome/help/evolution/en_GB/figures/*.* +/usr/share/gnome/help/* -%files devel +%files devel %defattr(-,root,root) %{_includedir}/* %{_libdir}/pkgconfig/*.pc @@ -424,8 +433,20 @@ fi %{_libdir}/evolution/*/conduits/*.so %changelog +* Wed May 09 2007 - mauro@novell.com +- Removed xsltproc-no-net.patch +- Created a small fix in the evolution.spec for not getting xml issues. * Fri Apr 27 2007 - sbrabec@suse.cz - Do not call meinproc (#227624). +* Mon Apr 23 2007 - maw@suse.de +- Add xsltproc-no-net.patch. +* Wed Apr 11 2007 - maw@suse.de +- Update to version 2.10.1 +- Fixes for bugzilla.gnome.org #343195, #332765, #424795, #352713, + [#400241], #415562, #401539, #356523, #426487, #426829, #406933, + [#380843], #388789, and #301149 +- Updated translations for the eu, fr, cs, dz, es, da, and gl + locales. * Fri Mar 30 2007 - aj@suse.de - Fix BuildRequires. * Thu Mar 22 2007 - maw@suse.de