[mate-desktop/epel7] Update spec

[Dan Mashal]

commit 82816eb4ff11a5fb36dc626517d94a001d58a9e1
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Fri Mar 28 13:00:41 2014 -0700

    Update spec

 mate-desktop.spec |   40 ----------------------------------------
 1 files changed, 0 insertions(+), 40 deletions(-)
---
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 26fb6fb..ffa76ab 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -1,15 +1,9 @@
 Summary:        Shared code for mate-panel, mate-session, mate-file-manager, etc
 Name:           mate-desktop
 License:        GPLv2+ and LGPLv2+ and MIT
-%if 0%{?fedora} > 20
 Version:        1.8.0
 Release:        3%{?dist}
 Source0:        http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
-%else
-Version:        1.6.2
-Release:        1%{?dist}
-Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
-%endif
 URL:            http://mate-desktop.org
 
 # fix fedora backgrounds and
@@ -28,11 +22,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  mate-common
 BuildRequires:  startup-notification-devel
 BuildRequires:  unique-devel
-%if 0%{?fedora} > 20
 BuildRequires:  itstool
-%else
-BuildRequires:  mate-doc-utils
-%endif
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: redhat-menus
@@ -60,28 +50,19 @@ Obsoletes: mate-mime-data-devel
 Obsoletes: mate-vfs
 Obsoletes: mate-vfs-devel
 Obsoletes: mate-vfs-smb
-# switch to gnome-keyring > f19
-%if 0%{?fedora} > 19
 Obsoletes: libmatekeyring
 Obsoletes: libmatekeyring-devel
 Obsoletes: mate-keyring
 Obsoletes: mate-keyring-pam
 Obsoletes: mate-keyring-devel
-%endif
-# temporarily solution for f20 until mate-bluetooth
-# is ported to bluez5
-%if 0%{?fedora} > 19
 Obsoletes: mate-bluetooth < 1:1.6.0-6
 Obsoletes: mate-bluetooth-libs < 1:1.6.0-6
 Obsoletes: mate-bluetooth-devel < 1:1.6.0-6
-%endif
-%if 0%{?fedora} > 20
 Obsoletes: mate-doc-utils
 Obsoletes: mate-character-map
 Obsoletes: mate-character-map-devel 
 Obsoletes: libmatewnck
 Obsoletes: libmatewnck-devel
-%endif
 
 
 %description
@@ -117,7 +98,6 @@ cp %SOURCE3 mate-about/gnu-cat_navideno_v3.png
 autoreconf -fi
 
 %build
-%if 0%{?fedora} > 20
 %configure                                                 \
      --enable-desktop-docs                                 \
      --disable-schemas-compile                             \
@@ -127,18 +107,6 @@ autoreconf -fi
      --enable-mpaste                                       \
      --with-pnp-ids-path="%{_datadir}/hwdata/pnp.ids"      \
      --enable-gtk-doc-html
-%else
-%configure \
-     --disable-scrollkeeper                                \
-     --disable-schemas-compile                             \
-     --with-gtk=2.0                                        \
-     --with-x                                              \
-     --disable-static                                      \
-     --enable-unique                                       \
-     --with-pnp-ids-path="%{_datadir}/hwdata/pnp.ids"      \
-     --with-omf-dir=%{_datadir}/omf/mate-desktop           \
-     --enable-gnucat
-%endif
 
 make %{?_smp_mflags} V=1
 
@@ -161,15 +129,7 @@ desktop-file-install                                         \
 %{buildroot}%{_datadir}/applications/mate-user-guide.desktop
 %endif
 
-%if 0%{?fedora} > 19
-%if 0%{?fedora} > 20
 install -D -m 0644 %SOURCE5 %{buildroot}%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
-%else
-install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
-%endif
-%else
-install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
-%endif
 
 # remove needless gsettings convert file
 rm -f  %{buildroot}%{_datadir}/MateConf/gsettings/mate-desktop.convert