sustaining/oi_151a/spec-files: comparison gnome-applets.spec

equal deleted inserted replaced

-:f7f6341517d3
+:5be0d828467e
 Name:         gnome-applets
 License:      GPL
 Group:        System/GUI/GNOME
 Version:      2.6.2.1
-Release:      36
+Release:      37
 Distribution: Java Desktop System, Release 3
 Vendor:	      Sun Microsystems, Inc.
 Summary:      GNOME Applets
 Source:       http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.6/gnome-applets-%{version}.tar.bz2
 Source1:      gnome-applets-l10n-po-1.11.tar.bz2
 Source2:      gnome-mixer.png
-Source3:      l10n-configure.sh
+Source3:      gnome-applets_docs-0.10.tar.bz2
 Source4:      gnome-applets-l10n-online-help-ci-linux.tar.bz2
 Source5:      sticky-meta-locked.png
 Source6:      gkb_xmmap.1.gz
 Source7:      gnome-keyboard-layout.1.gz
 Source8:      gswitchit-plugins-capplet.1.gz
-Source9:      gnome-applets_docs-0.10.tar.bz2
+Source9:      l10n-configure.sh
-Source10:     gnome-applets_docs-0.11linux.tar.bz2
 Patch1:       gnome-applets-01-g11n-potfiles.diff
 Patch2:       gnome-applets-02-gkb-window-icon-current.diff
 Patch3:       gnome-applets-03-mount-floppy-location.diff
 Patch4:       gnome-applets-04-g11n-i18n-ui.diff
 Patch5:       gnome-applets-05-mailcheck-pop3.diff
 %prep
 %setup -q
 bzcat %SOURCE1 | tar xf -
 cp %SOURCE2 mixer/gnome-mixer-applet.png
-%ifos solaris
+bzcat %SOURCE3 | tar xf -
-bzcat %SOURCE9 | tar xf -
-%else
-bzcat %SOURCE10 | tar xf -
-%endif
 bzcat %SOURCE4 | tar xf -
 cp %SOURCE5 accessx-status/pixmaps/sticky-meta-locked.png
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-bash -x %SOURCE3
+bash -x %SOURCE9
 %build
 libtoolize --force
 aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
 autoheader
 javahelp-convert-install $RPM_BUILD_ROOT accessx-status accessx-status.xml
 javahelp-convert-install $RPM_BUILD_ROOT cdplayer cdplayer.xml
 javahelp-convert-install $RPM_BUILD_ROOT char-palette char-palette.xml
 javahelp-convert-install $RPM_BUILD_ROOT command-line command-line.xml
+javahelp-convert-install $RPM_BUILD_ROOT drivemount drivemount.xml
 javahelp-convert-install $RPM_BUILD_ROOT geyes geyes.xml
 javahelp-convert-install $RPM_BUILD_ROOT gtik2_applet2 gtik2_applet2.xml
 javahelp-convert-install $RPM_BUILD_ROOT gweather gweather.xml
 javahelp-convert-install $RPM_BUILD_ROOT mailcheck mailcheck.xml
 javahelp-convert-install $RPM_BUILD_ROOT mixer_applet2 mixer_applet2.xml
 javahelp-convert-install $RPM_BUILD_ROOT battstat battstat.xml
 javahelp-convert-install $RPM_BUILD_ROOT modemlights modemlights.xml
 javahelp-convert-install $RPM_BUILD_ROOT multiload multiload.xml
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/javahelp/gkb/*/jhelpset_cat.hs
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/javahelp/gkb/*/jhelptoc_cat.xml
+rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/gnome-applets/gkb-*
 %endif
+rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/gnome-applets/gweather-*
 %clean
 rm -rf $RPM_BUILD_ROOT
 %post
 %{_includedir}/libgswitchit/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man1/*
 %changelog
-* Thu Jan 27 2005 - [email protected]
+* Fri Jan 28 2005 [email protected]
-- Update docs with Linux specific tarball from [email protected].
+- #6222302 : Remove gkb from yelp for linux
-- Remove reference to drivemount.xml as this has been removed.
+- #6222336 : Remove gweather from yelp
 * Mon Jan 24 2005 [email protected]
 - Adding autoheader to pick up the powersaved changes.
 * Mon Jan 24 2005 [email protected]

changeset 4966	5be0d828467e
parent 4955	ecd30dfd093d
child 4973	e0638725bbc5