[mate-settings-daemon/f20] clean up spec file

Wolfgang Ulbrich raveit65 at fedoraproject.org
Sat Jul 26 13:19:14 UTC 2014


commit 02c9b09cd2e0645fecb0eda46dfb08671ab5b5f1
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Jul 26 15:19:03 2014 +0200

    clean up spec file

 mate-settings-daemon.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index 60262e5..613bf4e 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -13,15 +13,6 @@ Source0:        http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.
 # wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz
 #Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%%{name}-%%{version}.git%%{_internal_version}.tar.xz
 
-# fix rhbz (#1048409)
-%if 0%{?fedora} < 20
-Patch0:         mate-settings-daemon_revert-thumbnailer-commit.patch
-%endif
-
-Requires:       libmatekbd%{?_isa} >= 0:1.6.1-1
-# needed for xrandr capplet
-Requires:       mate-control-center-filesystem
-
 BuildRequires:  dconf-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  gtk2-devel
@@ -37,6 +28,10 @@ BuildRequires:  mate-polkit-devel
 BuildRequires:  nss-devel
 BuildRequires:  desktop-file-utils
 
+Requires:       libmatekbd%{?_isa} >= 0:1.6.1-1
+# needed for xrandr capplet
+Requires:       mate-control-center-filesystem
+
 %description
 This package contains the daemon which is responsible for setting the
 various parameters of a MATE session and the applications that run
@@ -54,10 +49,6 @@ under it.
 %prep
 %setup -q
 
-%if 0%{?fedora} < 20
-%patch0 -p1 -b .thumbnailer
-%endif
-
 #%%setup -q -n %%{name}-%%{_internal_version}
 #NOCONFIGURE=1 ./autogen.sh
 
@@ -127,6 +118,7 @@ fi
 %changelog
 * Sat Jul 26 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-2
 - update to 1.8.1 release
+- clean up spec file
 
 * Thu Jul 17 2014 Rex Dieter <rdieter at fedoraproject.org> 1.6.2-3
 - rebuild (for pulseaudio, bug #1117683)


More information about the scm-commits mailing list