OBS User unknown 2007-09-14 14:06:27 +00:00 committed by Git OBS Bridge
parent ab0dde2e70
commit 2fc47e5844
2 changed files with 16 additions and 8 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Sep 14 13:21:29 CEST 2007 - pchenthill@novell.com
- publish-calendar-glade-fix.patch: commenting the patch, since it
does not fix the issue. The fix is present in evolution-2.12 as a
fix for bug 274047.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 13 09:03:31 CEST 2007 - stbinner@suse.de Thu Sep 13 09:03:31 CEST 2007 - stbinner@suse.de

View File

@ -16,9 +16,9 @@ License: GPL v2 or later
Group: Productivity/Networking/Email/Clients Group: Productivity/Networking/Email/Clients
Obsoletes: evoltn Obsoletes: evoltn
Provides: evoltn Provides: evoltn
Autoreqprov: on AutoReqProv: on
Version: 2.11.92 Version: 2.11.92
Release: 3 Release: 5
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
#Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2 #Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
@ -37,7 +37,7 @@ Patch16: evolution-configure.patch
Patch17: evolution-warnings.patch Patch17: evolution-warnings.patch
Patch19: evolution-2.2.0-port-to-pilot-link-0.12.patch Patch19: evolution-2.2.0-port-to-pilot-link-0.12.patch
Patch20: evolution-desktop.patch Patch20: evolution-desktop.patch
Patch23: publish-calendar-glade-fix.patch #Patch23: publish-calendar-glade-fix.patch
Patch24: evolution-morewarnings.patch Patch24: evolution-morewarnings.patch
Patch25: remove-nm-dep.patch Patch25: remove-nm-dep.patch
Patch30: bnc-156353-evo-crash-adding-apt.patch Patch30: bnc-156353-evo-crash-adding-apt.patch
@ -60,7 +60,7 @@ Patch100: abuild.patch
Patch102: evolution-2.11.6.1-cal-busy-recursion.patch Patch102: evolution-2.11.6.1-cal-busy-recursion.patch
Patch999: build-fixes.diff Patch999: build-fixes.diff
Patch1000: evolution-stringcompare.patch Patch1000: evolution-stringcompare.patch
URL: http://gnome.org/projects/evolution/ Url: http://gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: yelp Requires: yelp
Requires: spamassassin >= 2.60 Requires: spamassassin >= 2.60
@ -68,7 +68,6 @@ Requires: gtkhtml2 >= 3.10.0
Requires: evolution-data-server >= 1.6.0 Requires: evolution-data-server >= 1.6.0
Requires: gnome-icon-theme >= 2.10.0 Requires: gnome-icon-theme >= 2.10.0
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
%gconf_schemas_prereq %gconf_schemas_prereq
%description %description
@ -290,7 +289,7 @@ Authors:
# %patch19 -p1 # %patch19 -p1
%endif %endif
%patch20 %patch20
%patch23 #%patch23
%patch24 %patch24
%patch25 %patch25
%patch30 %patch30
@ -360,7 +359,6 @@ cp %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/pixma
cat %{name}.schemas_list >%{name}.lst cat %{name}.schemas_list >%{name}.lst
rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.*a rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.*a
rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
%fdupes $RPM_BUILD_ROOT %fdupes $RPM_BUILD_ROOT
%clean %clean
@ -372,7 +370,6 @@ rm -rf $RPM_BUILD_ROOT
if test -x usr/bin/update-mime-database ; then if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null usr/bin/update-mime-database usr/share/mime >/dev/null
fi fi
%posttrans -f %{name}.schemas_posttrans %posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun %preun -f %{name}.schemas_preun
@ -423,6 +420,10 @@ fi
%{_libdir}/evolution/*/conduits/*.so %{_libdir}/evolution/*/conduits/*.so
%changelog %changelog
* Fri Sep 14 2007 - pchenthill@novell.com
- publish-calendar-glade-fix.patch: commenting the patch, since it
does not fix the issue. The fix is present in evolution-2.12 as a
fix for bug 274047.
* Thu Sep 13 2007 - stbinner@suse.de * Thu Sep 13 2007 - stbinner@suse.de
- fix doc %%lang tagging - moves 8.9MB from main to -lang package - fix doc %%lang tagging - moves 8.9MB from main to -lang package
* Mon Sep 10 2007 - maw@suse.de * Mon Sep 10 2007 - maw@suse.de