rpms/man/devel man-1.6e-chmod.patch,NONE,1.1 man.spec,1.54,1.55

Mon Mar 12 15:08:15 UTC 2007

Author: varekova

Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11086

Modified Files:
	man.spec 
Added Files:
	man-1.6e-chmod.patch 
Log Message:
- incorporate the package review feedback


man-1.6e-chmod.patch:
 Makefile.in |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE man-1.6e-chmod.patch ---
--- man-1.6e/src/Makefile.in.chmod	2007-03-12 13:23:49.000000000 +0100
+++ man-1.6e/src/Makefile.in	2007-03-12 13:32:05.000000000 +0100
@@ -96,6 +96,8 @@
 	cp makewhatis.sh makewhatis.in
 	../conf_script makewhatis
 	chmod +x makewhatis
+	cat makewhatis |sed -e '1,+3d' >makewhatis.aux
+	mv makewhatis.aux makewhatis
 
 MANCONFIG=$(DESTDIR)$(PREFIX)@man_config_file@
 
@@ -106,7 +108,7 @@
 	$(INSTALL) -c -m 755 whatis $(DESTDIR)$(PREFIX)@whatis@
 	$(INSTALL) -c -m 755 man2dvi $(DESTDIR)$(PREFIX)@man2dvi@
 	mkdir -p $(DESTDIR)$(PREFIX)@sbindir@
-	$(INSTALL) -c -m 754 makewhatis $(DESTDIR)$(PREFIX)@makewhatis@
+	$(INSTALL) -c -m 755 makewhatis $(DESTDIR)$(PREFIX)@makewhatis@
 	mkdir -p $(DESTDIR)$(PREFIX)@man_config_dir@
 	if [ -f $(MANCONFIG) ]; then mv $(MANCONFIG) $(MANCONFIG).orig; fi
 	$(INSTALL) -c -m 644 man.conf $(MANCONFIG)


Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- man.spec	9 Jan 2007 09:36:11 -0000	1.54
+++ man.spec	12 Mar 2007 15:08:13 -0000	1.55
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6e
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: System Environment/Base
@@ -27,12 +27,13 @@
 Patch24: man-1.6c-disp.patch
 Patch25: man-1.6d-dashes.patch
 Patch26: man-1.6d-updates.patch
+Patch27: man-1.6e-chmod.patch
 
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
 Requires: less, groff >= 1.18, nroff-i18n, findutils, mktemp >= 1.5-2.1.5x
 Requires: bzip2, gzip, diffutils, rpm
-BuildRequires: less, groff, diffutils, bzip2, gzip, coreutils
+BuildRequires: less, groff
 
 %description
 The man package includes three tools for finding information and/or
@@ -61,6 +62,7 @@
 %patch24 -p1 -b .disp
 %patch25 -p1 -b .dash
 %patch26 -p1 -b .upd
+%patch27 -p1 -b .chmod
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 
@@ -93,20 +95,23 @@
 done
 
 %build
-./configure -default  -confdir /etc +fhs +lang all
+./configure -default  -confdir /etc +fhs +lang all 
 
-find . -type f|xargs perl -pi -e 's,man\.conf \(5\),man.config (5),g'
+for i in `find ./man/*/* -type f`; do
+    cat $i | sed -e "s/man\.conf /man.config /g" > $i
+    cat $i | sed -e "s/man\.conf(/man.config(/g" > $i
+done
 for i in $(find man -name man.conf.man); do
    mv $i ${i%man.conf.man}man.config.5
 done
 
 # HACK: Make output default to using -c; otherwise it appears broken.
-perl -pi -e "s/nroff /nroff -c /" conf_script
+cat conf_script |sed -e "s/nroff /nroff -c /" > conf_script
 
 touch Makefile   # make sure Make thinks we ran configure
 make CC="gcc $RPM_OPT_FLAGS"
 %if %{usecache}
-perl -pi -e "s,^NOCACHE,# NOCACHE,g" src/man.conf
+cat src/man.conf |sed -e "s,^NOCACHE,# NOCACHE,g" > man.conf
 %endif
 
 %install
@@ -215,9 +220,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%config /etc/cron.weekly/makewhatis.cron
-%config /etc/cron.daily/makewhatis.cron
+%defattr(-,root,root,-)
+%config(noreplace) /etc/cron.weekly/makewhatis.cron
+%config(noreplace) /etc/cron.daily/makewhatis.cron
 %if %{usecache}
 %attr(2755,root,man)    /usr/bin/man
 %else
@@ -311,13 +316,16 @@
 %lang(ru) %dir /usr/share/locale/ru
 %lang(ru) /usr/share/locale/ru/man
 %attr(0755,root,root)   %dir %{cache}
-%attr(0775,root,man)    %dir %{cache}/cat[123456789n]
-%attr(0775,root,man)    %dir %{cache}/local
-%attr(0775,root,man)    %dir %{cache}/local/cat[123456789n]
-%attr(0775,root,man)    %dir %{cache}/X11R6
-%attr(0775,root,man)    %dir %{cache}/X11R6/cat[123456789n]
+%attr(0755,root,man)    %dir %{cache}/cat[123456789n]
+%attr(0755,root,man)    %dir %{cache}/local
+%attr(0755,root,man)    %dir %{cache}/local/cat[123456789n]
+%attr(0755,root,man)    %dir %{cache}/X11R6
+%attr(0755,root,man)    %dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Mon Mar 12 2007 Ivana Varekova <varekova at redhat.com> - 1.6e-3
+- incorporate the package review feedback
+
 * Tue Jan  9 2007 Ivana Varekova <varekova at redhat.com> - 1.6e-2
 - Resolves: 221868
   man use incorrect groff option
@@ -491,7 +499,7 @@
 - added patch for korean (#83934)
 
 * Thu Feb 06 2003 Adrian Havill <havill at redhat.com> 1.5k-5
-- marked man.config as noreplace %config (#82088)
+- marked man.config as noreplace config (#82088)
 - moved man.config from /usr/share to /etc even though +fhs (#81964)
 - removed bad argcat patch which made bogus grep queries (#82684)
 
@@ -640,7 +648,7 @@
   accessible (Bug #10254)
 
 * Mon Oct  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Move whatis database to %{cache}/whatis to allow read-only /usr
+- Move whatis database to {cache}/whatis to allow read-only /usr
   filesystems (Bug #18383)
 - Don't use predictable filenames in makewhatis (not reported, spotted while
   fixing 18383)
@@ -671,7 +679,7 @@
   man pages, the build root policy doesn't do it (Bug #12015)
 
 * Tue May 16 2000 Preston Brown <pbrown at redhat.com>
-- default man path is now %{_mandir}.  /usr/man maintained for compat.
+- default man path is now {_mandir}.  /usr/man maintained for compat.
 - remove +sgid option to allow builds as a normal user.  SPEC file maintains
   proper permissions.
 
@@ -727,7 +735,7 @@
 * Thu Aug 13 1998 Jeff Johnson <jbj at redhat.com>
 - enable fsstnd organization
 - change /var/catman/X11 to X11R6
-- %post/%preun to clean up cat litter
+- post/preun to clean up cat litter
 
 * Tue Jun 02 1998 Prospector System <bugs at redhat.com>
 - translations modified for de


