[mate-applets] fix conflicts with guhnome3
Dan Mashal
vicodan at fedoraproject.org
Sat Feb 23 08:41:23 UTC 2013
commit bcc4ac74a5cbc4b02d79df0c4c7409947a74fa43
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Sat Feb 23 00:41:02 2013 -0800
fix conflicts with guhnome3
mate-applets.spec | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
---
diff --git a/mate-applets.spec b/mate-applets.spec
index e74b622..153374e 100644
--- a/mate-applets.spec
+++ b/mate-applets.spec
@@ -1,6 +1,6 @@
Name: mate-applets
Version: 1.5.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: MATE Desktop panel applets
License: GPLv2+ and LGPLv2+
URL: http://mate-desktop.org
@@ -41,18 +41,19 @@ NOCONFIGURE=1 ./autogen.sh
%build
-%configure \
- --disable-schemas-compile \
- --disable-scrollkeeper \
- --with-gnu-ld \
- --with-x \
- --enable-polkit \
- --enable-networkmanager \
- --enable-ipv6 \
- --enable-frequency-selector \
- --enable-suid \
- --disable-cpufreq \
- --disable-timer-applet
+%configure \
+ --disable-schemas-compile \
+ --disable-scrollkeeper \
+ --with-gnu-ld \
+ --with-x \
+ --enable-polkit \
+ --enable-networkmanager \
+ --enable-ipv6 \
+ --enable-frequency-selector \
+ --enable-suid \
+ --disable-cpufreq \
+ --disable-timer-applet \
+ --libexecdir=%{_libexecdir}/mate-applets
make %{?_smp_mflags} V=1
@@ -85,20 +86,12 @@ fi
%doc AUTHORS COPYING README
%{_bindir}/mate-invest-chart
%{python_sitelib}/mate_invest
-%{_libexecdir}/invest-applet
%{_datadir}/dbus-1/services/org.mate.panel.applet.InvestAppletFactory.service
%{_datadir}/icons/hicolor/scalable/apps/mate-invest-applet.svg
%{_datadir}/mate/help/mate-invest-applet
%{_datadir}/omf/mate-invest-applet
%{_datadir}/mate-applets
%{_sysconfdir}/sound/events/mate-battstat_applet.soundlist
-%{_libexecdir}/accessx-status-applet
-%{_libexecdir}/battstat-applet-2
-%{_libexecdir}/charpick_applet2
-%{_libexecdir}/drivemount_applet2
-%{_libexecdir}/geyes_applet2
-%{_libexecdir}/stickynotes_applet
-%{_libexecdir}/trashapplet
%{_datadir}/dbus-1/services/org.mate.panel.applet.AccessxStatusAppletFactory.service
%{_datadir}/dbus-1/services/org.mate.panel.applet.BattstatAppletFactory.service
%{_datadir}/dbus-1/services/org.mate.panel.applet.CharpickerAppletFactory.service
@@ -142,8 +135,7 @@ fi
%{_datadir}/pixmaps/mate-accessx-status-applet
%{_datadir}/pixmaps/mate-stickynotes
%{_datadir}/MateConf/gsettings/stickynotes-applet.convert
-%{_libexecdir}/mateweather-applet-2
-%{_libexecdir}/multiload-applet-2
+%{_libexecdir}/mate-applets
%{_datadir}/dbus-1/services/org.mate.panel.applet.MateWeatherAppletFactory.service
%{_datadir}/dbus-1/services/org.mate.panel.applet.MultiLoadAppletFactory.service
%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.multiload.gschema.xml
@@ -152,6 +144,10 @@ fi
%{_datadir}/mate/help/mate-multiload
%changelog
+* Sun Feb 03 2013 - Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.1-5
+- Fix conflicts with gnome by adding libexec configure flag
+
+
* Sun Feb 03 2013 - Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.1-4
- Fix dist tag
- Remove duplicate files
More information about the scm-commits
mailing list