rpms/gnome-applets/devel gnome-applets-null-battstat.patch, NONE, 1.1 gnome-applets.spec, 1.257, 1.258
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Fri Dec 7 04:11:39 UTC 2007
- Previous message: rpms/xfce4-icon-theme/F-7 xfce4-icon-theme.spec, 1.15, 1.16 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9
- Next message: rpms/xfwm4-themes/F-8 xfwm4-themes.spec, 1.14, 1.15 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4933
Modified Files:
gnome-applets.spec
Added Files:
gnome-applets-null-battstat.patch
Log Message:
2.21.2
gnome-applets-null-battstat.patch:
--- NEW FILE gnome-applets-null-battstat.patch ---
diff -up gnome-applets-2.21.2/null_applet/Makefile.am.battstat gnome-applets-2.21.2/null_applet/Makefile.am
--- gnome-applets-2.21.2/null_applet/Makefile.am.battstat 2007-12-06 22:43:35.000000000 -0500
+++ gnome-applets-2.21.2/null_applet/Makefile.am 2007-12-06 22:43:43.000000000 -0500
@@ -9,12 +9,17 @@ null_applet_SOURCES = null_applet.c
null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+if !BUILD_BATTSTAT_APPLET
+battstat_applet=GNOME_BattstatApplet.server.in
+endif
+
serverdir = $(libdir)/bonobo/servers
server_in_files = \
GNOME_NullApplet_Factory.server.in \
GNOME_CDPlayerApplet.server.in \
GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in
+ GNOME_Panel_WirelessApplet.server.in \
+ $(battstat_applet)
server_DATA = $(server_in_files:.server.in=.server)
@INTLTOOL_SERVER_RULE@
@@ -28,4 +33,5 @@ EXTRA_DIST = \
GNOME_NullApplet_Factory.server.in.in \
GNOME_CDPlayerApplet.server.in \
GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in
+ GNOME_Panel_WirelessApplet.server.in \
+ GNOME_BattstatApplet.server.in
diff -up gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in
--- gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat 2007-12-06 22:44:07.000000000 -0500
+++ gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in 2007-12-06 22:43:54.000000000 -0500
@@ -0,0 +1,22 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_BattstatApplet"
+ type="factory"
+ location="OAFIID:GNOME_NullApplet_Factory">
+
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+ <item value="IDL:Bonobo/Control:1.0"/>
+ <item value="IDL:Bonobo/Unknown:1.0"/>
+ </oaf_attribute>
+ <oaf_attribute name="name" type="string" _value="Battery Charge Monitor"/>
+ <oaf_attribute name="description" type="string" _value="Monitor a laptop's remaining power"/>
+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
+ <oaf_attribute name="bugzilla:component" type="string" value="battery"/>
+ <oaf_attribute name="bugzilla:other_binaries" type="string" value="battstat-applet-2"/>
+
+
+</oaf_server>
+
+</oaf_info>
Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- gnome-applets.spec 6 Dec 2007 04:15:54 -0000 1.257
+++ gnome-applets.spec 7 Dec 2007 04:11:01 -0000 1.258
@@ -72,6 +72,9 @@
# http://bugzilla.gnome.org/show_bug.cgi?id=488824
Patch39: gweather-network.patch
+# do the nullapplet dance for battstat
+Patch40: gnome-applets-null-battstat.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -173,6 +176,7 @@
%patch33 -p1 -b .node-leak
%patch35 -p1 -b .mixer-sync
%patch39 -p1 -b .geweather-network
+%patch40 -p1 -b .battstat-null
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -194,6 +198,7 @@
%if %{build_stickynotes}
--enable-stickynotes \
%endif
+ --disable-battstat \
--disable-scrollkeeper \
--enable-mini-commander
make
@@ -213,13 +218,8 @@
# Clean up unpackaged files
rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.a
-
-desktop-file-install --vendor gnome --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-only-show-in GNOME \
- $RPM_BUILD_ROOT%{_datadir}/applications/*
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
# usermode-ify cpufreq-selector
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -246,7 +246,6 @@
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/battstat.schemas \
%{_sysconfdir}/gconf/schemas/charpick.schemas \
%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
%{_sysconfdir}/gconf/schemas/drivemount.schemas \
@@ -279,13 +278,16 @@
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
%{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
+ if [ -f %{_sysconfdir}/gconf/schemas/battstat.schemas ]; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/battstat.schemas
+ fi
fi
%preun
if [ "$1" -eq 0 ]; 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 \
@@ -326,7 +328,6 @@
%{python_sitelib}/invest/
%{_libdir}/libgweather.so.*
%{_libexecdir}/accessx-status-applet
-%{_libexecdir}/battstat-applet-2
%{_libexecdir}/charpick_applet2
%{_libexecdir}/cpufreq-applet
%{_libexecdir}/drivemount_applet2
@@ -350,7 +351,6 @@
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/pam.d/*
%{_sysconfdir}/security/console.apps/*
-%{_sysconfdir}/sound/events/*
%files devel
%defattr(-,root,root)
@@ -361,6 +361,7 @@
%changelog
* Wed Dec 5 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.21.2-1
- Update to 2.21.2
+- Drop the battstat applet
* Mon Oct 29 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-10
- Fix a number of problems in the weather applet
- Previous message: rpms/xfce4-icon-theme/F-7 xfce4-icon-theme.spec, 1.15, 1.16 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9
- Next message: rpms/xfwm4-themes/F-8 xfwm4-themes.spec, 1.14, 1.15 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list