3 rpm .spec file and minor ANNOUNCE corrections
5 from Horst von Brand <vonbrand@inf.utfsm.cl>
7 ----------- Diffstat output ------------
8 ./ANNOUNCE | 10 +++++-----
9 ./wiggle.spec | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
10 2 files changed, 60 insertions(+), 5 deletions(-)
12 diff ./ANNOUNCE~current~ ./ANNOUNCE
13 --- ./ANNOUNCE~current~ 2004-02-03 13:01:02.000000000 +1100
14 +++ ./ANNOUNCE 2004-02-03 13:18:38.000000000 +1100
16 -ANNOUNCE: wiggle - a tools for applying patches with conflicts
17 +ANNOUNCE: wiggle - a tool for applying patches with conflicts
19 I am pleased to announce the first public release of 'wiggle'.
21 @@ -7,7 +7,7 @@ apply due to conflicting changes in the
23 Wiggle will always apply all changes in the patch to the original.
24 If it cannot find a way to cleanly apply a patch, it inserts it
25 -in the original in a manner similar to 'merge', and report an
26 +in the original in a manner similar to 'merge', and reports an
27 unresolvable conflict. Such a conflict will look like:
30 @@ -19,9 +19,9 @@ Some text that the patch changes
31 Some text that is the result of the patch
34 -with the meaning that the "text that the patch
35 -changes" was expected somewhere in the "text from the original
36 -file" and should be replaced with "the result of the patch".
37 +with the meaning that the "text that the patch changes"
38 +was expected somewhere in the "text from the original file"
39 +and should be replaced with "the result of the patch".
41 wiggle analyses the file and the patch in terms of words rather than
42 whole lines and so is able to find matches that patch is
44 diff ./wiggle.spec~current~ ./wiggle.spec
45 --- ./wiggle.spec~current~ 2004-02-03 13:01:02.000000000 +1100
46 +++ ./wiggle.spec 2004-02-03 13:18:38.000000000 +1100
48 +Summary: A tool for applying patches with conflicts
53 +Group: Development/Tools
54 +URL: http://www.cse.unsw.edu.au/~neilb/source/wiggle/
55 +Source0: http://www.cse.unsw.edu.au/~neilb/source/wiggle/%{name}-%{version}.tar.gz
56 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
59 +Wiggle is a program for applying patches that 'patch' cannot
60 +apply due to conflicting changes in the original.
62 +Wiggle will always apply all changes in the patch to the original.
63 +If it cannot find a way to cleanly apply a patch, it inserts it
64 +in the original in a manner similar to 'merge', and report an
65 +unresolvable conflict.
71 +make BINDIR=/usr/bin \
72 + MANDIR=%{_mandir} MAN1DIR=%{_mandir}/man1 MAN5DIR=%{_mandir}/man5 \
73 + CFLAGS="$RPM_OPT_FLAGS" \
77 +rm -rf $RPM_BUILD_ROOT
78 +mkdir -p $RPM_BUILD_ROOT/usr/bin
79 +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5}
81 +make BINDIR=$RPM_BUILD_ROOT/usr/bin \
82 + MANDIR=$RPM_BUILD_ROOT%{_mandir} \
83 + MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
84 + MAN5DIR=$RPM_BUILD_ROOT%{_mandir}/man5 \
88 +rm -rf $RPM_BUILD_ROOT
91 +%defattr(-,root,root,-)
93 +%{_mandir}/man1/wiggle.1*
94 +%doc ANNOUNCE TODO notes
99 +* Thu May 22 2003 Horst von Brand <vonbrand@inf.utfsm.cl> 0.6-1