add manpage for gendiff (pbrown@redhat.com).
CVS patchset: 3512 CVS date: 2000/01/10 15:50:47
This commit is contained in:
parent
65e8fdb8f9
commit
091acab1c8
1
CHANGES
1
CHANGES
|
@ -36,6 +36,7 @@
|
|||
- fix: manageFile needs to and with O_WRONLY(=1), not O_RDONLY(=0).
|
||||
- fix: resurrect failed glob error message during build.
|
||||
- add several BuildRoot FTW policies.
|
||||
- add manpage for gendiff (pbrown@redhat.com).
|
||||
|
||||
3.0.2 -> 3.0.3
|
||||
- add --eval to find result of macro expansion.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
SUBDIRS = manual ja pl ru
|
||||
|
||||
man_MANS = rpm.8 rpm2cpio.8
|
||||
man_MANS = gendiff.1 rpm.8 rpm2cpio.8
|
||||
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
|
||||
|
|
|
@ -0,0 +1,44 @@
|
|||
.TH GENDIFF 1 "Mon Jan 10 2000"
|
||||
.UC 4
|
||||
.SH NAME
|
||||
gendiff \- utility to aid in error-free diff file generation
|
||||
.SH SYNOPSIS
|
||||
\fBgendiff\fR <directory> <diff-extension>
|
||||
.SH DESCRIPTION
|
||||
\fBgendiff\fR is a rather simple script which aids in generating a
|
||||
diff file from a single directory. It takes a directory name and a
|
||||
"diff-extension" as its only arguments. The diff extension should be
|
||||
a unique sequence of characters added to the end of all original,
|
||||
unmodified files. The output of the program is a diff file which may
|
||||
be applied with the \fBpatch\fR program to recreate the changes.
|
||||
.PP
|
||||
The usual sequence of events for creating a diff is to create two
|
||||
identical directories, make changes in one directory, and then use the
|
||||
\fBdiff\fR utility to create a list of differences between the two.
|
||||
Using gendiff eliminates the need for the extra, original and
|
||||
unmodified directory copy. Instead, only the individual files that
|
||||
are modified need to be saved.
|
||||
.PP
|
||||
Before editing a file, copy the file, appending the extension you have chosen
|
||||
to the filename. I.e. if you were going to edit somefile.cpp, copy it to
|
||||
somefile.cpp.save before editing it. Then edit the first copy (somefile.cpp).
|
||||
.PP
|
||||
After editing all the files you need to edit in this fashion, enter the
|
||||
directory one level above where your source code resides, and then type
|
||||
.SP
|
||||
.NF
|
||||
$ gendiff somedirectory .orig > mydiff-orig.patch
|
||||
.FI
|
||||
.PP
|
||||
You should redirect the output to a file (as illustrated) unless you want to
|
||||
see the results on stdout.
|
||||
|
||||
.PD
|
||||
.SH "SEE ALSO"
|
||||
.BR diff (1),
|
||||
.BR patch (1)
|
||||
|
||||
.SH AUTHOR
|
||||
.nf
|
||||
Erik Troan <ewt@redhat.com>
|
||||
.fi
|
10
rpm.spec
10
rpm.spec
|
@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
|
|||
Name: rpm
|
||||
%define version 3.0.4
|
||||
Version: %{version}
|
||||
Release: 0.30
|
||||
Release: 0.31
|
||||
Group: System Environment/Base
|
||||
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
|
||||
Copyright: GPL
|
||||
|
@ -136,9 +136,9 @@ fi
|
|||
%dir /usr/src/redhat/RPMS
|
||||
/usr/src/redhat/RPMS/*
|
||||
/usr/share/locale/*/LC_MESSAGES/rpm.mo
|
||||
/usr/man/man8/*.8
|
||||
%lang(pl) /usr/man/pl/man8/*
|
||||
%lang(ru) /usr/man/ru/man8/*
|
||||
/usr/man/man[18]/*.[18]*
|
||||
%lang(pl) /usr/man/pl/man[18]/*.[18]*
|
||||
%lang(ru) /usr/man/ru/man[18]/*.[18]*
|
||||
|
||||
%ifos linux
|
||||
%files python
|
||||
|
@ -160,7 +160,7 @@ fi
|
|||
%defattr(-,root,root)
|
||||
/usr/lib/libpopt.so.*
|
||||
/usr/share/locale/*/LC_MESSAGES/popt.mo
|
||||
/usr/man/man3/popt.3
|
||||
/usr/man/man3/popt.3*
|
||||
|
||||
# XXX These may end up in popt-devel but it hardly seems worth the effort now.
|
||||
/usr/lib/libpopt.a
|
||||
|
|
Loading…
Reference in New Issue