[xfce4-terminal] Update to 0.6.1

[Christoph Wickert]

commit da82815bd71de7217478d4408a7395a55ff90b96
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Jan 1 15:28:00 2013 +0100

    Update to 0.6.1
    
    - Install GNOME control-center integration only on EL6

 .gitignore          |    1 +
 sources             |    2 +-
 xfce4-terminal.spec |   21 +++++++++++++--------
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8988841..918a8e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xfce4-terminal-0.6.0.tar.bz2
+/xfce4-terminal-0.6.1.tar.bz2
diff --git a/sources b/sources
index 0c1073f..c6d18d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afb729d37f0ffa003511a47459ed3baf  xfce4-terminal-0.6.0.tar.bz2
+98613ce500fef2ed62cdbe788084acca  xfce4-terminal-0.6.1.tar.bz2
diff --git a/xfce4-terminal.spec b/xfce4-terminal.spec
index 568d8c6..fef6b6f 100644
--- a/xfce4-terminal.spec
+++ b/xfce4-terminal.spec
@@ -1,8 +1,8 @@
 %global minorversion 0.6
 
 Name:           xfce4-terminal
-Version:        0.6.0
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        X Terminal Emulator for the Xfce Desktop environment
 
 Group:          User Interface/Desktops
@@ -17,8 +17,8 @@ BuildRequires:  startup-notification-devel
 BuildRequires:  dbus-glib-devel >= 0.22
 BuildRequires:  desktop-file-utils
 BuildRequires:  libxfce4ui-devel >= 4.10.0
-# required for Terminal-default-apps.xml
-Requires:       control-center-filesystem
+# required for Terminal-default-apps.xml (only works in late GNOME 2)
+%{?el6:Requires: control-center-filesystem}
 # This package replaces the Terminal package
 Provides: Terminal = %{version}-%{release}
 Obsoletes: Terminal < 0.4.8-5
@@ -36,13 +36,14 @@ it unique among X terminal emulators.
 make %{?_smp_mflags} V=1
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 %find_lang %{name}
 desktop-file-install                                       \
   --delete-original                                        \
   --add-category="GTK"                                     \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  --dir=%{buildroot}%{_datadir}/applications          \
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
+%{!?el6:rm -rf %{buildroot}%{_datadir}/gnome-control-center/}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -61,11 +62,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/xfce4-terminal
 %{_datadir}/xfce4/terminal
 %{_datadir}/applications/xfce4-terminal.desktop
-%{_datadir}/gnome-control-center/default-apps/xfce4-terminal-default-apps.xml
+%{?el6:%{_datadir}/gnome-control-center/default-apps/xfce4-terminal-default-apps.xml}
 %{_mandir}/man1/xfce4-terminal.1.*
 %{_mandir}/*/man1/xfce4-terminal.1.*
 
 %changelog
+* Tue Jan 01 2013 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+- Install GNOME control-center integration only on EL6
+
 * Fri Dec 28 2012 Kevin Fenzi <kevin at scrye.com> 0.6.0-2
 - Various minor moderizations of the spec per the review.