- Rebased to new version of wiggle, 0.8.

.cvsignore

@@ -1 +1 @@
-wiggle-1c5bfa7ce4de088e3b942463bb11cdc553a92b97.tar.gz
+wiggle-0.8.tar.gz

sources

@@ -1 +1 @@
-7244cf7441c7f54c52f2cdc97fa9f268  wiggle-1c5bfa7ce4de088e3b942463bb11cdc553a92b97.tar.gz
+ee929b61e4da170f0d6dd7d497b22130  wiggle-0.8.tar.gz

wiggle-fix-build.patch

@@ -1,5 +1,7 @@
---- wiggle-0.6.orig/Makefile
-+++ wiggle-0.6/Makefile
+diff --git a/Makefile b/Makefile
+index 6725969..103967e 100644
+--- a/Makefile
++++ b/Makefile
 @@ -3,7 +3,7 @@
  #OptDbg=-O3
  #OptDbg=-O3 -march=pentium2
@@ -9,16 +11,17 @@
  
  # STRIP = -s
  INSTALL = /usr/bin/install
-@@ -13,13 +13,13 @@ MANDIR  = /usr/share/man
- MAN1DIR = $(MANDIR)/man1
+@@ -14,14 +14,14 @@ MAN1DIR = $(MANDIR)/man1
  MAN5DIR = $(MANDIR)/man5
+ LDLIBS = -lncurses
  
 -all: wiggle wiggle.man test
 +all: wiggle wiggle.man
  
- 
- wiggle : wiggle.o load.o split.o extract.o diff.o bestmatch.o ReadMe.o merge.o
- wiggle.o load.o split.o extract.o diff.o bestmatch.o ReadMe.o merge.o : wiggle.h
+ wiggle : wiggle.o load.o split.o extract.o diff.o bestmatch.o ReadMe.o \
+               merge.o merge2.o vpatch.o
+ wiggle.o load.o split.o extract.o diff.o bestmatch.o ReadMe.o merge.o \
+                merge2.o vpatch.o : wiggle.h
  
 -test: wiggle dotest
 +check: wiggle dotest

wiggle.spec

@@ -1,17 +1,17 @@
 Name:           wiggle
-Version:        0.6
-Release:        7%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        A tool for applying patches with conflicts
 
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://neil.brown.name/git/wiggle
-Source0:        wiggle-1c5bfa7ce4de088e3b942463bb11cdc553a92b97.tar.gz
+URL:            http://neil.brown.name/wiggle/
+Source0:        http://neil.brown.name/wiggle/%{name}-%{version}.tar.gz
 Patch0:         wiggle-fix-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  groff, time
+BuildRequires:  groff, time, ncurses-devel
 #Requires:       
 
 # The source tarball used, is obtained by visiting the URL above and
@@ -35,7 +35,7 @@ original in a manner similar to 'merge', and reports an unresolvable
 conflict.
 
 %prep
-%setup -q -n wiggle
+%setup -q -n wiggle-0.8
 %patch0 -p1 -b .orig
 
 %build
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 26 2010 Andy Gospodarek <gospo@redhat.com> 0.8-1
+- Rebased to new version of wiggle, 0.8.
+
 * Mon Oct 19 2009 Andy Gospodarek <gospo@redhat.com> 0.6-7
 - Updated location for wiggle sources and uploaded new source-file. [506812]
 - Dropped first patch since it was now included.