rpms/evolution/F-13 .cvsignore, 1.136, 1.137 evolution.spec, 1.457, 1.458 sources, 1.136, 1.137 evolution-2.30.1.2-alarm-notify-icons.patch, 1.1, NONE evolution-2.30.1.2-mail-browser-crash.patch, 1.1, NONE evolution-2.30.1.2-missing-shortcut.patch, 1.1, NONE evolution-2.30.1.2-notjunk-icon.patch, 1.1, NONE evolution-2.30.1.2-quietly-close-drafts.patch, 1.1, NONE
Milan Crha
mcrha at fedoraproject.org
Mon Jun 21 08:26:43 UTC 2010
Author: mcrha
Update of /cvs/pkgs/rpms/evolution/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28434
Modified Files:
.cvsignore evolution.spec sources
Removed Files:
evolution-2.30.1.2-alarm-notify-icons.patch
evolution-2.30.1.2-mail-browser-crash.patch
evolution-2.30.1.2-missing-shortcut.patch
evolution-2.30.1.2-notjunk-icon.patch
evolution-2.30.1.2-quietly-close-drafts.patch
Log Message:
* Mon Jun 21 2010 Milan Crha <mcrha at redhat.com> - 2.30.2-1.fc13
- Update to 2.30.2
- Remove patch to fix the giant "mail-mark-notjunk" icon (fixed upstream)
- Remove patch for RH bug #588004 (fixed upstream)
- Remove patch for RH bug #590373 (fixed upstream)
- Remove patch for GNOME bug #618400 (fixed upstream)
- Remove patch for GNOME bug #618902 (fixed upstream)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-13/.cvsignore,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- .cvsignore 27 Apr 2010 14:45:09 -0000 1.136
+++ .cvsignore 21 Jun 2010 08:26:42 -0000 1.137
@@ -1 +1 @@
-evolution-2.30.1.2.tar.bz2
+evolution-2.30.2.tar.bz2
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-13/evolution.spec,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -p -r1.457 -r1.458
--- evolution.spec 28 May 2010 21:06:12 -0000 1.457
+++ evolution.spec 21 Jun 2010 08:26:43 -0000 1.458
@@ -6,7 +6,7 @@
%define gnome_icon_theme_version 2.19.91
%define gnome_pilot_version 2.0.16
%define gtk2_version 2.18.0
-%define gtkhtml_version 3.30.0
+%define gtkhtml_version 3.30.2
%define intltool_version 0.35.5
%define last_libgal2_version 2:2.5.3-2
%define libgweather_version 2.25.4
@@ -38,14 +38,14 @@
### Abstract ###
Name: evolution
-Version: 2.30.1
-Release: 8%{?dist}
+Version: 2.30.2
+Release: 1%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
URL: http://projects.gnome.org/evolution/
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}.2-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.2.tar.bz2
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
Obsoletes: libgal2 <= %{last_libgal2_version}
@@ -62,24 +62,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir
# RH bug #176400
Patch12: evolution-2.9.1-im-context-reset.patch
-# Fixes the giant "mail-mark-notjunk" icon.
-Patch13: evolution-2.30.1.2-notjunk-icon.patch
-
# RH bug #589555
Patch14: evolution-2.30.1-help-contents.patch
-# RH bug #588004 / GNOME bug #618113
-Patch15: evolution-2.30.1.2-alarm-notify-icons.patch
-
-# GNOME bug #618902
-Patch16: evolution-2.30.1.2-mail-browser-crash.patch
-
-# GNOME bug #618400
-Patch17: evolution-2.30.1.2-missing-shortcut.patch
-
-# RH bug #590373 / GNOME bug #599794
-Patch18: evolution-2.30.1.2-quietly-close-drafts.patch
-
## Dependencies ###
Requires(pre): GConf2
@@ -241,16 +226,11 @@ This package contains the plugin to impo
%endif
%prep
-%setup -q -n evolution-%{version}.2
+%setup -q -n evolution-%{version}
%patch10 -p1 -b .ldaphack
%patch11 -p1 -b .fix-conduit-dir
%patch12 -p1 -b .im-context-reset
-%patch13 -p1 -b .notjunk-icon
%patch14 -p1 -b .help-contents
-%patch15 -p1 -b .alarm-notify-icons
-%patch16 -p1 -b .mail-browser-crash
-%patch17 -p1 -b .missing-shortcut
-%patch18 -p1 -b .quietly-close-drafts
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -309,7 +289,7 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPR
%configure \
--enable-gtk-doc \
--enable-ipv6 \
- --with-sub-version=" (%{version}.2-%{release})" \
+ --with-sub-version=" (%{version}-%{release})" \
--with-kde-applnk-path=no \
%ldap_flags %pilot_flags %krb5_flags \
%nntp_flags %ssl_flags %exchange_flags \
@@ -702,6 +682,14 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jun 21 2010 Milan Crha <mcrha at redhat.com> - 2.30.2-1.fc13
+- Update to 2.30.2
+- Remove patch to fix the giant "mail-mark-notjunk" icon (fixed upstream)
+- Remove patch for RH bug #588004 (fixed upstream)
+- Remove patch for RH bug #590373 (fixed upstream)
+- Remove patch for GNOME bug #618400 (fixed upstream)
+- Remove patch for GNOME bug #618902 (fixed upstream)
+
* Fri May 28 2010 Matthew Barnes <mbarnes at redhat.com> - 2.30.1-8.fc13
- Add patch for RH bug #590373 (quietly close unchanged drafts).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-13/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- sources 27 Apr 2010 14:45:09 -0000 1.136
+++ sources 21 Jun 2010 08:26:43 -0000 1.137
@@ -1 +1 @@
-833d2ccff2a34e595e09fc9d499de231 evolution-2.30.1.2.tar.bz2
+ff2f1843d9f61e151a6bccf89eeff088 evolution-2.30.2.tar.bz2
--- evolution-2.30.1.2-alarm-notify-icons.patch DELETED ---
--- evolution-2.30.1.2-mail-browser-crash.patch DELETED ---
--- evolution-2.30.1.2-missing-shortcut.patch DELETED ---
--- evolution-2.30.1.2-notjunk-icon.patch DELETED ---
--- evolution-2.30.1.2-quietly-close-drafts.patch DELETED ---
More information about the scm-commits
mailing list