9cb0809
Name:           wiggle
John W. Linville b64663a
Version:        1.0
John W. Linville f5fa675
Release:        7%{?dist}
9cb0809
Summary:        A tool for applying patches with conflicts
9cb0809
9cb0809
Group:          Development/Tools
9cb0809
License:        GPLv2+
21cdcfd
URL:            http://neil.brown.name/wiggle/
21cdcfd
Source0:        http://neil.brown.name/wiggle/%{name}-%{version}.tar.gz
d9cccc1
Patch0:         wiggle-fix-build.patch
John W. Linville f5fa675
Patch1:         wiggle-Fix-endian-checks.patch
9cb0809
9cb0809
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
9cb0809
21cdcfd
BuildRequires:  groff, time, ncurses-devel
9cb0809
d9cccc1
# The source tarball used, is obtained by visiting the URL above and
d9cccc1
# getting a snapshot that contains the latest sources.  This can be
d9cccc1
# done by clicking the 'snapshot' link listed on the gitweb interface
d9cccc1
# This snapshot was the latest commit on the 'master' branch.
d9cccc1
# 
d9cccc1
# RPM doesn't particularly like this link as a 'Source', so I'll paste
d9cccc1
# is here for posterity:
d9cccc1
#
d9cccc1
# http://neil.brown.name/git?p=wiggle;a=snapshot;h=1c5bfa7ce4de088e3b942463bb11cdc553a92b97;sf=tgz
d9cccc1
#
d9cccc1
9cb0809
%description
9cb0809
Wiggle is a program for applying patches that 'patch' cannot apply due
9cb0809
to conflicting changes in the original.
9cb0809
9cb0809
Wiggle will always apply all changes in the patch to the original.  If
9cb0809
it cannot find a way to cleanly apply a patch, it inserts it in the
9cb0809
original in a manner similar to 'merge', and reports an unresolvable
9cb0809
conflict.
9cb0809
9cb0809
%prep
John W. Linville b64663a
%setup -q
John W. Linville b64663a
%patch0 -p1 -b .build
John W. Linville f5fa675
%patch1 -p1 -b .endian
9cb0809
9cb0809
%build
John W. Linville b64663a
export CFLAGS="$RPM_OPT_FLAGS"
John W. Linville b64663a
make %{?_smp_mflags}
9cb0809
9cb0809
%check
John W. Linville b64663a
make test
9cb0809
9cb0809
%install
9cb0809
rm -rf $RPM_BUILD_ROOT
9cb0809
make install DESTDIR=$RPM_BUILD_ROOT
9cb0809
9cb0809
%clean
9cb0809
rm -rf $RPM_BUILD_ROOT
9cb0809
9cb0809
%files
9cb0809
%defattr(-,root,root,-)
John W. Linville 844202e
%license COPYING
John W. Linville 844202e
%doc ANNOUNCE TODO
9cb0809
/usr/bin/wiggle
9cb0809
%{_mandir}/man1/wiggle.1*
9cb0809
9cb0809
9cb0809
%changelog
John W. Linville f5fa675
* Thu May 11 2017 John W. Linville <linville@redhat.com> - 1.0-7
John W. Linville f5fa675
- Apply fix for endian checks from Neil Brown <neilb@suse.de>
John W. Linville f5fa675
a18ab20
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
a18ab20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
a18ab20
6978884
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-5
6978884
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
6978884
5e5b8e3
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
5e5b8e3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
5e5b8e3
John W. Linville 844202e
* Wed Feb  4 2015 John W. Linville <linville@redhat.com> 1.0-3
John W. Linville 844202e
- Use %license instead of %doc for file containing license information
John W. Linville 844202e
d4ce0c4
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
d4ce0c4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
d4ce0c4
John W. Linville b64663a
* Fri Jul 11 2014 John W. Linville <linville@redhat.com> 1.0-1
John W. Linville b64663a
- Rebased to new version of wiggle, 1.0.
John W. Linville b64663a
- Some housekeeping in the spec file...
John W. Linville b64663a
4930cc3
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-7
4930cc3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
4930cc3
5b6aedd
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-6
5b6aedd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
5b6aedd
e4d055f
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-5
e4d055f
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
e4d055f
abc0b41
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-4
abc0b41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
abc0b41
47face1
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-3
47face1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
47face1
921322d
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-2
921322d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
921322d
21cdcfd
* Fri Mar 26 2010 Andy Gospodarek <gospo@redhat.com> 0.8-1
21cdcfd
- Rebased to new version of wiggle, 0.8.
21cdcfd
d9cccc1
* Mon Oct 19 2009 Andy Gospodarek <gospo@redhat.com> 0.6-7
d9cccc1
- Updated location for wiggle sources and uploaded new source-file. [506812]
d9cccc1
- Dropped first patch since it was now included.
d9cccc1
89cfc0e
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6-6
89cfc0e
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
89cfc0e
3b28cba
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6-5
3b28cba
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
3b28cba
098bda7
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.6-4
098bda7
- Autorebuild for GCC 4.3
098bda7
9cb0809
* Tue Jan 15 2008 Andy Gospodarek <gospo@redhat.com> 0.6-3
9cb0809
- More suggested package cleanups and doc additions
9cb0809
9cb0809
* Mon Jan 14 2008 Andy Gospodarek <gospo@redhat.com> 0.6-2
9cb0809
- Makefile changes and spec-file cleanups
9cb0809
9cb0809
* Mon Jan 14 2008 Andy Gospodarek <gospo@redhat.com> 0.6-1
9cb0809
- Initial build various patches from around the web
9cb0809