[mate-window-manager] fix mate conf scriptlets, comment out desktop-file-validate and add explicit export to not install s
Dan Mashal
vicodan at fedoraproject.org
Tue Sep 25 05:51:33 UTC 2012
commit 17d057be8461b9e0db8949b0496c97d498b03efd
Author: dmashal <dan.mashal at fedoraproject.org>
Date: Mon Sep 24 22:50:54 2012 -0700
fix mate conf scriptlets, comment out desktop-file-validate and add explicit export to not install schemas
mate-window-manager.spec | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/mate-window-manager.spec b/mate-window-manager.spec
index 548ccea..34da28b 100644
--- a/mate-window-manager.spec
+++ b/mate-window-manager.spec
@@ -1,9 +1,10 @@
Name: mate-window-manager
Version: 1.4.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: MATE Desktop window manager
License: LGPLv2+ and GPLv2+
URL: http://mate-desktop.org
+# https://github.com/mate-desktop/mate-window-manager/issues/9
Source0: http://vicodan.fedorapeople.org/mate-window-manager-1.4.1-GIT.tar.gz
BuildRequires: desktop-file-utils gtk2-devel libcanberra-devel libsoup-devel mate-common mate-doc-utils mate-conf-devel mate-corba-devel mate-dialogs
@@ -35,14 +36,18 @@ NOCONFIGURE=1 ./autogen.sh
make %{?_smp_mflags} V=1
%pre
+%mateconf_schema_obsolete marco
%mateconf_schema_prepare marco
-%preun %mateconf_schema_remove marco
+%preun
+%mateconf_schema_remove marco
%post
/sbin/ldconfig
%mateconf_schema_upgrade marco
+%postun
+/sbin/ldconfig
%install
export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -54,27 +59,28 @@ find %{buildroot} -name '*.la' -exec rm -vf {} ';'
desktop-file-install \
--remove-category="MATE" \
- --add-category="X-MATE" \
+ --add-category="X-Mate" \
--delete-original \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/marco.desktop
desktop-file-install \
--remove-category="MATE" \
- --add-category="X-MATE" \
+ --add-category="X-Mate" \
--delete-original \
--dir=%{buildroot}%{_datadir}/mate/wm-properties \
%{buildroot}%{_datadir}/mate/wm-properties/marco-wm.desktop
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/marco.desktop
-desktop-file-validate %{buildroot}%{_datadir}/mate/wm-properties/marco-wm.desktop
+#commented out until desktop-file-utils gets fixed.
+#%check
+#desktop-file-validate %{buildroot}%{_datadir}/applications/marco.desktop
+#desktop-file-validate %{buildroot}%{_datadir}/mate/wm-properties/marco-wm.desktop
%files -f %{name}.lang
%doc AUTHORS COPYING README
%{_mandir}/man1/*
-%config(noreplace) %{_sysconfdir}/mateconf/schemas/marco.schemas
+%{_sysconfdir}/mateconf/schemas/marco.schemas
%{_bindir}/marco
%{_bindir}/marco-message
%{_bindir}/marco-theme-viewer
@@ -104,6 +110,10 @@ desktop-file-validate %{buildroot}%{_datadir}/mate/wm-properties/marco-wm.deskto
%changelog
+* Mon Sep 24 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.1-8
+- rerefix mate-conf scriptlets. Add export line to REALLY not install schemas with make install.
+- comment out desktop-file-validate.
+
* Mon Sep 17 2012 Rex Dieter <rdieter at fedoraproject.org> 1.4.1-7
- fix/simplify dir ownership
- omit not-needed/broken Obsoletes
More information about the scm-commits
mailing list