auto-import changelog data from gnome-applets-2.0.0-4.src.rpmgnome-applets-2_0_0-4RHL-7_3-split

Thu Jun 13 2002 Nalin Dahyabhai <nalin@redhat.com>
- fix a scrollkeeper validation bug
Wed Jun 12 2002 Havoc Pennington <hp@redhat.com>
- remove panel-menu.schemas from the list of schemas.
- 2.0.0
Fri Jun 07 2002 Havoc Pennington <hp@redhat.com>
- rebuild in different environment
Wed Jun 05 2002 Havoc Pennington <hp@redhat.com>
- 1.105.0
Sun May 26 2002 Tim Powers <timp@redhat.com>
- automated rebuild
Tue May 21 2002 Havoc Pennington <hp@redhat.com>
- rebuild in different environment
Tue May 21 2002 Havoc Pennington <hp@redhat.com>
- 1.103.0
Fri May 03 2002 Havoc Pennington <hp@redhat.com>
- 1.100.0
Fri Apr 19 2002 Havoc Pennington <hp@redhat.com>
- GNOME 2 version

3 files changed, 83 insertions, 198 deletions

diff --git a/.cvsignore b/.cvsignore
index 068c6ba..b3fb9d7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-battstat_applet-2.0.10.tar.gz
-gnome-applets-1.4.0.5.tar.gz
-gnome-applets-pofiles.tar.gz
+gnome-applets-2.0.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8323f52..63f307b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,42 +1,37 @@
-%define battstat battstat_applet-2.0.10
 %define no_apm_archs alpha ia64 s390 s390x sparc sparc64
 
-Summary: Small applications for the GNOME panel.
+%define glib2_version 2.0.0
+%define gtk2_version 2.0.0
+%define libgnomeui_version 1.117.2
+%define gnome_panel_version 1.5.24
+%define libgtop2_version 1.90.2
+
+Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
-Version: 	1.4.0.5
-Release:	6
+Version: 	2.0.0
+Release:        4
 Epoch:          1
 License:	GPL
-Group: User Interface/Desktops
-Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/unstable/%{name}/%{name}-%{version}.tar.gz
-Source2:	gnome-applets-1.2.4-ja.po
-Source3:	gtik2_applet.desktop
-Source4:        gnome-applets-pofiles.tar.gz
-Source5:        battstat_applet-2.0.10.tar.gz
+Group:          User Interface/Desktops
+Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/pre-gnome2/%{name}/%{name}-%{version}.tar.bz2
+Patch:		gnome-applets-scrollkeeper-dtd.patch
 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
+Prereq:         scrollkeeper >= 0.1.4
 
-Requires:	libxml
-Requires:	libgtop
-Requires:	gnome-core >= 1.1.2
-Requires:	gdk-pixbuf >= 0.7.0
+BuildRequires:  glib2-devel >= %{glib2_version}
+BuildRequires:  gtk2-devel >= %{gtk2_version}
+BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
+BuildRequires:  gnome-panel >= %{gnome_panel_version}
+BuildRequires:  libgtop2-devel >= %{libgtop2_version}
+BuildRequires:  Xft
+BuildRequires:  fontconfig
 
-Obsoletes: battstat_applet
+Requires:	gnome-panel >= %{gnome_panel_version}
 
-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.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
+Obsoletes: battstat_applet
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -46,201 +41,95 @@ small utilities for the GNOME panel.
 
 %prep
 %ifnarch %{no_apm_archs}
-%setup -q -a 5
 
 if ! test -e /usr/lib/libapm.a ; then
     echo "You must have apmd installed"
     exit 1
 fi
-
-%else
-%setup -q
 %endif
 
-# 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
-
-# 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/
-# translations
-tar zxf %{SOURCE4}
-# broken po file
-rm -f po/zh_TW.po; touch po/zh_TW.po
-
-%ifnarch %{no_apm_archs}
-%patch4 -p0 -b .batstat_dialog
-%endif
+%setup -q
+%patch -p0 -b .scrollkeeper-dtd
 
