[mate-desktop] clean up spec file

[Wolfgang Ulbrich]

commit dddcf8ebe911fd603bbe52ab287a28cf46b49e9c
Author: raveit65 <chat-to-me at raveit.de>
Date:   Tue May 6 20:03:40 2014 +0200

    clean up spec file

 mate-desktop.spec |   63 +++++++---------------------------------------------
 1 files changed, 9 insertions(+), 54 deletions(-)
---
diff --git a/mate-desktop.spec b/mate-desktop.spec
index a63398a..47673e0 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -1,24 +1,19 @@
 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.1
 Release:        1%{?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
-# workaround for x-caja-desktop window issue
+
 Source1:        mate-fedora.gschema.override
-Source2:        gnu-cat.gif
-Source3:        gnu-cat_navideno_v3.png
-Source4:        mate-fedora-f20.gschema.override
-Source5:        mate-fedora-f21.gschema.override
+Source2:        mate-fedora-f20.gschema.override
+Source3:        mate-fedora-f21.gschema.override
+# horrible gnucat to make Dan happy
+Source4:        gnu-cat.gif
+Source5:        gnu-cat_navideno_v3.png
+
 
 #enable gnucat
 %if 0%{?fedora} > 20
@@ -66,16 +61,13 @@ Obsoletes: mate-vfs
 Obsoletes: mate-vfs-devel
 Obsoletes: mate-vfs-smb
 # switch to gnome-keyring > f19
+# mate-bluetooth is death
 %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
@@ -121,7 +113,6 @@ cp %SOURCE3 mate-about/gnu-cat_navideno_v3.png
 autoreconf -fi
 
 %build
-%if 0%{?fedora} > 20
 %configure                                                 \
      --enable-desktop-docs                                 \
      --disable-schemas-compile                             \
@@ -132,18 +123,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
 
@@ -159,32 +138,20 @@ desktop-file-install                                         \
         --dir=%{buildroot}%{_datadir}/applications           \
 %{buildroot}%{_datadir}/applications/mate-about.desktop
 
-%if 0%{?fedora} > 20
 desktop-file-install                                         \
         --delete-original                                    \
         --dir=%{buildroot}%{_datadir}/applications           \
 %{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
 
-%if 0%{?fedora} > 20
 # remove conflicting files with gnome
 rm -fr %{buildroot}%{_datadir}/help/*/fdl
 rm -fr %{buildroot}%{_datadir}/help/*/gpl
 rm -fr %{buildroot}%{_datadir}/help/*/lgpl
-%endif
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -211,7 +178,6 @@ fi
 
 %files
 %doc AUTHORS COPYING COPYING.LIB NEWS README
-%if 0%{?fedora} > 20
 %{_bindir}/mate-about
 %{_bindir}/mate-gsettings-toggle
 %{_bindir}/mpaste
@@ -223,18 +189,6 @@ fi
 %{_datadir}/pixmaps/gnu-cat.gif
 %{_datadir}/pixmaps/gnu-cat_navideno_v3.png
 %{_datadir}/help/*/mate-user-guide
-%else
-%{_bindir}/mate-about
-%{_bindir}/mate-gsettings-toggle
-%{_datadir}/applications/mate-about.desktop
-%{_datadir}/mate
-%{_datadir}/omf/mate-desktop
-%{_datadir}/mate-about
-%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
-%{_mandir}/man1/*
-%{_datadir}/pixmaps/gnu-cat.gif
-%{_datadir}/pixmaps/gnu-cat_navideno_v3.png
-%endif
 
 %files libs -f %{name}.lang
 %{_libdir}/libmate-desktop-2.so.*
@@ -250,6 +204,7 @@ fi
 %changelog
 * Tue May 06 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-1
 - update to 1.8.1
+- clean up spec file
 
 * Sat Mar 22 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-3
 - add new f21 gsettings overrride file