[mate-desktop] fix gsettings-schema override file

Wolfgang Ulbrich raveit65 at fedoraproject.org
Sun Jul 6 19:29:13 UTC 2014


commit b51992ea5ecf24d105f3708ccece35ad590cbdf2
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sun Jul 6 21:29:00 2014 +0200

    fix gsettings-schema override file

 mate-desktop.spec |   28 +++++-----------------------
 1 files changed, 5 insertions(+), 23 deletions(-)
---
diff --git a/mate-desktop.spec b/mate-desktop.spec
index be0a1b5..38485d1 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -2,26 +2,13 @@ Summary:        Shared code for mate-panel, mate-session, mate-file-manager, etc
 Name:           mate-desktop
 License:        GPLv2+ and LGPLv2+ and MIT
 Version:        1.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Source0:        http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
 URL:            http://mate-desktop.org
 
-
 Source1:        mate-fedora.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
-Patch0:         mate-desktop_enable_gnucat-f21.patch
-%else
-Patch0:         mate-desktop_enable_gnucat.patch
-%endif
-
 
 BuildRequires:  dconf-devel
 BuildRequires:  desktop-file-utils
@@ -105,12 +92,6 @@ libmatedesktop.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gnucat
-cp %SOURCE2 mate-about/gnu-cat.gif
-cp %SOURCE3 mate-about/gnu-cat_navideno_v3.png
-
-# needed for gnucat patch
-autoreconf -fi
 
 %build
 %configure                                                 \
@@ -143,7 +124,7 @@ desktop-file-install                                         \
         --dir=%{buildroot}%{_datadir}/applications           \
 %{buildroot}%{_datadir}/applications/mate-user-guide.desktop
 
-install -D -m 0644 %SOURCE5 %{buildroot}%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
+install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
 
 # remove needless gsettings convert file
 rm -f  %{buildroot}%{_datadir}/MateConf/gsettings/mate-desktop.convert
@@ -186,8 +167,6 @@ fi
 %{_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
 %{_datadir}/help/*/mate-user-guide
 
 %files libs -f %{name}.lang
@@ -202,6 +181,9 @@ fi
 
 
 %changelog
+* Sun Jul 06 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-3
+- fix gschema override file
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list