[wiggle] Rebased to new version of wiggle, 1.0.

[John W. Linville]

commit b64663a63ce43fb720aa775cd22bac905ef7364c
Author: John W. Linville <linville at tuxdriver.com>
Date:   Fri Jul 11 10:02:04 2014 -0400

    Rebased to new version of wiggle, 1.0.
    
    - Some housekeeping in the spec file...

 .gitignore             |    2 +-
 sources                |    2 +-
 wiggle-fix-build.patch |   25 ++++++++-----------------
 wiggle.spec            |   18 +++++++++++-------
 4 files changed, 21 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1324644..c8d44a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-wiggle-0.8.tar.gz
+/wiggle-1.0.tar.gz
diff --git a/sources b/sources
index 8285800..fd35e11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee929b61e4da170f0d6dd7d497b22130  wiggle-0.8.tar.gz
+777d8d4c718220063511e82e16275d1b  wiggle-1.0.tar.gz
diff --git a/wiggle-fix-build.patch b/wiggle-fix-build.patch
index 47adb1e..88d6809 100644
--- a/wiggle-fix-build.patch
+++ b/wiggle-fix-build.patch
@@ -1,30 +1,21 @@
-diff --git a/Makefile b/Makefile
-index 6725969..103967e 100644
---- a/Makefile
-+++ b/Makefile
+diff -up wiggle-1.0/Makefile.build wiggle-1.0/Makefile
+--- wiggle-1.0/Makefile.build	2013-08-23 02:02:27.000000000 -0400
++++ wiggle-1.0/Makefile	2014-07-11 09:58:25.131309316 -0400
 @@ -3,7 +3,7 @@
  #OptDbg=-O3
  #OptDbg=-O3 -march=pentium2
  OptDbg=-ggdb
--CFLAGS=$(OptDbg) -Wall -Werror
-+#CFLAGS=$(OptDbg) -Wall -Werror
+-CFLAGS=$(OptDbg) -I. -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
++CFLAGS+=-I.
  
  # STRIP = -s
  INSTALL = /usr/bin/install
-@@ -14,14 +14,14 @@ MAN1DIR = $(MANDIR)/man1
+@@ -14,7 +14,7 @@ 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 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
- 	sh dotest
- 
- wiggle.man : wiggle.1
+ wiggle : wiggle.o load.o parse.o split.o extract.o diff.o bestmatch.o ReadMe.o \
+               merge2.o vpatch.o ccan/hash/hash.o
diff --git a/wiggle.spec b/wiggle.spec
index 4de8aa7..0c6970a 100644
--- a/wiggle.spec
+++ b/wiggle.spec
@@ -1,6 +1,6 @@
 Name:           wiggle
-Version:        0.8
-Release:        7%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        A tool for applying patches with conflicts
 
 Group:          Development/Tools
@@ -12,7 +12,6 @@ Patch0:         wiggle-fix-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  groff, time, ncurses-devel
-#Requires:       
 
 # The source tarball used, is obtained by visiting the URL above and
 # getting a snapshot that contains the latest sources.  This can be
@@ -35,14 +34,15 @@ original in a manner similar to 'merge', and reports an unresolvable
 conflict.
 
 %prep
-%setup -q -n wiggle-0.8
-%patch0 -p1 -b .orig
+%setup -q
+%patch0 -p1 -b .build
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+export CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %check
-make check
+make test
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 11 2014 John W. Linville <linville at redhat.com> 1.0-1
+- Rebased to new version of wiggle, 1.0.
+- Some housekeeping in the spec file...
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild