Mercurial Mercurial > sustaining > oi_151a > spec-files / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Solaris/SUNWgnome-applets.spec
changeset 7651 316e279bf756
parent 7643 3e6d7e4c2f81
child 7818 e8a886ba0676 
--- a/Solaris/SUNWgnome-applets.spec	Sat Jul 15 03:46:09 2006 +0000
+++ b/Solaris/SUNWgnome-applets.spec	Sat Jul 15 04:04:53 2006 +0000
@@ -19,7 +19,6 @@
 Name:                    SUNWgnome-applets
 Summary:                 GNOME panel applets
 Version:                 %{default_pkg_version}
-Source1:                 gnome-keyboard-layout.1
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -71,7 +70,7 @@
 Summary:                 %{summary} - amusements - / filesystem
 SUNW_BaseDir:            /
 %include default-depend.inc
-Requires: SUNWpostrun
+Requires: SUNWpostrun-root
 Requires: SUNWgnome-config
 
 %package -n SUNWgnome-internet-applets
@@ -93,7 +92,7 @@
 Summary:                 %{summary} - internet - / filesystem
 SUNW_BaseDir:            /
 %include default-depend.inc
-Requires: SUNWpostrun
+Requires: SUNWpostrun-root
 Requires: SUNWgnome-config
 
 %package -n SUNWgnome-internet-applets-devel
@@ -118,7 +117,7 @@
 Summary:                 %{summary} - intranet - / filesystem
 SUNW_BaseDir:            /
 %include default-depend.inc
-Requires: SUNWpostrun
+Requires: SUNWpostrun-root
 Requires: SUNWgnome-config
 
 %package -n SUNWgnome-intranet-applets-devel
@@ -144,7 +143,7 @@
 Summary:                 %{summary} - multimedia - / filesystem
 SUNW_BaseDir:            /
 %include default-depend.inc
-Requires: SUNWpostrun
+Requires: SUNWpostrun-root
 Requires: SUNWgnome-config
 
 %package -n SUNWgnome-utility-applets
@@ -171,7 +170,7 @@
 Summary:                 %{summary} - utility - / filesystem
 SUNW_BaseDir:            /
 %include default-depend.inc
-Requires: SUNWpostrun
+Requires: SUNWpostrun-root
 Requires: SUNWgnome-config
 
 %package -n SUNWgnome-utility-applets-devel
