Accepting request 38245 from home:sndirsch:branches:openSUSE:Factory

Copy from home:sndirsch:branches:openSUSE:Factory/patchutils based on submit request 38245 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/38245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=8

patchutils.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 19 17:35:26 CEST 2010 - sndirsch@suse.de
+
+- rediff-hunk-init-fix.diff (Takashi Iwai)
+  * hunk structure wasn't correctly initialized; fixes 
+    tests/addhunk2 testcase, which broke the build
+
 -------------------------------------------------------------------
 Wed Jan  6 03:04:34 CET 2010 - jengelh@medozas.de
 

patchutils.spec

@@ -24,11 +24,12 @@ License:        GPLv2+
 Group:          Productivity/File utilities
 AutoReqProv:    on
 Version:        0.3.1
-Release:        2
+Release:        3
 Summary:        A Collection of Tools for Manipulating Patch Files
 Source:         %name-%version.tar.bz2
 Patch:          %name-0.2.30-tailsyntax.diff
 Patch1:         overrun.diff
+Patch2:         rediff-hunk-init-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -53,6 +54,7 @@ Authors:
 %setup -q
 %patch -p1
 %patch1
+%patch2 -p1
 
 %build
 autoreconf -fi

rediff-hunk-init-fix.diff

@@ -0,0 +1,14 @@
+---
+ src/rediff.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/rediff.c
++++ b/src/rediff.c
+@@ -841,6 +841,7 @@
+ 		newhunk->filepos = pos;
+ 		newhunk->line_in_diff = linenum;
+ 		newhunk->num_lines = 0;
++		newhunk->discard_offset = 0;
+ 
+ 		if (!strncmp (line, "--- ", 4)) {
+ 			struct file_info *info = xmalloc (sizeof *info);