rpms/gnome-applets/FC-6 gnome-applets.spec,1.189,1.190
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Oct 18 17:39:52 UTC 2006
Author: mclasen
Update of /cvs/dist/rpms/gnome-applets/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv31581
Modified Files:
gnome-applets.spec
Log Message:
fix scripts
Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-6/gnome-applets.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- gnome-applets.spec 17 Oct 2006 17:23:39 -0000 1.189
+++ gnome-applets.spec 18 Oct 2006 17:39:50 -0000 1.190
@@ -22,7 +22,7 @@
%define pygobject_version 2.6
%define pygtk_version 2.6
%define gnome_python_version 2.10
-%define gconf_version 2.14
+%define gconf_version 2.14.0
%define po_package gnome-applets-2.0
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.0.1
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -118,6 +118,10 @@
Requires: libxklavier >= %{libxklavier_version}
Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
Requires: gstreamer-plugins-good >= %{gstreamer_plugins_version}
+Requires(post): GConf2 >= %{gconf_version}
+Requires(pre): GConf2 >= %{gconf_version}
+Requires(preun): GConf2 >= %{gconf_version}
+Requires(post): scrollkeeper
# For wireless-applet backwards compat
Requires: gnome-netstatus >= 2.8.0-2
@@ -137,10 +141,6 @@
# since we are installing .pc files
Requires: pkgconfig
-Requires(post): GConf2 >= %{gconf_version}
-Requires(preun): GConf2 >= %{gconf_version}
-Requires(post): scrollkeeper
-
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
@@ -245,7 +245,28 @@
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
%{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
-%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null
+%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/battstat.schemas \
+ %{_sysconfdir}/gconf/schemas/charpick.schemas \
+ %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
+ %{_sysconfdir}/gconf/schemas/drivemount.schemas \
+ %{_sysconfdir}/gconf/schemas/geyes.schemas \
+ %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
+ %{_sysconfdir}/gconf/schemas/gweather.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
+ %{_sysconfdir}/gconf/schemas/mixer.schemas \
+ %{_sysconfdir}/gconf/schemas/modemlights.schemas \
+%if %{build_stickynotes}
+ %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
+%endif
+ %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null || :
+fi
%preun
if [ "$1" -eq 0 ]; then
@@ -265,7 +286,7 @@
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
- %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
+ %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null || :
fi
%postun
@@ -332,6 +353,9 @@
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.16.0.1-10
+- Fix scripts according to packaging guidelines
+
* Tue Oct 17 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.16.0.1-9
- Fix up requirements (#202549)
More information about the fedora-cvs-commits
mailing list