Merge pull request #10 from bbockelm/write_improvements

Improve support for writing via Xrootd

.gitignore

@@ -4,3 +4,4 @@ Makefile
 cmake_install.cmake
 xrootd_hdfs_envcheck
 *.so*
+build

CMakeLists.txt

@@ -46,7 +46,7 @@ install(
   LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
 
 install(
-  PROGRAMS xrootd_hdfs_envcheck
+  TARGETS xrootd_hdfs_envcheck
   DESTINATION bin)
 
 install(

spec/xrootd-hdfs.spec → rpm/xrootd-hdfs.spec

@@ -1,6 +1,6 @@
 Name: xrootd-hdfs
-Version: 1.9.2
-Release: 2%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
 Summary: HDFS plugin for xrootd
 
 Group: System Environment/Development
@@ -9,15 +9,13 @@ URL: https://github.com/bbockelm/xrootd-hdfs
 # Generated from:
 # git archive --format=tgz --prefix=%{name}-%{version}/ v%{version} > %{name}-%{version}.tar.gz
 Source0: %{name}-%{version}.tar.gz
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: xrootd-devel >= 1:4.6
 BuildRequires: xrootd-server-devel >= 1:4.6
 BuildRequires: cmake
-BuildRequires: hadoop-libhdfs >= 2.0.0+545-1.cdh4.1.1
-BuildRequires: java7-devel
+BuildRequires: hadoop-libhdfs-devel >= 2.0.0+545-1.cdh4.1.1
+BuildRequires: java-devel = 1:1.7.0
 BuildRequires: jpackage-utils
 Requires: hadoop-client >= 2.0.0+545-1.cdh4.1.1
-Requires: xrootd >= 4.6.0-1
 
 %package devel
 Summary: Development headers for Xrootd HDFS plugin
@@ -33,18 +31,18 @@ Group: System Environment/Development
 %setup -q
 
 %build
+sed -i 's|@devel@|%{version}|' src/XrdHdfs.cc
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xrootd
-sed -e "s#@LIBDIR@#%{_libdir}#" spec/xrootd.sample.hdfs.cfg.in > $RPM_BUILD_ROOT%{_sysconfdir}/xrootd/xrootd.sample.hdfs.cfg
+sed -e "s#@LIBDIR@#%{_libdir}#" rpm/xrootd.sample.hdfs.cfg.in > $RPM_BUILD_ROOT%{_sysconfdir}/xrootd/xrootd.sample.hdfs.cfg
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m 0644 spec/xrootd-hdfs.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xrootd-hdfs
+install -m 0644 rpm/xrootd-hdfs.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xrootd-hdfs
 
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/xrootd-hdfs
 install -m 0755 $RPM_BUILD_ROOT%{_bindir}/xrootd_hdfs_envcheck $RPM_BUILD_ROOT%{_libexecdir}/xrootd-hdfs
@@ -54,9 +52,6 @@ rm $RPM_BUILD_ROOT%{_bindir}/xrootd_hdfs_envcheck
 # is really a loadable module, not a shared lib: it's not linked to all the xrootd
 # libs necessary to load it outside xrootd.
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libXrdHdfs.so
@@ -70,12 +65,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/XrdHdfs.hh
 
 %changelog
+* Tue Mar 06 2018 Brian Bockelman <[email protected]> - 2.0.0-1
+- Add full support for writing files into HDFS.
+
+* Thu Jan 18 2018 Carl Edquist <[email protected]> - 1.9.2-5
+- Drop version conflict for xrootd (SOFTWARE-2682)
+
+* Thu Nov 09 2017 Carl Edquist <[email protected]> - 1.9.2-4
+- Update hadoop build requirement (SOFTWARE-2982)
+
+* Tue Nov 07 2017 Carl Edquist <[email protected]> - 1.9.2-3
+- Rename java7 dependencies (SOFTWARE-2991)
+- Rebuild against hadoop 2.6.0+ (SOFTWARE-2906)
+
 * Mon Aug 07 2017 Marian Zvada <[email protected]> - 1.9.2-2
 - bumped version while changing Conflicts directive to Requires xrootd 4.6.1
 
 * Wed Aug 02 2017 Marian Zvada <[email protected]> - 1.9.2-1
 - Fixes a minor bug for reporting error codes when listing directories fails
-  Previously, it was possible for the error state to leak between calls to libhdfs
+- Previously, it was possible for the error state to leak between calls to libhdfs
 
 * Sat Mar 25 2017 Brian Bockelman <[email protected]> - 1.9.1-1
 - Fix for listing empty directories.