diff --git a/changelog b/changelog deleted file mode 100644 index e8d8502..0000000 --- a/changelog +++ /dev/null @@ -1,129 +0,0 @@ -* Sat Jan 17 2026 Fedora Release Engineering - 2.9.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 2.9.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 2.9.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 2.9.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 2.9.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 2.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Oct 20 2022 Steve Traylen - 2.9.1-1 -- Upstream to 2.9.1 - -* Sat Jul 23 2022 Fedora Release Engineering - 2.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Steve Traylen - 2.9-1 -- Upstream to 2.9 - -* Fri Jul 23 2021 Fedora Release Engineering - 2.8-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Mar 8 2021 Steve Traylen - 2.8-17 -- Upstream is now GridCF project - https://mailman.egi.eu/pipermail/discuss/2019-March/000273.html - -* Wed Jan 27 2021 Fedora Release Engineering - 2.8-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.8-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 2.8-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 10 2020 Steve Traylen - 2.8-13 -- Make specfile more modern. - -* Thu Jan 9 2020 Mátyás Selmeci - 2.8-12 -- Add patch to prevent hanging when command socket closes - -* Sat Jul 27 2019 Fedora Release Engineering - 2.8-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.8-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.8-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 2.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 2.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Sep 29 2014 Mattias Ellert - 2.8-2 -- Adapt to Globus Toolkit 6.0 - -* Tue Sep 2 2014 Steve Traylen - 2.8-1 -- Upstream to 2.8, upstream has moved to github. -- Add patch for 32 bit. - -* Mon Aug 18 2014 Fedora Release Engineering - 2.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 2.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Feb 2 2012 Steve Traylen - 2.6-4 -- Adapt for globus toolkit 5.2 - -* Sat Jan 14 2012 Fedora Release Engineering - 2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Aug 11 2010 Steve Traylen - 2.6-1 -- Update to uberftp-2.6 - -* Fri Sep 11 2009 Steve Traylen - 2.5-1 -- Update to uberftp-2.5 - -* Fri Aug 21 2009 Tomas Mraz - 2.4-5 -- rebuilt with new openssl - -* Wed Jul 22 2009 Steve Traylen 2.4-4 -- Update source to version 2.4 -- Include copyright file in package. - -* Tue Jun 23 2009 Steve Traylen 2.3-3 -- Better inclusion of globus header files. -* Fri Jun 19 2009 Steve Traylen - 2.3-2 -- Remove my debugging. -* Fri Jun 19 2009 Steve Traylen - 2.3-1 -- Initial version. diff --git a/sources b/sources index 5e84d3a..f48c7dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uberftp-2.9.1.tar.gz) = adb0161d0959fd819ef31c9ad36719e51ca1baa4ac9ca33b844078315d7253658d02e707b91867d889faa6b889a802b844325f4081ec55ca7b2f88bbc3d71a95 +57bbba5ed76f2c41ef992072059f32d7 UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518.tar.gz diff --git a/uberftp-32bit-pkg-config.patch b/uberftp-32bit-pkg-config.patch new file mode 100644 index 0000000..96062e0 --- /dev/null +++ b/uberftp-32bit-pkg-config.patch @@ -0,0 +1,24 @@ +diff -ur UberFTP.orig/configure UberFTP/configure +--- UberFTP.orig/configure 2014-02-11 19:35:56.000000000 +0100 ++++ UberFTP/configure 2014-09-29 10:10:45.282934507 +0200 +@@ -3812,7 +3812,7 @@ + + if test "x$globus_location" == "x/usr" ; then + # RPM installation +- CPPFLAGS=-I$globus_location/lib64/globus/include ++ CPPFLAGS="-I$globus_location/lib64/globus/include -I$globus_location/lib/globus/include -I$globus_location/include/globus" + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +diff -ur UberFTP.orig/configure.ac UberFTP/configure.ac +--- UberFTP.orig/configure.ac 2014-02-11 19:35:56.000000000 +0100 ++++ UberFTP/configure.ac 2014-09-29 10:09:35.848741840 +0200 +@@ -109,7 +109,7 @@ + + if test "x$globus_location" == "x/usr" ; then + # RPM installation +- CPPFLAGS=-I$globus_location/lib64/globus/include ++ CPPFLAGS="-I$globus_location/lib64/globus/include -I$globus_location/lib/globus/include -I$globus_location/include/globus" + AC_CHECK_HEADERS([globus_config.h], + [GLOBUS_CONFIG_CPPFLAGS="$CPPFLAGS"], + [AC_MSG_ERROR(globus_config.h not found, install globus-core)]) diff --git a/uberftp.spec b/uberftp.spec index 6dab0e6..a8e5b84 100644 --- a/uberftp.spec +++ b/uberftp.spec @@ -1,36 +1,118 @@ +# $ git rev-parse Version_2_8 +# 012788f5430c9f7eb03e65b7aa8bcb106f472518 + +%global commit 012788f5430c9f7eb03e65b7aa8bcb106f472518 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: uberftp -Version: 2.9.1 -Release: %autorelease +Version: 2.8 +Release: 7%{?dist} Summary: GridFTP-enabled ftp client +Group: Applications/Internet + License: NCSA -URL: https://gridcf.org/ -Source0: https://repo.gridcf.org/uberftp/sources/uberftp-%{version}.tar.gz +URL: https://github.com/JasonAlt/UberFTP +Source0: https://github.com/JasonAlt/UberFTP/archive/%{commit}/UberFTP-%{commit}.tar.gz +# https://github.com/JasonAlt/UberFTP/pull/6 +Patch0: uberftp-32bit-pkg-config.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: make -BuildRequires: gcc BuildRequires: globus-gssapi-gsi-devel %description -UberFTP is the first interactive, GridFTP-enabled ftp client. -It supports GSI authentication, parallel data channels and -third party transfers. +UberFTP is the first interactive, GridFTP-enabled ftp client. +It supports GSI authentication, parallel data channels and +third party transfers. %prep -%setup -q +%setup -q -n UberFTP-%{commit} +iconv -f iso8859-1 -t utf-8 copyright > copyright.conv && mv -f copyright.conv copyright +touch -r configure.ac x +%patch0 -p1 +touch -r x configure.ac %build -%configure +%configure --with-globus=%{_usr} make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT %files %{_bindir}/uberftp %{_mandir}/man1/uberftp.1* -%doc Changelog.mssftp ChangeLog -%license COPYING +%doc Changelog.mssftp Changelog copyright %changelog -%autochangelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Sep 29 2014 Mattias Ellert - 2.8-2 +- Adapt to Globus Toolkit 6.0 + +* Tue Sep 2 2014 Steve Traylen - 2.8-1 +- Upstream to 2.8, upstream has moved to github. +- Add patch for 32 bit. + +* Mon Aug 18 2014 Fedora Release Engineering - 2.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 2.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Feb 2 2012 Steve Traylen - 2.6-4 +- Adapt for globus toolkit 5.2 + +* Sat Jan 14 2012 Fedora Release Engineering - 2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Aug 11 2010 Steve Traylen - 2.6-1 +- Update to uberftp-2.6 + +* Fri Sep 11 2009 Steve Traylen - 2.5-1 +- Update to uberftp-2.5 + +* Fri Aug 21 2009 Tomas Mraz - 2.4-5 +- rebuilt with new openssl + +* Wed Jul 22 2009 Steve Traylen 2.4-4 +- Update source to version 2.4 +- Include copyright file in package. + +* Tue Jun 23 2009 Steve Traylen 2.3-3 +- Better inclusion of globus header files. +* Fri Jun 19 2009 Steve Traylen - 2.3-2 +- Remove my debugging. +* Fri Jun 19 2009 Steve Traylen - 2.3-1 +- Initial version. + +