Compare commits

...
Sign in to create a new pull request.

12 commits

Author SHA1 Message Date
Orphaned Packages Process
22473dfb8e Orphaned for 6+ weeks 2026-04-01 10:59:22 -05:00
Fedora Release Engineering
ca41d9e21f Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:14:29 +00:00
Fedora Release Engineering
58d92f17b4 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:25:26 +00:00
Fedora Release Engineering
4c3bc091ac Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 15:01:40 +00:00
Miroslav Suchý
7a2c680ca6 convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:40:28 +02:00
Fedora Release Engineering
d66080b914 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:20:52 +00:00
Sérgio M. Basto
26b31b84b0 Update wiggle to 1.3 2024-05-19 02:04:15 +01:00
Fedora Release Engineering
04022dc9a2 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 08:47:39 +00:00
Fedora Release Engineering
e21bd9df29 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 18:12:35 +00:00
Fedora Release Engineering
995be81a51 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 06:49:21 +00:00
Fedora Release Engineering
460b7e7c3c Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 12:25:13 +00:00
Fedora Release Engineering
511ec11245 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 04:28:13 +00:00
5 changed files with 1 additions and 187 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
/wiggle-1.2.tar.gz

1
dead.package Normal file
View file

@ -0,0 +1 @@
Orphaned for 6+ weeks

View file

@ -1 +0,0 @@
SHA512 (wiggle-1.2.tar.gz) = 655525a05c0ebc08cb2e4dc33c0b40f893814976e493ea4bcf87cf703738310af2e71c43a15a6e56c948472bf0bd981a5b95f6d9a91a3a377d580928a86bcd58

View file

@ -1,25 +0,0 @@
diff -up wiggle-1.1/Makefile.build wiggle-1.1/Makefile
--- wiggle-1.1/Makefile.build 2017-09-28 08:37:04.000000000 -0400
+++ wiggle-1.1/Makefile 2018-02-21 14:04:33.644637920 -0500
@@ -4,9 +4,10 @@
#OptDbg=-O3 -march=pentium2
OptDbg=-ggdb
ifndef CWFLAGS
-CWFLAGS=-Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+#CWFLAGS=-Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
endif
-CFLAGS=$(OptDbg) -I. $(CWFLAGS)
+#CFLAGS=$(OptDbg) -I. $(CWFLAGS)
+CFLAGS+=-I.
PREFIX = /usr
# STRIP = -s
@@ -18,7 +19,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

View file

@ -1,160 +0,0 @@
Name: wiggle
Version: 1.2
Release: 5%{?dist}
Summary: A tool for applying patches with conflicts
License: GPLv2+
URL: http://neil.brown.name/wiggle/
Source0: http://neil.brown.name/wiggle/%{name}-%{version}.tar.gz
Patch0: wiggle-fix-build.patch
BuildRequires: make
BuildRequires: gcc
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
%build
export CFLAGS="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
%check
make test
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%files
%license COPYING
%doc ANNOUNCE TODO
/usr/bin/wiggle
%{_mandir}/man1/wiggle.1*
%changelog
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 03 2020 John W. Linville <linville@redhat.com> - 1.2-1
- Update to version 1.2 from upstream
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 21 2018 John W. Linville <linville@redhat.com> - 1.1-1
- Update to version 1.1 from upstream
- Remove conflicting wiggle-Fix-endian-checks.patch
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0-10
- Escape macros in %%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