From 1527327e232902aced11235206ade80d6b0bd275 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Fri, 3 Jan 2020 10:48:00 -0500 Subject: [PATCH 01/18] Update to version 1.2 from upstream --- .gitignore | 2 +- sources | 2 +- wiggle.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fc4c50f..4508ea1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wiggle-1.1.tar.gz +/wiggle-1.2.tar.gz diff --git a/sources b/sources index cd73a34..6dac778 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wiggle-1.1.tar.gz) = d229d29065df1cd991d013f1dfe41a02471fe2881db98a2d9cbe15310642d42f1f0b5a70dd63a201af7e1d07b8dd53351a7e60afb323c7610efbc61ea714fe7d +SHA512 (wiggle-1.2.tar.gz) = 655525a05c0ebc08cb2e4dc33c0b40f893814976e493ea4bcf87cf703738310af2e71c43a15a6e56c948472bf0bd981a5b95f6d9a91a3a377d580928a86bcd58 diff --git a/wiggle.spec b/wiggle.spec index 6fc871f..466be50 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle -Version: 1.1 -Release: 4%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -55,6 +55,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Fri Jan 03 2020 John W. Linville - 1.2-1 +- Update to version 1.2 from upstream + * Sat Jul 27 2019 Fedora Release Engineering - 1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ae57a8befc660d317186e926b228084b4855e295 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:42:40 +0000 Subject: [PATCH 02/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index 466be50..1cd5cc5 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -55,6 +55,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 03 2020 John W. Linville - 1.2-1 - Update to version 1.2 from upstream From 087a5d369d281ebdddefdf799c776d495fa3548b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:08:46 +0000 Subject: [PATCH 03/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index 1cd5cc5..88c2196 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -55,6 +55,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 951e2f89b389eb69ec77ec986a142d64a4c3639f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:55:22 +0000 Subject: [PATCH 04/18] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- wiggle.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wiggle.spec b/wiggle.spec index 88c2196..e11a98a 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -9,6 +9,7 @@ Source0: http://neil.brown.name/wiggle/%{name}-%{version}.tar.gz Patch0: wiggle-fix-build.patch +BuildRequires: make BuildRequires: gcc BuildRequires: groff, time, ncurses-devel From d21143cf5598097d426b49259284970bb621b5b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:29:52 +0000 Subject: [PATCH 05/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index e11a98a..7ab6bfa 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -56,6 +56,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d9ed54b6879ff60356381d69e484a1e9803f56e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:56:44 +0000 Subject: [PATCH 06/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index 7ab6bfa..89e7e7a 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -56,6 +56,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 511ec11245d56ae7d7d51afc3dd430062870e757 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:28:13 +0000 Subject: [PATCH 07/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index 89e7e7a..c4989c3 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -56,6 +56,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 460b7e7c3c065c70c18fc697f03e6a0a189250d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:25:13 +0000 Subject: [PATCH 08/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index c4989c3..81a19dd 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -56,6 +56,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 995be81a51372e39e724ef9c570a84735ccefce5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:49:21 +0000 Subject: [PATCH 09/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index 81a19dd..4d0f738 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -56,6 +56,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e21bd9df298ff0e5ea0d214902265121fd7951e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:12:35 +0000 Subject: [PATCH 10/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index 4d0f738..6b74991 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -56,6 +56,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 04022dc9a2490bcbd2ae6556041ccde992f8ea26 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:47:39 +0000 Subject: [PATCH 11/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index 6b74991..a4c2d73 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -56,6 +56,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 26b31b84b0bcaa53b053192ab8999d7c6b3540b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 19 May 2024 02:04:15 +0100 Subject: [PATCH 12/18] Update wiggle to 1.3 --- .gitignore | 1 + sources | 2 +- wiggle-fix-build.patch | 14 +++++++------- wiggle.spec | 20 ++++++++++++-------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 4508ea1..472c483 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /wiggle-1.2.tar.gz +/wiggle-1.3.tar.gz diff --git a/sources b/sources index 6dac778..2a38067 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wiggle-1.2.tar.gz) = 655525a05c0ebc08cb2e4dc33c0b40f893814976e493ea4bcf87cf703738310af2e71c43a15a6e56c948472bf0bd981a5b95f6d9a91a3a377d580928a86bcd58 +SHA512 (wiggle-1.3.tar.gz) = 61ffec2cb68bae5cb4346408c374c2aa3ac60449952d6612220beb27103a38e9de9b8fd3a930521eb2372ae6162cd3e48c9cc5c03cb1a271caa36f599e2730a8 diff --git a/wiggle-fix-build.patch b/wiggle-fix-build.patch index d493304..1d328ac 100644 --- a/wiggle-fix-build.patch +++ b/wiggle-fix-build.patch @@ -14,12 +14,12 @@ diff -up wiggle-1.1/Makefile.build wiggle-1.1/Makefile PREFIX = /usr # STRIP = -s -@@ -18,7 +19,7 @@ MAN1DIR = $(MANDIR)/man1 - MAN5DIR = $(MANDIR)/man5 - LDLIBS = -lncurses +@@ -30,7 +31,7 @@ OBJ=wiggle.o ReadMe.o vpatch.o + BOBJ=$(patsubst %.o,$(O)/%.o,$(OBJ)) + BLIBOBJ=$(patsubst %.o,$(O)/%.o,$(LIBOBJ)) --all: wiggle wiggle.man test -+all: wiggle wiggle.man +-all: $(BIN)/wiggle $(DOC)/wiggle.man test ++all: $(BIN)/wiggle $(DOC)/wiggle.man + lib : $(O)/libwiggle.a - 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 a4c2d73..4ea955c 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle -Version: 1.2 -Release: 10%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -9,9 +9,11 @@ Source0: http://neil.brown.name/wiggle/%{name}-%{version}.tar.gz Patch0: wiggle-fix-build.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc -BuildRequires: groff, time, ncurses-devel +BuildRequires: groff +BuildRequires: time +BuildRequires: 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 @@ -35,18 +37,17 @@ conflict. %prep %setup -q -%patch0 -p1 -b .build +%patch -P0 -p1 -b .build %build export CFLAGS="$RPM_OPT_FLAGS" -make %{?_smp_mflags} +%make_build %check make test %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install %files %license COPYING @@ -56,6 +57,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Sat May 18 2024 Sérgio Basto - 1.3-1 +- Update wiggle to 1.3 + * Sat Jan 27 2024 Fedora Release Engineering - 1.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d66080b9149343bf25ce176aea004ed954fee114 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:20:52 +0000 Subject: [PATCH 13/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index 4ea955c..499d45b 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for applying patches with conflicts License: GPLv2+ @@ -57,6 +57,9 @@ make test %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat May 18 2024 Sérgio Basto - 1.3-1 - Update wiggle to 1.3 From 7a2c680ca60abbc6d65d32f916c38374b2b1f657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:40:28 +0200 Subject: [PATCH 14/18] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- wiggle.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wiggle.spec b/wiggle.spec index 499d45b..115b7f1 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,9 +1,10 @@ Name: wiggle Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for applying patches with conflicts -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://neil.brown.name/wiggle/ Source0: http://neil.brown.name/wiggle/%{name}-%{version}.tar.gz Patch0: wiggle-fix-build.patch @@ -57,6 +58,9 @@ make test %changelog +* Fri Jul 26 2024 Miroslav Suchý - 1.3-3 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4c3bc091acffaa5322e6893cf7fd0361e245a2ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:01:40 +0000 Subject: [PATCH 15/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index 115b7f1..58d379d 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool for applying patches with conflicts # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -58,6 +58,9 @@ make test %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 1.3-3 - convert license to SPDX From 58d92f17b4595e4cad5b9bc27730ca0165fc70c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:25:26 +0000 Subject: [PATCH 16/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index 58d379d..a07c734 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A tool for applying patches with conflicts # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -58,6 +58,9 @@ make test %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ca41d9e21f3cfe3ca799acd406c671cb7a460c8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:14:29 +0000 Subject: [PATCH 17/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wiggle.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wiggle.spec b/wiggle.spec index a07c734..2aff19c 100644 --- a/wiggle.spec +++ b/wiggle.spec @@ -1,6 +1,6 @@ Name: wiggle Version: 1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A tool for applying patches with conflicts # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -58,6 +58,9 @@ make test %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 22473dfb8e07365a556319aa49937eba0387e1e0 Mon Sep 17 00:00:00 2001 From: Orphaned Packages Process Date: Wed, 1 Apr 2026 10:59:22 -0500 Subject: [PATCH 18/18] Orphaned for 6+ weeks --- .gitignore | 2 - dead.package | 1 + sources | 1 - wiggle-fix-build.patch | 25 ------ wiggle.spec | 195 ----------------------------------------- 5 files changed, 1 insertion(+), 223 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wiggle-fix-build.patch delete mode 100644 wiggle.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 472c483..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/wiggle-1.2.tar.gz -/wiggle-1.3.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 2a38067..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (wiggle-1.3.tar.gz) = 61ffec2cb68bae5cb4346408c374c2aa3ac60449952d6612220beb27103a38e9de9b8fd3a930521eb2372ae6162cd3e48c9cc5c03cb1a271caa36f599e2730a8 diff --git a/wiggle-fix-build.patch b/wiggle-fix-build.patch deleted file mode 100644 index 1d328ac..0000000 --- a/wiggle-fix-build.patch +++ /dev/null @@ -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 -@@ -30,7 +31,7 @@ OBJ=wiggle.o ReadMe.o vpatch.o - BOBJ=$(patsubst %.o,$(O)/%.o,$(OBJ)) - BLIBOBJ=$(patsubst %.o,$(O)/%.o,$(LIBOBJ)) - --all: $(BIN)/wiggle $(DOC)/wiggle.man test -+all: $(BIN)/wiggle $(DOC)/wiggle.man - lib : $(O)/libwiggle.a - - # diff --git a/wiggle.spec b/wiggle.spec deleted file mode 100644 index 2aff19c..0000000 --- a/wiggle.spec +++ /dev/null @@ -1,195 +0,0 @@ -Name: wiggle -Version: 1.3 -Release: 6%{?dist} -Summary: A tool for applying patches with conflicts - -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -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 -BuildRequires: time -BuildRequires: 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 -%patch -P0 -p1 -b .build - -%build -export CFLAGS="$RPM_OPT_FLAGS" -%make_build - -%check -make test - -%install -%make_install - -%files -%license COPYING -%doc ANNOUNCE TODO -/usr/bin/wiggle -%{_mandir}/man1/wiggle.1* - - -%changelog -* Sat Jan 17 2026 Fedora Release Engineering - 1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 1.3-3 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat May 18 2024 Sérgio Basto - 1.3-1 -- Update wiggle to 1.3 - -* Sat Jan 27 2024 Fedora Release Engineering - 1.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 03 2020 John W. Linville - 1.2-1 -- Update to version 1.2 from upstream - -* Sat Jul 27 2019 Fedora Release Engineering - 1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 21 2018 John W. Linville - 1.1-1 -- Update to version 1.1 from upstream -- Remove conflicting wiggle-Fix-endian-checks.patch - -* Fri Feb 09 2018 Igor Gnatenko - 1.0-10 -- Escape macros in %%changelog - -* Thu Aug 03 2017 Fedora Release Engineering - 1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu May 11 2017 John W. Linville - 1.0-7 -- Apply fix for endian checks from Neil Brown - -* Sat Feb 11 2017 Fedora Release Engineering - 1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Feb 4 2015 John W. Linville 1.0-3 -- Use %%license instead of %%doc for file containing license information - -* Mon Aug 18 2014 Fedora Release Engineering - 1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 11 2014 John W. Linville 1.0-1 -- Rebased to new version of wiggle, 1.0. -- Some housekeeping in the spec file... - -* Sun Jun 08 2014 Fedora Release Engineering - 0.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 0.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Mar 26 2010 Andy Gospodarek 0.8-1 -- Rebased to new version of wiggle, 0.8. - -* Mon Oct 19 2009 Andy Gospodarek 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 - 0.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 18 2008 Fedora Release Engineering - 0.6-4 -- Autorebuild for GCC 4.3 - -* Tue Jan 15 2008 Andy Gospodarek 0.6-3 -- More suggested package cleanups and doc additions - -* Mon Jan 14 2008 Andy Gospodarek 0.6-2 -- Makefile changes and spec-file cleanups - -* Mon Jan 14 2008 Andy Gospodarek 0.6-1 -- Initial build various patches from around the web -