[uberftp] Upstream to 2.8, upstream has moved to github.
stevetraylen
stevetraylen at fedoraproject.org
Mon Sep 8 09:39:58 UTC 2014
commit 51d9f642e620ceced5c0c0ab79a443975bf8aa01
Author: Steve Traylen <steve.traylen at cern.ch>
Date: Mon Sep 8 09:39:48 2014 +0000
Upstream to 2.8, upstream has moved to github.
uberftp-32bit-pkg-config.patch | 12 ++++++++++++
uberftp.spec | 5 ++++-
2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/uberftp-32bit-pkg-config.patch b/uberftp-32bit-pkg-config.patch
new file mode 100644
index 0000000..e1e1b0b
--- /dev/null
+++ b/uberftp-32bit-pkg-config.patch
@@ -0,0 +1,12 @@
+diff -uNr UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518.ORIG/configure.ac UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518/configure.ac
+--- UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518.ORIG/configure.ac 2014-09-08 08:33:49.804000000 +0000
++++ UberFTP-012788f5430c9f7eb03e65b7aa8bcb106f472518/configure.ac 2014-09-08 09:14:20.865000000 +0000
+@@ -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"
+ 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 8b0a91d..0d8fc64 100644
--- a/uberftp.spec
+++ b/uberftp.spec
@@ -21,6 +21,8 @@ Group: Applications/Internet
License: NCSA
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: grid-packaging-tools, globus-gssapi-gsi-devel
@@ -33,7 +35,7 @@ third party transfers.
%prep
%setup -q -n UberFTP-%{commit}
iconv -f iso8859-1 -t utf-8 copyright > copyright.conv && mv -f copyright.conv copyright
-
+%patch0 -p1
%build
mkdir pkgdata
@@ -67,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Sep 2 2014 Steve Traylen <steve.traylen at cern.ch> - 2.8-1
- Upstream to 2.8, upstream has moved to github.
+- Add patch for 32 bit.
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list