[pidgin] Correctly obsolete pidgin-evolution if evolution integration is disabled
jsynacek
jsynacek at fedoraproject.org
Wed Sep 26 07:57:35 UTC 2012
commit b7dd9d376f8eb37436cec8af58831fc734dcbd92
Author: Jan Synacek <jsynacek at redhat.com>
Date: Wed Sep 26 09:42:38 2012 +0200
Correctly obsolete pidgin-evolution if evolution integration is disabled
pidgin.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/pidgin.spec b/pidgin.spec
index c93c020..75e9945 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -119,7 +119,7 @@
Name: pidgin
Version: 2.10.6
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+ and GPLv2 and MIT
# GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
# GPLv2 - silc & novell prpls
@@ -132,6 +132,8 @@ Provides: gaim = 999:1
%if %{split_evolution}
Obsoletes: pidgin <= 2.7.1-1%{?dist}
+%else %if %{disable_evolution}
+Obsoletes: pidgin-evolution <= 2.10.6%{?dist}
%endif
## Fedora pidgin defaults
@@ -733,6 +735,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Sep 26 2012 Jan Synáček <jsynacek at redhat.com> - 2.10.6-4
+- Correctly obsolete pidgin-evolution if evolution integration is disabled,
+ BZ 860285
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list