rpms/util-linux-ng/devel mount.tmpfs, 1.3, 1.4 util-linux-ng.spec, 1.66, 1.67

[kzak]

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30464

Modified Files:
	mount.tmpfs util-linux-ng.spec 
Log Message:
* Mon Dec  7 2009  Karel Zak <kzak at redhat.com> 2.17-0.4
- add clock.8 man page (manlink to hwclock)
- add --help to mount.tmpfs



Index: mount.tmpfs
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/mount.tmpfs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mount.tmpfs	20 Mar 2009 09:13:48 -0000	1.3
+++ mount.tmpfs	7 Dec 2009 11:17:37 -0000	1.4
@@ -10,6 +10,14 @@
 # /sbin/mount.tmpfs spec dir [-sfnv] [-o options]
 #
 
+case $1 in
+  -h|--help|-?)
+      echo "mount.tmpfs is a private mount(8) wrapper for tmpfs."
+      echo "Don't use it directly!"
+      exit 1
+      ;;
+esac
+
 if ! echo "$@" | grep -q -E '(fs|def|root)?context='; then
   con=$(ls --scontext -d "$2" | cut -f 1 -d ' ')
   if [ -n "$con" ] && [ "$con" != "?" ] && [ "$con" != "unlabeled" ]; then 


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- util-linux-ng.spec	23 Nov 2009 12:34:10 -0000	1.66
+++ util-linux-ng.spec	7 Dec 2009 11:17:37 -0000	1.67
@@ -4,7 +4,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.17
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -303,7 +303,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/su
 
 ln -sf ../../sbin/hwclock ${RPM_BUILD_ROOT}/usr/sbin/hwclock
 ln -sf hwclock ${RPM_BUILD_ROOT}/sbin/clock
-
+echo ".so man8/hwclock.8" > ${RPM_BUILD_ROOT}%{_mandir}/man8/clock.8
 
 # remove libtool junk  (TODO)
 #rm -f ${RPM_BUILD_ROOT}/%{_lib}/libblkid.la
@@ -324,7 +324,7 @@ for I in /usr/{bin,sbin}/{fdformat,tunel
          %{_mandir}/man8/{fdformat,tunelp,floppy}.8* \
          /sbin/{hwclock,clock} \
 	 /usr/sbin/hwclock \
-         %{_mandir}/man8/hwclock.8*; do
+         %{_mandir}/man8/{hwclock,clock}.8*; do
 	
 	rm -f $RPM_BUILD_ROOT$I
 done
@@ -641,6 +641,7 @@ fi
 %{_mandir}/man8/fdformat.8*
 %{_mandir}/man8/floppy.8*
 %{_mandir}/man8/hwclock.8*
+%{_mandir}/man8/clock.8*
 %{_mandir}/man8/tunelp.8*
 %endif
 
@@ -710,6 +711,10 @@ fi
 
 
 %changelog
+* Mon Dec  7 2009  Karel Zak <kzak at redhat.com> 2.17-0.4
+- add clock.8 man page (manlink to hwclock)
+- add --help to mount.tmpfs
+
 * Mon Nov 23 2009  Karel Zak <kzak at redhat.com> 2.17-0.3
 - upgrade to 2.17-rc1
   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc1-ChangeLog