6 changed files with 199 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+/wiggle-1.0.tar.gz
--- a/dead.package
+++ b/dead.package
@ -1 +0,0 @@
-Orphaned for 6+ weeks
--- a/1
+++ b/1
@ -0,0 +1 @@
+777d8d4c718220063511e82e16275d1b  wiggle-1.0.tar.gz
--- a/wiggle-Fix-endian-checks.patch
+++ b/wiggle-Fix-endian-checks.patch
@ -0,0 +1,41 @@
+From 3a1ab01be4af79136081f4977b3eaa6ff3eb0d3e Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
+Date: Mon, 6 Jan 2014 03:57:03 +0000
+Subject: [PATCH] Fix endian checks as per austin group definitions of endian.h
+
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733831
+Reference: http://www.opengroup.org/austin/docs/austin_514.txt
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ config.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/config.h b/config.h
+index ecf3411..79a64b5 100644
+--- a/config.h
+++ b/config.h
+@@ -1,17 +1,17 @@
+ 
+ /* Includes and defines for ccan files */
+ 
+-#if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN)
+#if !defined(BYTE_ORDER) && !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN)
+  #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+   #include <machine/endian.h>
+  #else
+   #include <endian.h>
+  #endif
+ #endif
+-#ifdef LITTLE_ENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
+  #define HAVE_LITTLE_ENDIAN 1
+  #define HAVE_BIG_ENDIAN 0
+-#elif defined(BIG_ENDIAN)
+#elif BYTE_ORDER == BIG_ENDIAN
+  #define HAVE_LITTLE_ENDIAN 0
+  #define HAVE_BIG_ENDIAN 1
+ #else
+-- 
+2.1.4
+
--- a/wiggle-fix-build.patch
+++ b/wiggle-fix-build.patch
@ -0,0 +1,21 @@
+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) -I. -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
+CFLAGS+=-I.
+ 
+ # STRIP = -s
+ INSTALL = /usr/bin/install
+@@ -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 parse.o split.o extract.o diff.o bestmatch.o ReadMe.o \
+               merge2.o vpatch.o ccan/hash/hash.o
--- a/wiggle.spec
+++ b/wiggle.spec
@ -0,0 +1,135 @@
+Name:           wiggle
+Version:        1.0
+Release:        9%{?dist}
+Summary:        A tool for applying patches with conflicts
+
+Group:          Development/Tools
+License:        GPLv2+
+URL:            http://neil.brown.name/wiggle/
+Source0:        http://neil.brown.name/wiggle/%{name}-%{version}.tar.gz
+Patch0:         wiggle-fix-build.patch
+Patch1:         wiggle-Fix-endian-checks.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  groff, time, ncurses-devel
+
+# The source tarball used, is obtained by visiting the URL above and
+# getting a snapshot that contains the latest sources.  This can be
+# done by clicking the 'snapshot' link listed on the gitweb interface
+# This snapshot was the latest commit on the 'master' branch.
+# 
+# RPM doesn't particularly like this link as a 'Source', so I'll paste
+# is here for posterity:
+#
+# http://neil.brown.name/git?p=wiggle;a=snapshot;h=1c5bfa7ce4de088e3b942463bb11cdc553a92b97;sf=tgz
+#
+
+%description
+Wiggle is a program for applying patches that 'patch' cannot apply due
+to conflicting changes in the original.
+
+Wiggle will always apply all changes in the patch to the original.  If
+it cannot find a way to cleanly apply a patch, it inserts it in the
+original in a manner similar to 'merge', and reports an unresolvable
+conflict.
+
+%prep
+%setup -q
+%patch0 -p1 -b .build
+%patch1 -p1 -b .endian
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
+
+%check
+make test
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%license COPYING
+%doc ANNOUNCE TODO
+/usr/bin/wiggle
+%{_mandir}/man1/wiggle.1*
+
+
+%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu May 11 2017 John W. Linville <linville@redhat.com> - 1.0-7
+- Apply fix for endian checks from Neil Brown <neilb@suse.de>
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Feb  4 2015 John W. Linville <linville@redhat.com> 1.0-3
+- Use %license instead of %doc for file containing license information
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Jul 11 2014 John W. Linville <linville@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@lists.fedoraproject.org> - 0.8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* 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.
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.6-4
+- Autorebuild for GCC 4.3
+
+* Tue Jan 15 2008 Andy Gospodarek <gospo@redhat.com> 0.6-3
+- More suggested package cleanups and doc additions
+
+* Mon Jan 14 2008 Andy Gospodarek <gospo@redhat.com> 0.6-2
+- Makefile changes and spec-file cleanups
+
+* Mon Jan 14 2008 Andy Gospodarek <gospo@redhat.com> 0.6-1
+- Initial build various patches from around the web
+
				`@ -0,0 +1 @@`
				`777d8d4c718220063511e82e16275d1b wiggle-1.0.tar.gz`