-%patch5 -p1 -b .charpick-cflags
-%patch6 -p1 -b .pppcommand
-%patch7 -p1 -b .yahoo
-%ifnarch %{no_apm_archs}
-%patch8 -p1 -b .orientation
-%endif
+## temporary hack since I have new gnome-applets but not new gnome libs
+perl -pi -e 's/REQUIRED=2.0.0/REQUIRED=0.0.1/g' configure configure.in
 
 %build
 
-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}
-libtoolize --copy --force
-aclocal-1.4 -I macros
-automake-1.4
-autoconf
-%configure
-%endif
+make
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-%makeinstall
+rm -rf $RPM_BUILD_ROOT
 
-%ifnarch %{no_apm_archs}
-## install battstat
-cd %{battstat}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
-%endif
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-## delete desktop files for extraneous applets
-cd $RPM_BUILD_ROOT%{_prefix}/share/applets
-# Salvage this toy clock
-mv Clocks/jbc_applet.desktop Amusements
-# nuke other clocks
-/bin/rm -rf Clocks
+%find_lang %name
 
-# whoever thought whereami had utility was on hard drugs
-mv Utility/whereami_applet.desktop Amusements
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-## battery_applet .desktop has more translations and a better name,
-## so we use it, but have it launch battstat instead
+%post
+/sbin/ldconfig
+scrollkeeper-update
 
-cat Monitors/battery_applet.desktop | sed -e 's/battery_applet/battstat_applet/g' > Utility/battstat_applet.desktop
+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"
+for S in $SCHEMAS; do
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+done
 
-# Then nuke battery_applet.desktop
-rm Monitors/battery_applet.desktop
+%postun -p /sbin/ldconfig
 
-%ifarch %{no_apm_archs}
-# nuke battstat stuff
-rm Utility/battstat_applet.desktop
-%else
-# nuke original battstat .desktop
-rm Monitors/battstat_applet.desktop
-%endif
+%files -f %{name}.lang
+%defattr(-, root, root)
 
-cd $RPM_BUILD_DIR/%{name}-%{version}
+%doc AUTHORS COPYING ChangeLog NEWS README
 
