[roxterm] Update to 1.21.1 Make GNOME 2 control-center integration conditional

[Christoph Wickert]

commit b1cd81bd65c219d2c128ec5f5f0ded95798e14b5
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Mon Mar 28 11:34:52 2011 +0200

    Update to 1.21.1
    Make GNOME 2 control-center integration conditional

 .gitignore   |    1 +
 roxterm.spec |   17 ++++++++++++-----
 sources      |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e0545f..1f7a9f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ roxterm-1.18.5.tar.gz
 /roxterm-1.20.2.tar.gz
 /roxterm-1.20.4.tar.gz
 /roxterm-1.20.5.tar.gz
+/roxterm-1.21.1.tar.gz
diff --git a/roxterm.spec b/roxterm.spec
index d47c910..739a8ea 100644
--- a/roxterm.spec
+++ b/roxterm.spec
@@ -1,6 +1,6 @@
 Name:           roxterm
-Version:        1.20.5
-Release:        2%{?dist}
+Version:        1.21.1
+Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
 Group:          User Interface/X
@@ -12,9 +12,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  vte-devel libglade2-devel gtk2-devel dbus-glib-devel desktop-file-utils
 BuildRequires:  dbus-devel
 BuildRequires:  xmlto
-BuildRequires:  control-center
 BuildRequires:  po4a
+%if 0%{?fedora} <= 14 || 0%{?rhel}
+BuildRequires:  control-center
 Requires:       control-center-filesystem
+%endif
 
 %description
 ROXTerm is a terminal emulator intended to provide similar 
@@ -72,14 +74,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/fedora-roxterm.desktop
 %{_datadir}/roxterm/
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
-# FIXME: re-enable when GNOME is ready (should be before GNOME 3.0)
-#%{_datadir}/gnome-control-center/default-apps/roxterm.xml
 %{_mandir}/man1/roxterm-config.1.*
 %{_mandir}/man1/roxterm.1.*
 %lang(es) %{_mandir}/es/man1/roxterm-config.1.*
 %lang(es) %{_mandir}/es/man1/roxterm.1.*
+%if 0%{?fedora} <= 14 || 0%{?rhel}
+%{_datadir}/gnome-control-center/default-apps/roxterm.xml
+%endif
 
 %changelog
+* Mon Mar 28 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.21.1-1
+- Update to 1.21.1
+- Make GNOME 2 control-center integration conditional
+
 * Wed Feb 09 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.20.5-2
 - Temporarily disable GNOME control-center integration for 
   https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 6ef0f69..51fd2c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d282f7b5955e563e125e895924caecf  roxterm-1.20.5.tar.gz
+777f507b89d407b4a5c3daafaaea8179  roxterm-1.21.1.tar.gz