[mate-panel] update BR, desktop-file-install, configure flags, enable gobject, various bugfixes

Dan Mashal vicodan at fedoraproject.org
Sun Oct 7 05:14:53 UTC 2012


commit c64f31877d06b12e925aa7920ef4b338d442cf5b
Author: dmashal <dan.mashal at fedoraproject.org>
Date:   Sat Oct 6 22:14:07 2012 -0700

    update BR, desktop-file-install, configure flags, enable gobject, various bugfixes

 mate-panel.spec |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index 21e43ab..2f98e06 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -2,7 +2,7 @@
 
 Name:	mate-panel
 Version:	1.4.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	MATE Desktop panel applets
 #libs are LGPLv2+ applications GPLv2+
 License:	LGPLv2+ and GPLv2+
@@ -14,7 +14,7 @@ BuildRequires: libnm-gtk-devel
 %else
 BuildRequires: NetworkManager-gtk-devel
 %endif
-Buildrequires:	dbus-glib-devel desktop-file-utils gobject-introspection-devel gtk2-devel icon-naming-utils libSM-devel libcanberra-devel libmate-devel libmatecomponentui-devel libmatecomponent-devel libmateweather-devel libmatewnck-devel librsvg2-devel mate-common mate-conf-devel mate-corba-devel mate-conf mate-conf-gtk mate-desktop-devel mate-doc-utils mate-menus-devel pango-devel popt-devel
+Buildrequires:	dbus-glib-devel desktop-file-utils gobject-introspection-devel gtk2-devel icon-naming-utils libSM-devel libcanberra-devel libmate-devel libmatecomponentui-devel libmatecomponent-devel libmateweather-devel libmatewnck-devel librsvg2-devel libX11-devel mate-common mate-conf-devel mate-corba-devel mate-conf mate-conf-gtk mate-desktop-devel mate-doc-utils mate-menus-devel pango-devel popt-devel
 
 #Will fix evolution support in a future release
 #BuildRequires: evolution-data-server-devel
@@ -39,7 +39,7 @@ NOCONFIGURE=1 ./autogen.sh
 
 %build
 #libexecdir needed for gnome conflicts
-%configure --disable-scrollkeeper --disable-static --enable-network-manager --libexecdir=%{_libexecdir}/mate-panel --enable-matecomponent --disable-schemas-install
+%configure --disable-scrollkeeper --disable-static --with-x --enable-network-manager --libexecdir=%{_libexecdir}/mate-panel --enable-matecomponent --disable-schemas-install --enable-introspection
 make  %{?_smp_mflags} V=1
 
 %install
@@ -51,13 +51,13 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 desktop-file-install									\
 	--remove-category="MATE;GTK;System;Core;"					\
-	--add-category="X-Mate"								\
+	--add-category="X-Mate;GTK;System;Core;"					\
 	--delete-original								\
 	--dir=%{buildroot}%{_datadir}/applications					\
 %{buildroot}%{_datadir}/applications/mate-panel.desktop
 
-#%check
-#desktop-file-validate %{buildroot}%{_datadir}/applications/mate-panel.desktop
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/mate-panel.desktop
 
 
 
@@ -161,6 +161,12 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/gtk-doc/html/mate-panel-applet/
 
 %changelog
+* Sat Oct 06 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-7
+- Add enable-introspection and --with-x to configure flags
+- Update desktop-file-install macro
+- Update BR
+- Turn desktop-file-validate back on
+
 * Wed Oct 03 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-6
 - Add posttrans scriptlet to update icon cache and fix ordering of scriptlets
 - Add comment about licensing


More information about the scm-commits mailing list