rpms/man/devel man-cmp.sh,NONE,1.1 man.spec,1.60,1.61

Ivana Varekova (varekova) fedora-extras-commits at redhat.com
Fri Mar 21 11:27:00 UTC 2008


Author: varekova

Update of /cvs/pkgs/rpms/man/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29967

Modified Files:
	man.spec 
Added Files:
	man-cmp.sh 
Log Message:
- remove diffutils dependency (#431352)
  thanks Ville Skyttä



--- NEW FILE man-cmp.sh ---
#!/bin/sh

if [ -x /usr/bin/cmp ] ; then
    /usr/bin/cmp -s "$1" "$2"
else
    sha1=`sha1sum -b "$1" | cut -d' ' -f 1`
    sha2=`sha1sum -b "$2" | cut -d' ' -f 1`
    [ -f "$1" -a -f "$2" -a "$sha1" = "$sha2" ]
fi

Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- man.spec	14 Mar 2008 13:42:11 -0000	1.60
+++ man.spec	21 Mar 2008 11:26:24 -0000	1.61
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -13,6 +13,7 @@
 Source1: makewhatis.cronweekly
 Source2: makewhatis.crondaily
 Source3: mess.ru
+Source4: man-cmp.sh
 Patch1: man-1.5m2-confpath.patch
 Patch2: man-1.5h1-make.patch
 Patch6: man-1.5m2-apropos.patch
@@ -32,7 +33,7 @@
 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
+Requires: bzip2, gzip, rpm
 BuildRequires: less, groff
 
 %description
@@ -106,6 +107,11 @@
 perl -pi -e "s/nroff /nroff -c /" conf_script
 
 touch Makefile   # make sure Make thinks we ran configure
+
+cat conf_script |sed -e "s|^s, at cmp@,.*|s, at cmp@,%{_libexecdir}/man-cmp.sh,|g" > conf_script.aux
+mv conf_script.aux conf_script
+chmod 755 conf_script
+
 make CC="gcc $RPM_OPT_FLAGS"
 %if %{usecache}
 cat src/man.conf |sed -e "s,^NOCACHE,# NOCACHE,g" > man.conf
@@ -164,6 +170,9 @@
 install -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.weekly/makewhatis.cron
 install -m755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/makewhatis.cron
 
+mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}
+install -m755 %{SOURCE4} $RPM_BUILD_ROOT/%{_libexecdir}/man-cmp.sh
+
 mkdir -p $RPM_BUILD_ROOT/%{cache}
 
 mkdir -p $RPM_BUILD_ROOT/%{cache}/local
@@ -229,6 +238,7 @@
 /usr/bin/apropos
 /usr/bin/whatis
 /usr/sbin/makewhatis
+/%{_libexecdir}/man-cmp.sh
 %config(noreplace) /etc/man.config
 %{_mandir}/man5/man.config.5*
 %{_mandir}/man1/whatis.1*
@@ -320,6 +330,10 @@
 %attr(0755,root,man)    %dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Fri Mar 21 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-2
+- remove diffutils dependency (#431352)
+  thanks Ville Skyttä
+
 * Fri Mar 14 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.6f-1
 - new version
 




More information about the fedora-extras-commits mailing list