From fd6a21a8faea14d10229f602c7eb1de7dfc223aa Mon Sep 17 00:00:00 2001 From: kzak Date: Fri, 25 Mar 2005 12:21:09 +0000 Subject: [PATCH] -minor changes in .spec --- util-linux-2.12p-ipcs-typo.patch | 11 +++++++---- util-linux.spec | 9 +++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/util-linux-2.12p-ipcs-typo.patch b/util-linux-2.12p-ipcs-typo.patch index 18f4529..3e74ab7 100644 --- a/util-linux-2.12p-ipcs-typo.patch +++ b/util-linux-2.12p-ipcs-typo.patch @@ -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: diff --git a/util-linux.spec b/util-linux.spec index f8b43cd..95f8556 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -233,7 +233,7 @@ mv MCONFIG.new MCONFIG %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}%{_infodir} 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 @@ fi /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}