diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 3501b88..2204879 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -1,18 +1,23 @@ %global _internal_version d2d3aa7 -Name: mate-settings-daemon +Name: mate-settings-daemon Version: 1.6.2 #Release: 0.4.git%{_internal_version}%{?dist} -Release: 1%{?dist} -Summary: MATE Desktop settings daemon -License: GPLv2+ -URL: http://mate-desktop.org +Release: 2%{?dist} +Summary: MATE Desktop settings daemon +License: GPLv2+ +URL: http://mate-desktop.org Source0: http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz # To generate tarball # 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 +#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 @@ -49,7 +54,12 @@ under it. %prep %setup -q -#%setup -q -n %{name}-%{_internal_version} + +%if 0%{?fedora} < 20 +%patch0 -p1 -b .thumbnailer +%endif + +#%%setup -q -n %%{name}-%%{_internal_version} #NOCONFIGURE=1 ./autogen.sh %build @@ -115,6 +125,10 @@ fi %{_libdir}/pkgconfig/mate-settings-daemon.pc %changelog +* Sat Jan 04 2014 Wolfgang Ulbrich - 1.6.2-2 +- revert https://github.com/mate-desktop/mate-settings-daemon/commit/b4d8c8e +- to fix rhbz (#1048409) thumbnailer issue for < f20 + * Fri Dec 20 2013 Wolfgang Ulbrich - 1.6.2-1 - update to 1.6.2 release