[pidgin/f14/master] - drop the s390(x) ifarchs

Dan Horák sharkcz at fedoraproject.org
Mon Sep 13 16:34:18 UTC 2010


commit 8f50da7602c516a8a9a1c01f94b0b0e52793099e
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 13 18:33:13 2010 +0200

    - drop the s390(x) ifarchs

 pidgin.spec |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/pidgin.spec b/pidgin.spec
index cb5a382..93ff54e 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -98,7 +98,7 @@
 
 Name:           pidgin
 Version:        2.7.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -108,7 +108,6 @@ URL:            http://pidgin.im/
 Source0:        http://downloads.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
 Obsoletes:      gaim < 999:1
 Provides:       gaim = 999:1
-ExcludeArch:    s390 s390x
 
 %if %{split_evolution}
 Obsoletes:      pidgin <= 2.7.1-1%{?dist}
@@ -193,11 +192,8 @@ BuildRequires:  gstreamer-devel >= 0.10
 %endif
 # NetworkManager integration (FC5+)
 %if %{nm_integration}
-%ifnarch s390 s390x
-# No NetworkManager on s390/s390x
 BuildRequires:  NetworkManager-glib-devel
 %endif
-%endif
 # Modular X (FC5+)
 %if %{modular_x}
 BuildRequires:  libSM-devel
@@ -675,6 +671,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 13 2010 Dan Horák <dan[at]danny.cz> 2.7.3-3
+- drop the s390(x) ifarchs
+
 * Mon Aug 23 2010 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.3-2
 - use _isa in explicit Requires on libpurple to prevent yum from trying to 
   jump architectures to resolve dependency


More information about the scm-commits mailing list