@@ -232,15 +231,12 @@
 %gnetstatus.install -d %name-%version
 %deskbar_applet.install -d %name-%version
 
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-install -d $RPM_BUILD_ROOT%{_mandir}/sman1
-install --mode=0755 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/sman1
-install --mode=0755 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/sman1
 chmod 0644 $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/C/*.xml
 
 rm -rf $RPM_BUILD_ROOT%{_prefix}/var
 rm -rf $RPM_BUILD_ROOT/var/lib
 rmdir $RPM_BUILD_ROOT/var
+rm -rf $RPM_BUILD_ROOT%{_mandir}
 
 %if %build_l10n
 %else
@@ -260,137 +256,137 @@
 %post -n SUNWgnome-fun-applets
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %postun -n SUNWgnome-fun-applets
-test -x $PKG_INSTALL_ROOT/usr/lib/postrun || exit 0
+test -x $BASEDIR/lib/postrun || exit 0
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %post -n SUNWgnome-internet-applets
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %postun -n SUNWgnome-internet-applets
-test -x $PKG_INSTALL_ROOT/usr/lib/postrun || exit 0
+test -x $BASEDIR/lib/postrun || exit 0
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %post -n SUNWgnome-intranet-applets
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %postun -n SUNWgnome-intranet-applets
-test -x $PKG_INSTALL_ROOT/usr/lib/postrun || exit 0
+test -x $BASEDIR/lib/postrun || exit 0
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %post -n SUNWgnome-mm-applets
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %postun -n SUNWgnome-mm-applets
-test -x $PKG_INSTALL_ROOT/usr/lib/postrun || exit 0
+test -x $BASEDIR/lib/postrun || exit 0
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %post -n SUNWgnome-utility-applets
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %postun -n SUNWgnome-utility-applets
-test -x $PKG_INSTALL_ROOT/usr/lib/postrun || exit 0
+test -x $BASEDIR/lib/postrun || exit 0
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u -c JDS
+) | $BASEDIR/lib/postrun -b -u -c JDS
 
 %post -n SUNWgnome-fun-applets-root
 ( echo 'test -x /usr/bin/gconftool-2 || {';
   echo '  echo "ERROR: gconftool-2 not found"';
-  echo '  exit 0';
+  echo '  exit 1';
   echo '}';
   echo 'umask 0022';
   echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
   echo 'export GCONF_CONFIG_SOURCE';
   echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -u -c JDS_wait
+) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
 
 %preun -n SUNWgnome-fun-applets-root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
+( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
+  echo '  echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
   echo '  exit 0';
   echo '}';
   echo 'umask 0022';
-  echo 'GCONF_CONFIG_SOURCE=xml:merged:$PKG_INSTALL_ROOT/etc/gconf/gconf.xml.defaults';
+  echo 'GCONF_CONFIG_SOURCE=xml:merged:$BASEDIR/etc/gconf/gconf.xml.defaults';
   echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
   echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
   echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
-  echo 'SDIR=$PKG_INSTALL_ROOT%{_sysconfdir}/gconf/schemas';
+  echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/geyes.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -i -c JDS -a
+) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-internet-applets-root
 ( echo 'test -x /usr/bin/gconftool-2 || {';
   echo '  echo "ERROR: gconftool-2 not found"';
-  echo '  exit 0';
+  echo '  exit 1';
   echo '}';
   echo 'umask 0022';
   echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
   echo 'export GCONF_CONFIG_SOURCE';
   echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -u -c JDS_wait
+) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
 
 %preun -n SUNWgnome-internet-applets-root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
+( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
+  echo '  echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
   echo '  exit 0';
   echo '}';
   echo 'umask 0022';
-  echo 'GCONF_CONFIG_SOURCE=xml:merged:$PKG_INSTALL_ROOT/etc/gconf/gconf.xml.defaults';
+  echo 'GCONF_CONFIG_SOURCE=xml:merged:$BASEDIR/etc/gconf/gconf.xml.defaults';
   echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
   echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
   echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
-  echo 'SDIR=$PKG_INSTALL_ROOT%{_sysconfdir}/gconf/schemas';
+  echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/gtik.schemas';
   echo '         $SDIR/gweather.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -i -c JDS -a
+) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-intranet-applets-root
 ( echo 'test -x /usr/bin/gconftool-2 || {';
   echo '  echo "ERROR: gconftool-2 not found"';
-  echo '  exit 0';
+  echo '  exit 1';
   echo '}';
   echo 'umask 0022';
   echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
   echo 'export GCONF_CONFIG_SOURCE';
   echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -u -c JDS_wait
+) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
 
 %preun -n SUNWgnome-intranet-applets-root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
+( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
+  echo '  echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
   echo '  exit 0';
   echo '}';
   echo 'umask 0022';
-  echo 'GCONF_CONFIG_SOURCE=xml:merged:$PKG_INSTALL_ROOT/etc/gconf/gconf.xml.defaults';
+  echo 'GCONF_CONFIG_SOURCE=xml:merged:$BASEDIR/etc/gconf/gconf.xml.defaults';
   echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
   echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
   echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
-  echo 'SDIR=$PKG_INSTALL_ROOT%{_sysconfdir}/gconf/schemas';
+  echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/WebEyes.schemas';
   echo '         $SDIR/netstatus.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -i -c JDS -a
+) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-mm-applets-root
 ( echo 'test -x /usr/bin/gconftool-2 || {';
@@ -401,51 +397,51 @@
   echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
   echo 'export GCONF_CONFIG_SOURCE';
   echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -u -c JDS_wait
+) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
 
 %preun -n SUNWgnome-mm-applets-root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
+( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
+  echo '  echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
   echo '  exit 0';
   echo '}';
   echo 'umask 0022';
-  echo 'GCONF_CONFIG_SOURCE=xml:merged:$PKG_INSTALL_ROOT/etc/gconf/gconf.xml.defaults';
+  echo 'GCONF_CONFIG_SOURCE=xml:merged:$BASEDIR/etc/gconf/gconf.xml.defaults';
   echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
   echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
   echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
-  echo 'SDIR=$PKG_INSTALL_ROOT%{_sysconfdir}/gconf/schemas';
+  echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/mixer.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -i -c JDS -a
+) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %post -n SUNWgnome-utility-applets-root
 ( echo 'test -x /usr/bin/gconftool-2 || {';
   echo '  echo "ERROR: gconftool-2 not found"';
-  echo '  exit 0';
+  echo '  exit 1';
   echo '}';
   echo 'umask 0022';
   echo 'GCONF_CONFIG_SOURCE=xml:merged:/etc/gconf/gconf.xml.defaults';
   echo 'export GCONF_CONFIG_SOURCE';
   echo '/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -u -c JDS_wait
+) | $BASEDIR/var/lib/postrun/postrun -u -c JDS_wait
 
 %preun -n SUNWgnome-utility-applets-root
-( echo 'test -x /usr/bin/gconftool-2 || {';
-  echo '  echo "ERROR: gconftool-2 not found"';
+( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
+  echo '  echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
   echo '  exit 0';
   echo '}';
   echo 'umask 0022';
-  echo 'GCONF_CONFIG_SOURCE=xml:merged:$PKG_INSTALL_ROOT/etc/gconf/gconf.xml.defaults';
+  echo 'GCONF_CONFIG_SOURCE=xml:merged:$BASEDIR/etc/gconf/gconf.xml.defaults';
   echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
   echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
   echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
-  echo 'SDIR=$PKG_INSTALL_ROOT%{_sysconfdir}/gconf/schemas';
+  echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/charpick.schemas';
   echo '         $SDIR/deskbar-applet.schemas';
   echo '         $SDIR/quick-lounge.schemas';
   echo '         $SDIR/stickynotes.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -i -c JDS -a
+) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
 %files
 %defattr (-, root, bin)
@@ -578,7 +574,6 @@
 %{_libexecdir}/charpick_applet2
 %{_libexecdir}/stickynotes_applet
 %{_libexecdir}/accessx-status-applet
-%{_libexecdir}/gnome-keyboard-applet
 %{_libexecdir}/quick-lounge-applet
 %dir %attr(0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/gnome
@@ -602,16 +597,12 @@
 %{_datadir}/gnome-2.0/ui/GNOME_CharpickerApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_AccessxApplet.xml
-%{_datadir}/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_QuickLoungeApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
 %{_datadir}/icons/hicolor/48x48/apps/ax-applet*
 %{_datadir}/icons/hicolor/48x48/apps/charpick*
 %{_datadir}/quick-lounge
 %{_datadir}/deskbar-applet
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr(0755, root, bin) %{_mandir}/sman1
-%{_mandir}/sman1/gnome-keyboard*
 
 %files -n SUNWgnome-utility-applets-root
 %defattr(0755, root, sys)
@@ -648,6 +639,9 @@
 # %{_datadir}/omf/gnome-netstatus/*-[a-z][a-z]_*.omf
 
 %changelog
+* Fri Jul 14 2006 - [email protected]
+- update %post/%postun/etc scripts to support diskless client setup,
+  part of 6448317
 * Sat Jul 15 2006 - [email protected]
 - Remove gswitchit and friends.
 * Thu Jun 29 2006 - [email protected]
sustaining/oi_151a/spec-files