summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.cvsignore2
-rw-r--r--gnome-applets-2.3.6-ppp-command.patch20
-rw-r--r--gnome-applets.spec51
-rw-r--r--sources2
4 files changed, 63 insertions, 12 deletions
diff --git a/.cvsignore b/.cvsignore
index feee3d5..ed38322 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.2.0.tar.bz2
+gnome-applets-2.4.1.tar.bz2
diff --git a/gnome-applets-2.3.6-ppp-command.patch b/gnome-applets-2.3.6-ppp-command.patch
new file mode 100644
index 0000000..4d3bc0d
--- /dev/null
+++ b/gnome-applets-2.3.6-ppp-command.patch
@@ -0,0 +1,20 @@
+--- gnome-applets-2.3.6/modemlights/modemlights.schemas.in.ppp-command 2003-08-18 14:18:22.000000000 +0200
++++ gnome-applets-2.3.6/modemlights/modemlights.schemas.in 2003-08-18 14:18:59.000000000 +0200
+@@ -27,7 +27,7 @@
+ <key>/schemas/apps/modemlights/prefs/connect</key>
+ <owner>modemlights_applet2</owner>
+ <type>string</type>
+- <default>pppon</default>
++ <default>/sbin/ifup ppp0</default>
+ <locale name="C">
+ <short>Command executed when connecting</short>
+ <long></long>
+@@ -38,7 +38,7 @@
+ <key>/schemas/apps/modemlights/prefs/disconnect</key>
+ <owner>modemlights_applet2</owner>
+ <type>string</type>
+- <default>pppoff</default>
++ <default>/sbin/ifdown ppp0</default>
+ <locale name="C">
+ <short>Command executed when disconnecting</short>
+ <long></long>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9a76f8b..cfe5ea3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -3,18 +3,18 @@
%define glib2_version 2.2.0
%define pango_version 1.2.0
%define gtk2_version 2.2.0
-%define libgnomeui_version 2.2.0
-%define gnome_panel_version 2.2.0.1-5
-%define libgtop2_version 2.0.0-5
+%define libgnomeui_version 2.3.0
+%define gnome_panel_version 2.3.0
+%define libgtop2_version 2.0.2
%define gail_version 1.2.0
-%define libbonoboui_version 2.2.0
+%define libbonoboui_version 2.3.0
%define po_package gnome-applets-2.0
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.2.0
-Release: 8
+Version: 2.4.1
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -34,20 +34,25 @@ BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
BuildRequires: /usr/bin/automake-1.4
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
+%ifnarch %{no_apm_archs}
+BuildRequires: apmd
+%endif
Requires: gnome-panel >= %{gnome_panel_version}
Obsoletes: battstat_applet
-Patch1: gnome-applets-2.0.1-ppp-command.patch
+Source2: omf.make
+
+Patch1: gnome-applets-2.3.6-ppp-command.patch
# Register ourself globally so that gnome-cd can tell if we are
# running or not.
-Patch2: gnome-applets-2.2.0-uniquecd.patch
+Patch2: gnome-applets-2.3.6-uniquecd.patch
# Keep the CD device closed except when actually accessing it
# (bugzilla.gnome.org 91512)
Patch3: gnome-applets-2.0.1-keepclosed.patch
# Shrink volume applet for msw
-Patch4: gnome-applets-2.2.0-smallvolume.patch
+Patch4: gnome-applets-2.3.6-smallvolume.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -66,6 +71,8 @@ fi
%setup -q
+cp %{SOURCE2} .
+
%patch1 -p1 -b .ppp-command
%patch2 -p1 -b .uniquecd
#patch3 -p1 -b .keepclosed
@@ -101,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT
scrollkeeper-update
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="modemlights.schemas cdplayer.schemas drivemount.schemas charpick.schemas geyes.schemas mini-commander.schemas gkb.schemas multiload.schemas gtik.schemas gweather.schemas battstat.schemas"
+SCHEMAS="battstat.schemas cdplayer.schemas charpick.schemas drivemount.schemas geyes.schemas gkb.schemas gtik.schemas gweather.schemas mailcheck.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
@@ -119,6 +126,7 @@ done
%{_datadir}/geyes
%{_datadir}/xmodmap
%{_datadir}/gweather
+%{_datadir}/stickynotes
%{_datadir}/battstat_applet
%{_datadir}/omf
%{_datadir}/wireless-applet
@@ -131,6 +139,29 @@ done
%{_sysconfdir}/sound
%changelog
+* Fri Oct 3 2003 Alexander Larsson <alexl@redhat.com> 1:2.4.1-1
+- 2.4.1
+
+* Wed Aug 27 2003 Alexander Larsson <alexl@redhat.com> 1:2.3.7-1
+- Add missing schemas to post (fixes #102710)
+- Update to 2.3.7
+- Add ifnarch apmd buildreq
+
+* Mon Aug 18 2003 Alexander Larsson <alexl@redhat.com> 1:2.3.6-1
+- update for gnome 2.3
+
+* Mon Jul 28 2003 Havoc Pennington <hp@redhat.com> 1:2.2.2-3
+- require the newer libgtop2 so it rebuilds vs. correct soname
+
+* Fri Jul 18 2003 <timp@redhat.com> 1:2.2.2-2
+- rebuild against new libgtop
+
+* Mon Jul 7 2003 Havoc Pennington <hp@redhat.com> 1:2.2.2-1
+- 2.2.2
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
* Mon Feb 24 2003 Havoc Pennington <hp@redhat.com> 1:2.2.0-8
- change the volume applet size fix patch to work
diff --git a/sources b/sources
index e6e8965..295d083 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c5650d11253fd5c4716c96f688729f7 gnome-applets-2.2.0.tar.bz2
+bf018f1692ab305954123d8123ef45d1 gnome-applets-2.4.1.tar.bz2