From 3bce622219d55dbc7a97edf7e8108be23ed9903f Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sun, 28 Aug 2022 22:46:20 -0300 Subject: [PATCH 1/5] spec cleanup and modernization --- wput.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/wput.spec b/wput.spec index 7125ef0..06c9e49 100644 --- a/wput.spec +++ b/wput.spec @@ -17,17 +17,14 @@ Wput is a command-line ftp-client that looks like wget but instead of downloading, uploads files or whole directories to remote ftp-servers. %prep -%setup -q -%patch0 -p1 +%autosetup %build %configure --disable-g-switch - -%{__make} %{?_smp_mflags} +%make_build %install -%{__rm} -rf %{buildroot} -%{__make} install DESTDIR=%{buildroot} +%make_install %find_lang %{name} %files -f %{name}.lang @@ -134,4 +131,4 @@ downloading, uploads files or whole directories to remote ftp-servers. - Fix Release, %%files section and consistent use of macros * Thu Oct 26 2008 Itamar Reis Peixoto - 0.6.1-1.0 -- Initial package. \ No newline at end of file +- Initial package. From 9d8ae5ef61ed90ecdf5d060bf49b92411ee77ff5 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 10 Jan 2023 13:33:12 +0100 Subject: [PATCH 2/5] C99 compatibility fix Related to: --- wput-c99.patch | 23 +++++++++++++++++++++++ wput.spec | 8 ++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 wput-c99.patch diff --git a/wput-c99.patch b/wput-c99.patch new file mode 100644 index 0000000..41da9a8 --- /dev/null +++ b/wput-c99.patch @@ -0,0 +1,23 @@ +Build with -D_XOPEN_SOURCE for a declaration of strptime in . +This avoids build failures with future compilers which do not support +implicit function declarations. + +We cannout build with -D_GNU_SOURCE as the sources contain a defintion +of basename which does not match the GNU prototype. + +Submitted upstream: + +diff --git a/src/Makefile.in b/src/Makefile.in +index e7c4c431f50984ec..348807fb9df5bb86 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -5,7 +5,8 @@ prefix=@prefix@ + bindir=@bindir@ + localedir=$(prefix)/share/locale + CC=@CC@ +-CFLAGS= @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" @GNUTLS_CFLAGS@ ++CFLAGS= @CFLAGS@ -D_DEFAULT_SOURCE -D_XOPEN_SOURCE \ ++ -DLOCALEDIR=\"$(localedir)\" @GNUTLS_CFLAGS@ + LIBS=@LIBINTL@ @LIBS@ @GNUTLS_LIBS@ + EXE=../wput + GETOPT=@GETOPT@ diff --git a/wput.spec b/wput.spec index 06c9e49..a990c16 100644 --- a/wput.spec +++ b/wput.spec @@ -2,11 +2,12 @@ Summary: A utility for uploading files or whole directories to remote ftp-servers Name: wput Version: 0.6.1 -Release: 32%{?dist} +Release: 33%{?dist} License: GPLv2+ URL: http://wput.sourceforge.net/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz Patch0: wput-destdir.patch +Patch1: wput-c99.patch BuildRequires: make BuildRequires: gettext BuildRequires: gnutls-devel @@ -17,7 +18,7 @@ Wput is a command-line ftp-client that looks like wget but instead of downloading, uploads files or whole directories to remote ftp-servers. %prep -%autosetup +%autosetup -p1 %build %configure --disable-g-switch @@ -33,6 +34,9 @@ downloading, uploads files or whole directories to remote ftp-servers. %{_bindir}/%{name} %changelog +* Tue Jan 10 2023 Florian Weimer - 0.6.1-33 +- C99 compatibility fix + * Sat Jul 23 2022 Fedora Release Engineering - 0.6.1-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 28734c50808f5916e030700c4325d559a8b03f51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:00:28 +0000 Subject: [PATCH 3/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wput.spec b/wput.spec index a990c16..29e93d2 100644 --- a/wput.spec +++ b/wput.spec @@ -2,7 +2,7 @@ Summary: A utility for uploading files or whole directories to remote ftp-servers Name: wput Version: 0.6.1 -Release: 33%{?dist} +Release: 34%{?dist} License: GPLv2+ URL: http://wput.sourceforge.net/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz @@ -34,6 +34,9 @@ downloading, uploads files or whole directories to remote ftp-servers. %{_bindir}/%{name} %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.6.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 10 2023 Florian Weimer - 0.6.1-33 - C99 compatibility fix From ff4490033a0d1962c62f5486ff8151528fef8853 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:23:29 +0000 Subject: [PATCH 4/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wput.spec b/wput.spec index 29e93d2..ceae0a2 100644 --- a/wput.spec +++ b/wput.spec @@ -2,7 +2,7 @@ Summary: A utility for uploading files or whole directories to remote ftp-servers Name: wput Version: 0.6.1 -Release: 34%{?dist} +Release: 35%{?dist} License: GPLv2+ URL: http://wput.sourceforge.net/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz @@ -34,6 +34,9 @@ downloading, uploads files or whole directories to remote ftp-servers. %{_bindir}/%{name} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.6.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.6.1-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From febdfda01d1dd2c9a30bcafec650045bb0f354b3 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 25 Jan 2024 21:05:08 +0000 Subject: [PATCH 5/5] Orphaned for 6+ weeks --- .gitignore | 1 - dead.package | 1 + sources | 1 - wput-c99.patch | 23 -------- wput-destdir.patch | 14 ----- wput.spec | 144 --------------------------------------------- 6 files changed, 1 insertion(+), 183 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wput-c99.patch delete mode 100644 wput-destdir.patch delete mode 100644 wput.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 43fc7af..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -wput-0.6.1.tgz 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 76a92fd..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -92b41efed4db8eb4f3443c23bf7ceecf wput-0.6.1.tgz diff --git a/wput-c99.patch b/wput-c99.patch deleted file mode 100644 index 41da9a8..0000000 --- a/wput-c99.patch +++ /dev/null @@ -1,23 +0,0 @@ -Build with -D_XOPEN_SOURCE for a declaration of strptime in . -This avoids build failures with future compilers which do not support -implicit function declarations. - -We cannout build with -D_GNU_SOURCE as the sources contain a defintion -of basename which does not match the GNU prototype. - -Submitted upstream: - -diff --git a/src/Makefile.in b/src/Makefile.in -index e7c4c431f50984ec..348807fb9df5bb86 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -5,7 +5,8 @@ prefix=@prefix@ - bindir=@bindir@ - localedir=$(prefix)/share/locale - CC=@CC@ --CFLAGS= @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" @GNUTLS_CFLAGS@ -+CFLAGS= @CFLAGS@ -D_DEFAULT_SOURCE -D_XOPEN_SOURCE \ -+ -DLOCALEDIR=\"$(localedir)\" @GNUTLS_CFLAGS@ - LIBS=@LIBINTL@ @LIBS@ @GNUTLS_LIBS@ - EXE=../wput - GETOPT=@GETOPT@ diff --git a/wput-destdir.patch b/wput-destdir.patch deleted file mode 100644 index 5324920..0000000 --- a/wput-destdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruN wput-0.6.1.orig/Makefile.in wput-0.6.1.new/Makefile.in ---- wput-0.6.1.orig/Makefile.in 2007-12-12 15:30:04.000000000 -0200 -+++ wput-0.6.1.new/Makefile.in 2008-10-26 20:09:36.000000000 -0200 -@@ -16,8 +16,8 @@ - - install: all - cd po && $(MAKE) $(MAKEDEFS) $@ -- install -m0755 wput $(bindir) -- install -m0644 doc/wput.1.gz $(mandir) -+ install -D -p -m 0755 wput $(DESTDIR)$(bindir)/wput -+ install -D -p -m 0644 doc/wput.1.gz $(DESTDIR)$(mandir)/wput.1.gz - @echo "----------------" - @echo "Wput installed. See 'wput -h' or 'man wput' for usage information." - @echo "Further documentation is located in the doc/USAGE.* files." diff --git a/wput.spec b/wput.spec deleted file mode 100644 index ceae0a2..0000000 --- a/wput.spec +++ /dev/null @@ -1,144 +0,0 @@ -%define _legacy_common_support 1 -Summary: A utility for uploading files or whole directories to remote ftp-servers -Name: wput -Version: 0.6.1 -Release: 35%{?dist} -License: GPLv2+ -URL: http://wput.sourceforge.net/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz -Patch0: wput-destdir.patch -Patch1: wput-c99.patch -BuildRequires: make -BuildRequires: gettext -BuildRequires: gnutls-devel -BuildRequires: gcc - -%description -Wput is a command-line ftp-client that looks like wget but instead of -downloading, uploads files or whole directories to remote ftp-servers. - -%prep -%autosetup -p1 - -%build -%configure --disable-g-switch -%make_build - -%install -%make_install -%find_lang %{name} - -%files -f %{name}.lang -%doc ChangeLog COPYING INSTALL TODO doc -%{_mandir}/man1/* -%{_bindir}/%{name} - -%changelog -* Sat Jul 22 2023 Fedora Release Engineering - 0.6.1-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 0.6.1-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Jan 10 2023 Florian Weimer - 0.6.1-33 -- C99 compatibility fix - -* Sat Jul 23 2022 Fedora Release Engineering - 0.6.1-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.6.1-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.6.1-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.6.1-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.6.1-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Mar 29 2020 Itamar Reis Peixoto - 0.6.1-27 -- fix FTBS rhbz#1800261 - -* Fri Jan 31 2020 Fedora Release Engineering - 0.6.1-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0.6.1-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.6.1-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.6.1-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Feb 19 2018 Itamar Reis Peixoto - 0.6.1-22 -- add gcc into buildrequires - -* Fri Feb 09 2018 Fedora Release Engineering - 0.6.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.6.1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.6.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.6.1-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0.6.1-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.6.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 0.6.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.6.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.6.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 0.6.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0.6.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.6.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Aug 17 2011 Itamar Reis Peixoto - 0.6.1-9 -- rebuilt - -* Thu Apr 21 2011 Itamar Reis Peixoto - 0.6.1-8 -- Rebuilt (gnutls soname change) - -* Mon Feb 07 2011 Fedora Release Engineering - 0.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jul 27 2009 Fedora Release Engineering - 0.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - - -* Mon Oct 28 2008 Itamar Reis Peixoto - 0.6.1-4 -- Changes bugzilla #468633 Comment #10 From Manuel Wolfshant -> -- BuildRequires: gettext / gnutls-devel - -* Thu Oct 27 2008 Itamar Reis Peixoto - 0.6.1-3 -- Start counting patches from 0 / Rename Patch1 to Patch0 -- Fix Source0 Address - -* Mon Oct 27 2008 Itamar Reis Peixoto - 0.6.1-2 -- Changes bugzilla #468633 Comment #1 From Fabian Affolter -> -- Fix Release, %%files section and consistent use of macros - -* Thu Oct 26 2008 Itamar Reis Peixoto - 0.6.1-1.0 -- Initial package.