rpms/util-linux/devel util-linux-2.12p-ipcs-typo.patch, 1.1, 1.2 util-linux.spec, 1.64, 1.65

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Mar 25 12:21:12 UTC 2005


Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1508

Modified Files:
	util-linux-2.12p-ipcs-typo.patch util-linux.spec 
Log Message:
-minor changes in .spec

util-linux-2.12p-ipcs-typo.patch:
 ipcs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: util-linux-2.12p-ipcs-typo.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.12p-ipcs-typo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.12p-ipcs-typo.patch	25 Mar 2005 11:45:47 -0000	1.1
+++ util-linux-2.12p-ipcs-typo.patch	25 Mar 2005 12:21:09 -0000	1.2
@@ -1,11 +1,14 @@
---- util-linux-2.12p/sys-utils/ipcs.c.ipcs-typo	2005-03-17 17:28:32.006952664 +0100
-+++ util-linux-2.12p/sys-utils/ipcs.c	2005-03-17 17:28:48.823396176 +0100
-@@ -423,7 +423,7 @@
+--- util-linux-2.12p/sys-utils/ipcs.c.typo	2005-03-25 13:01:54.871752240 +0100
++++ util-linux-2.12p/sys-utils/ipcs.c	2005-03-25 13:02:43.745322328 +0100
+@@ -423,9 +423,9 @@
  		break;
  
  	case TIME:
 -		printf (_("------ Shared Memory Operation/Change Times --------\n"));
 +		printf (_("------ Semaphore Operation/Change Times --------\n"));
  		printf (_("%-8s %-10s %-26.24s %-26.24s\n"),
- 			_("shmid"),_("owner"),_("last-op"),_("last-changed"));
+-			_("shmid"),_("owner"),_("last-op"),_("last-changed"));
++			_("semid"),_("owner"),_("last-op"),_("last-changed"));
  		break;
+ 
+ 	case PID:


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- util-linux.spec	25 Mar 2005 11:45:47 -0000	1.64
+++ util-linux.spec	25 Mar 2005 12:21:09 -0000	1.65
@@ -233,7 +233,7 @@
 
 %patch180 -p1 -b .lastlog
 %patch181 -p1
-%patch182 -p1
+%patch182 -p1 -b .typo
 %patch183 -p1 -b .duplabel
 
 %build
@@ -278,8 +278,9 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,6,8,5}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{pam.d,security/console.apps}
-mkdir -p ${RPM_BUILD_ROOT}/var/log/
-touch ${RPM_BUILD_ROOT}/var/log/lastlog
+mkdir -p %{buildroot}/var/log
+touch %{buildroot}/var/log/lastlog
+chmod 0400 %{buildroot}/var/log/lastlog
 
 make \
 	OPT="$RPM_OPT_FLAGS %{make_cflags}" \
@@ -453,7 +454,7 @@
 /sbin/rescuept
 /sbin/nologin
 %{_mandir}/man8/nologin.8*
-%ghost %attr(0400,root,root) /var/log/lastlog
+%ghost %attr(0400,root,root) %verify(not md5 size mtime) /var/log/lastlog
 
 # Begin kbdrate stuff
 %if %{with_kbdrate}




More information about the fedora-cvs-commits mailing list