From 12f838a591bbeda8de39ef45ed036fa6ca2411ca Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 05:22:06 +0000 Subject: auto-import changelog data from gnome-applets-1.4.0.5-5.src.rpm Thu Apr 11 2002 Havoc Pennington - default battstat applet to vertical mode Thu Mar 21 2002 Havoc Pennington - add patch to adapt to yahoo web site changes, #61561 Tue Mar 05 2002 Havoc Pennington - remove requires libghttp4 Mon Mar 04 2002 Havoc Pennington - no apm on sparc, #60538 - obsolete battstat_applet for Ximian compat, #51427 - use ifup/ifdown ppp0 instead of pppon/pppoff for default ppp command in modemlights, #54199 Tue Feb 12 2002 Havoc Pennington - 1.4.0.5, cross fingers - add gconf-devel buildreq, though this is dubious as hell (pulled in by gtik using gnome-vfs, but if gtik actually accessed gconf it would fail due to gnorba conflict) - patch totally busted charpick Makefile.am cflags override Thu Jan 24 2002 Havoc Pennington - automake14 --- diff --git a/.cvsignore b/.cvsignore index cbbaf73..068c6ba 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ battstat_applet-2.0.10.tar.gz -gnome-applets-1.4.0.1.tar.gz +gnome-applets-1.4.0.5.tar.gz gnome-applets-pofiles.tar.gz diff --git a/gnome-applets.spec b/gnome-applets.spec index 5286213..08b562f 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -1,10 +1,10 @@ %define battstat battstat_applet-2.0.10 -%define no_apm_archs alpha ia64 s390 s390x +%define no_apm_archs alpha ia64 s390 s390x sparc sparc64 Summary: Small applications for the GNOME panel. Name: gnome-applets -Version: 1.4.0.1 -Release: 6a +Version: 1.4.0.5 +Release: 5 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -18,18 +18,25 @@ URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gnome-libs-devel libgtop-devel gdk-pixbuf-devel gnome-core-devel gdbm-devel +BuildRequires: GConf-devel +BuildRequires: gnome-vfs-devel >= 1.0.4 +BuildRequires: /usr/bin/automake-1.4 Requires: libxml Requires: libgtop -Requires: libghttp Requires: gnome-core >= 1.1.2 Requires: gdk-pixbuf >= 0.7.0 +Obsoletes: battstat_applet + Patch1: gnome-applets-1.2.4-isdn.patch Patch2: gnome-applets-battstat-2.0.10-nobrokenpath.patch Patch3: gnome-applets-1.4.0.1-mixer.patch Patch4: gnome-applets-1.4.0.1-battstat_dialog.patch -Patch5: gnome-applets-1.4.0.1-scrollkeeper.patch +Patch5: gnome-applets-1.4.0.5-charpick-cflags.patch +Patch6: gnome-applets-1.4.0.5-pppcommand.patch +Patch7: gnome-applets-1.4.0.5-yahoo.patch +Patch8: gnome-applets-1.4.0.5-orientation.patch %description GNOME (GNU Network Object Model Environment) is a user-friendly set of @@ -50,13 +57,15 @@ fi %setup -q %endif -%patch1 -p1 -b .isdn +# already upstream, left here in case I downgrade to 1.4.0.1 +# %patch1 -p1 -b .isdn %ifnarch %{no_apm_archs} %patch2 -p1 -b .nobrokenpath %endif -%patch3 -p0 -b .mixer +# also appears to be upstream, though changed slightly (?) +# %patch3 -p0 -b .mixer cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/po/ja.po cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/ @@ -66,19 +75,30 @@ tar zxf %{SOURCE4} %ifnarch %{no_apm_archs} %patch4 -p0 -b .batstat_dialog %endif -%patch5 -p1 -b .scrollkeeper -automake + +%patch5 -p1 -b .charpick-cflags +%patch6 -p1 -b .pppcommand +%patch7 -p1 -b .yahoo +%ifnarch %{no_apm_archs} +%patch8 -p1 -b .orientation +%endif %build -%configure --sysconfdir=/etc -CFLAGS="$RPM_OPT_FLAGS" +libtoolize --copy --force +aclocal-1.4 -I macros +automake-1.4 +autoconf +%configure OLD_PO_FILE_INPUT=yes make %ifnarch %{no_apm_archs} cd %{battstat} -automake -%configure +libtoolize --copy --force +aclocal-1.4 -I macros +automake-1.4 +autoconf +%configure %endif %install @@ -216,11 +236,34 @@ BuildFiles /usr/share/gnome/gkb /usr/share/gnome/help/* - - %doc AUTHORS COPYING ChangeLog NEWS README %changelog +* Thu Apr 11 2002 Havoc Pennington +- default battstat applet to vertical mode + +* Thu Mar 21 2002 Havoc Pennington +- add patch to adapt to yahoo web site changes, #61561 + +* Tue Mar 5 2002 Havoc Pennington +- remove requires libghttp4 + +* Mon Mar 4 2002 Havoc Pennington +- no apm on sparc, #60538 +- obsolete battstat_applet for Ximian compat, #51427 +- use ifup/ifdown ppp0 instead of pppon/pppoff for default + ppp command in modemlights, #54199 + +* Tue Feb 12 2002 Havoc Pennington +- 1.4.0.5, cross fingers +- add gconf-devel buildreq, though this is dubious as hell + (pulled in by gtik using gnome-vfs, but if gtik actually + accessed gconf it would fail due to gnorba conflict) +- patch totally busted charpick Makefile.am cflags override + +* Thu Jan 24 2002 Havoc Pennington +- automake14 + * Thu Aug 30 2001 Alex Larsson - Removed annoying broken battery full dialog #52861 - Also fix mixer applet for USB sound #52603 diff --git a/sources b/sources index 954da6f..65e221f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 606bb5470828d761afc2a940b117e295 battstat_applet-2.0.10.tar.gz -5b459439d4d698e86a6239734f42ca9f gnome-applets-1.4.0.1.tar.gz +55fe2ebe5d8e0f9df28004dac8d9eb5e gnome-applets-1.4.0.5.tar.gz ff43dcd6c14690ae7a3ade5307a16565 gnome-applets-pofiles.tar.gz