-# no binary stripping
-if [ -f %{name}.files ] ; then
-  rm -f %{name}.files
-fi
-##############################################################################
-##
-function ProcessLang() {
- # rpm provides a handy scriptlet to do the locale stuff lets use that.
- if [ -f /usr/lib/rpm/find-lang.sh ] ; then
-  /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name
-  sed "s:(644, root, root, 755):(444, bin, bin, 555):" %{name}.lang >tmp.lang && mv tmp.lang %{name}.lang
-  if [ -f %{name}.files ] ; then
-    cat %{name}.files %{name}.lang >tmp.files && mv tmp.files %{name}.files
-  fi
- fi
-}
-function ProcessBin() {
-  # Gather up all the executable files. Stripping if requested.
-  # This will not recurse.
-  if [ -d $RPM_BUILD_ROOT%{_prefix}/bin ] ; then
-    echo "%defattr (0555, bin, bin)" >>%{name}.files
-    find $RPM_BUILD_ROOT%{_prefix}/bin -type f -print | sed "s:^$RPM_BUILD_ROOT::g" >>%{name}.files
-  fi
-}
-
-function ProcessLib() {
-  # Gather up any libraries.
-  # Usage: ProcessLib <dir> <type> <output file>
-  # Type is either 'runtime' or 'devel'
-  if [ -d $1 ] ; then
-    echo "%defattr (0555, bin, bin)" >>$3
-    case "$2" in
-      runtime)
-       # Grab runtime libraries
-       find $1 -name "*.so.*" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
-       ;;
-      devel)
-       find $1 -name "*.so" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
-       find $1 -name "*.la" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
-       find $1 -name "*.a" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
-       find $1 -name "*.sh" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
-       ;;
-    esac
-   fi
-}
-function ProcessDir() {
-  # Build a list of files in the specified dir sticking
-  # a %defattr line as specified in front of the mess. This is intended
-  # for normal dirs. Use ProcessLib for library dirs
-  # for include dirs. Appending to <output file>.
-  # This will recurse.
-  #
-  # Usage: ProcessDir <dir> <output file> <attr>
-  #
-  if [ -d $1 ] ; then
-   if [ ! -z "$3" ] ; then
-     echo "%defattr ($3)" >>$2
-   fi
-   echo "*** Processing $1"
-   find $1 -type f -print | sed "s:^$RPM_BUILD_ROOT::g" >>$2
-  fi
-}
-
-function BuildFiles() {
-  ProcessBin
-  ProcessLang
-  for i in `find $RPM_BUILD_ROOT%{_prefix}/share -maxdepth 1 -type d -print | \
-     sed "s:^$RPM_BUILD_ROOT%{_prefix}/share::g"` ; do
-    echo $i
-    case $i in
-     /applets|/asclock|/clockmail|/geyes|/gnome|/gweather|/odometer|/sound-monitor|/pixmaps|/tickastat|/xmodmap)
-
-         ProcessDir $RPM_BUILD_ROOT%{_prefix}/share$i %{name}.files "0444, bin, bin, 0555"
-         ;;
-     *)
-         ;;
-   esac
-  done
-  ProcessDir $RPM_BUILD_ROOT/etc %{name}.files "0444, bin, bin, 0555"
-  ProcessLib $RPM_BUILD_ROOT%{_prefix}/lib runtime %{name}.files
-}
-
-BuildFiles
+%{_datadir}/pixmaps
+%{_datadir}/gnome-2.0
+%{_datadir}/gnome
+%{_datadir}/geyes
+%{_datadir}/xmodmap
+%{_datadir}/gweather
+%{_datadir}/battstat_applet
+%{_datadir}/omf
+%{_bindir}/*
+%{_libdir}/bonobo
+#%{_libdir}/*.so.*
+%{_sysconfdir}/gconf/schemas/*
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%changelog
+* Thu Jun 13 2002 Nalin Dahyabhai <nalin@redhat.com>
+- fix a scrollkeeper validation bug
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+* Wed Jun 12 2002 Havoc Pennington <hp@redhat.com>
+- remove panel-menu.schemas from the list of schemas.
+- 2.0.0
 
-%files -f %{name}.files
-%defattr(-, root, root)
+* Fri Jun 07 2002 Havoc Pennington <hp@redhat.com>
+- rebuild in different environment
 
-# Need to own the directories too
-/usr/share/gnome/gkb
-/usr/share/gnome/help/*
+* Wed Jun  5 2002 Havoc Pennington <hp@redhat.com>
+- 1.105.0
 
-%doc AUTHORS COPYING ChangeLog NEWS README
+* Sun May 26 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Tue May 21 2002 Havoc Pennington <hp@redhat.com>
+- rebuild in different environment
+
+* Tue May 21 2002 Havoc Pennington <hp@redhat.com>
+- 1.103.0
+
+* Fri May  3 2002 Havoc Pennington <hp@redhat.com>
+- 1.100.0
+
+* Fri Apr 19 2002 Havoc Pennington <hp@redhat.com>
+- GNOME 2 version
 
-%changelog
 * Mon Apr 15 2002 Havoc Pennington <hp@redhat.com>
 - merge translations
 
diff --git a/sources b/sources
index 41e693f..99a89dc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-606bb5470828d761afc2a940b117e295  battstat_applet-2.0.10.tar.gz
-55fe2ebe5d8e0f9df28004dac8d9eb5e  gnome-applets-1.4.0.5.tar.gz
-8e5c907e8fb104ebeec05ce45d764cd5  gnome-applets-pofiles.tar.gz
+f3a55f1d0c2486b55943f2da213f4ca5  gnome-applets-2.0.0.tar.bz2