From d3ba1b2f0cac84efb2b05762c9a001946782b3a2 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Aug 15 2013 11:17:59 +0000
Subject: make package noarch again (#921542)


---

diff --git a/system-config-keyboard.spec b/system-config-keyboard.spec
index 4a3447e..3f98405 100644
--- a/system-config-keyboard.spec
+++ b/system-config-keyboard.spec
@@ -3,13 +3,15 @@
 
 Name:           system-config-keyboard
 Version:        1.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://fedorahosted.org/system-config-keyboard/
 Source0:        https://fedorahosted.org/releases/s/y/system-config-keyboard/%{name}-%{version}.tar.bz2
+
+BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -20,6 +22,8 @@ Requires:       system-config-keyboard-base = %{version}-%{release}
 Requires:       newt-python
 Requires:       polkit
 
+Obsoletes:      %{name} < 1.4.0-3
+Conflicts:      %{name} < 1.4.0-3
 
 %description
 system-config-keyboard is a graphical user interface that allows
@@ -34,6 +38,9 @@ Requires:       python
 Requires:       dbus-python
 Requires:       systemd >= 30
 
+Obsoletes:      %{name}-base < 1.4.0-3
+Conflicts:      %{name}-base < 1.4.0-3
+
 %description base
 Base components of system-config-keyboard.
 
@@ -94,8 +101,9 @@ fi
 
 
 %changelog
-* Thu Aug 15 2013 Nils Philippsen <nils@redhat.com>
+* Thu Aug 15 2013 Nils Philippsen <nils@redhat.com> - 1.4.0-3
 - remove trailing whitespace
+- make package noarch again (#921542)
 
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild