Update to 3.17.2

This commit is contained in:
Milan Crha 2015-05-25 09:20:01 +02:00
parent 6c3e449024
commit c6898fce46
4 changed files with 9 additions and 16 deletions

1
.gitignore vendored
View File

@ -89,3 +89,4 @@ evolution-2.31.5.tar.bz2
/evolution-3.16.0.tar.xz
/evolution-3.16.1.tar.xz
/evolution-3.17.1.tar.xz
/evolution-3.17.2.tar.xz

View File

@ -1,12 +0,0 @@
diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml b/doc/reference/evolution-util/evolution-util-docs.sgml
index f671a52..cdf3410 100644
--- a/doc/reference/evolution-util/evolution-util-docs.sgml
+++ b/doc/reference/evolution-util/evolution-util-docs.sgml
@@ -252,7 +252,6 @@
<xi:include href="xml/e-buffer-tagger.xml"/>
<xi:include href="xml/e-calendar-item.xml"/>
<xi:include href="xml/e-calendar.xml"/>
- <xi:include href="xml/e-cell-renderer-color.xml"/>
<xi:include href="xml/e-charset-combo-box.xml"/>
<xi:include href="xml/e-contact-store.xml"/>
<xi:include href="xml/e-data-capture.xml"/>

View File

@ -28,7 +28,7 @@
### Abstract ###
Name: evolution
Version: 3.17.1
Version: 3.17.2
Release: 1%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
@ -44,7 +44,7 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
### Patches ###
# RH bug #
Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch
#Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch
## Dependencies ###
@ -206,7 +206,7 @@ the functionality of the installed %{name} package.
%prep
%setup -q -n evolution-%{version}
%patch01 -p1 -b .doc-e-cell-renderer-color
#%patch01 -p1 -b .doc-e-cell-renderer-color
# Remove the welcome email from Novell
for inbox in mail/default/*/Inbox; do
@ -535,6 +535,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/installed-tests
%changelog
* Mon May 25 2015 Milan Crha <mcrha@redhat.com> - 3.17.2-1
- Update to 3.17.2
- Remove patch for a removal of an e-cell-renderer-color gtk-doc leftover (fixed upstream)
* Mon Apr 27 2015 Milan Crha <mcrha@redhat.com> - 3.17.1-1
- Update to 3.17.1
- Add patch for a removal of an e-cell-renderer-color gtk-doc leftover

View File

@ -1 +1 @@
123f29e55b0a09fb381359300c2a52da evolution-3.17.1.tar.xz
377e2b4a7791056d0349b072fccc8734 evolution-3.17.2.tar.xz