[xrootd/el5: 13/13] Update to version 3.3.1
Mattias Ellert
ellert at fedoraproject.org
Thu Mar 7 05:34:24 UTC 2013
commit f55dac2faa612933d4af1ad2039c859e7b805006
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Mar 7 06:31:20 2013 +0100
Update to version 3.3.1
- Remove the java package - no longer part of upstream sources
- Drop patches fixed upstream: xrootd-cryptoload.patch, xrootd-init.patch and
xrootd-perl.patch
- Drop obsolete patch: xrootd-java.patch
- Add private-devel package for deprecated header files
sources | 2 +-
xrootd-cryptoload.patch | 47 ----------
xrootd-init.patch | 16 ----
xrootd-java.patch | 207 ---------------------------------------------
xrootd-perl.patch | 32 -------
xrootd.spec | 214 +++++++++++++++++++++++-----------------------
6 files changed, 108 insertions(+), 410 deletions(-)
---
diff --git a/sources b/sources
index 8d59cf7..9619984 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32202edc5afd7f726887f5825ae5b0f5 xrootd-3.2.7.tar.gz
+8389af6838df7a5d6e5f7a6d10427b9a xrootd-3.3.1.tar.gz
diff --git a/xrootd.spec b/xrootd.spec
index 5e7db6a..ae10a92 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -4,8 +4,8 @@
Name: xrootd
Epoch: 1
-Version: 3.2.7
-Release: 2%{?dist}
+Version: 3.3.1
+Release: 1%{?dist}
Summary: Extended ROOT file server
Group: System Environment/Daemons
@@ -13,14 +13,11 @@ License: BSD
URL: http://xrootd.org/
Source0: http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.logrotate
-Patch0: %{name}-perl.patch
-Patch1: %{name}-java.patch
-Patch2: %{name}-cryptoload.patch
-Patch3: %{name}-init.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
BuildRequires: krb5-devel
+BuildRequires: libevent-devel
BuildRequires: libxml2-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
@@ -32,8 +29,6 @@ BuildRequires: perl-devel
%else
BuildRequires: perl
%endif
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: swig
BuildRequires: doxygen
BuildRequires: graphviz
@@ -44,9 +39,9 @@ BuildRequires: graphviz-gd
Provides: %{name}-server = %{epoch}:%{version}-%{release}
Provides: %{name}-server%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-server < %{epoch}:%{version}-%{release}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: %{name}-client-libs = %{epoch}:%{version}-%{release}
-Requires: %{name}-server-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-client-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-server-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires(pre): shadow-utils
Requires(pre): chkconfig
@@ -71,6 +66,8 @@ latency and increased throughput.
%package libs
Summary: Libraries used by xrootd servers and clients
Group: System Environment/Libraries
+# Java admin client no longer supported
+Obsoletes: %{name}-client-admin-java < 1:3.3.0
%description libs
This package contains libraries used by the xrootd servers and clients.
@@ -78,7 +75,10 @@ This package contains libraries used by the xrootd servers and clients.
%package devel
Summary: Development files for xrootd
Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Provides: %{name}-libs-devel = %{epoch}:%{version}-%{release}
+Provides: %{name}-libs-devel%{?_isa} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-libs-devel < %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description devel
This package contains header files and development libraries for xrootd
@@ -87,7 +87,7 @@ development.
%package client-libs
Summary: Libraries used by xrootd clients
Group: System Environment/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description client-libs
This package contains libraries used by xrootd clients.
@@ -95,8 +95,8 @@ This package contains libraries used by xrootd clients.
%package client-devel
Summary: Development files for xrootd clients
Group: Development/Libraries
-Requires: %{name}-devel = %{epoch}:%{version}-%{release}
-Requires: %{name}-client-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-client-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description client-devel
This package contains header files and development libraries for xrootd
@@ -105,8 +105,8 @@ client development.
%package server-libs
Summary: Libraries used by xrootd servers
Group: System Environment/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: %{name}-client-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-client-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description server-libs
This package contains libraries used by xrootd servers.
@@ -114,19 +114,32 @@ This package contains libraries used by xrootd servers.
%package server-devel
Summary: Development files for xrootd servers
Group: Development/Libraries
-Requires: %{name}-devel = %{epoch}:%{version}-%{release}
-Requires: %{name}-client-devel = %{epoch}:%{version}-%{release}
-Requires: %{name}-server-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-client-devel%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-server-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description server-devel
This package contains header files and development libraries for xrootd
server development.
+%package private-devel
+Summary: Legacy xrootd headers
+Group: Development/Libraries
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildArch: noarch
+%endif
+
+%description private-devel
+This package contains some private xrootd headers. The use of these
+headers is strongly discouraged. Backward compatibility between
+versions is not guaranteed for these headers.
+
%package client
Summary: Xrootd command line client tools
Group: Applications/Internet
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: %{name}-client-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-client-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description client
This package contains the command line tools used to communicate with
@@ -135,8 +148,9 @@ xrootd servers.
%package fuse
Summary: Xrootd FUSE tool
Group: Applications/Internet
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: %{name}-client-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-client-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: fuse
%description fuse
This package contains the FUSE (file system in user space) xrootd mount
@@ -145,25 +159,14 @@ tool.
%package client-admin-perl
Summary: Xrootd client administration Perl module
Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: %{name}-client-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-client-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description client-admin-perl
This package contains a swig generated xrootd client administration
Perl module.
-%package client-admin-java
-Summary: Xrootd client administration Java library
-Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: %{name}-client-libs = %{epoch}:%{version}-%{release}
-Requires: java
-
-%description client-admin-java
-This package contains JNI bindings for doing xrootd client administration
-in Java.
-
%package doc
Summary: Developer documentation for the xrootd libraries
Group: Documentation
@@ -177,97 +180,76 @@ This package contains the API documentation of the xrootd libraries.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-# Use absolute path to load JNI library
-sed 's!loadLibrary("\(.*\)")!load("%{_libdir}/%{name}/lib\1.so")!' \
- -i src/XrdClient/XrdClientAdminJNI.java
-
%build
mkdir build
-pushd build
-%cmake -DBUILD_JAVA:BOOL=ON -DJAVA_HOME:PATH=/usr/lib/jvm/java ..
+pushd build
+PERLPATH=$(eval "`perl -V:archlib`"; echo $archlib/CORE)
+%cmake -DPERL_LIBRARY=$PERLPATH/libperl.so -DPERL_INCLUDE_PATH=$PERLPATH ..
make %{?_smp_mflags}
-
popd
doxygen Doxyfile
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
pushd build
-
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
+popd
# Perl module
-mkdir -p $RPM_BUILD_ROOT%{perl_vendorarch}/auto/XrdClientAdmin
-mv $RPM_BUILD_ROOT/%{_libdir}/XrdClientAdmin.pm \
- $RPM_BUILD_ROOT%{perl_vendorarch}
-mv $RPM_BUILD_ROOT/%{_libdir}/XrdClientAdmin.so \
- $RPM_BUILD_ROOT%{perl_vendorarch}/auto/XrdClientAdmin
-
-# Java JNI
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
-mv $RPM_BUILD_ROOT/%{_libdir}/libXrdClientAdminJNI.so \
- $RPM_BUILD_ROOT/%{_libdir}/XrdClientAdminJNI.jar \
- $RPM_BUILD_ROOT%{_libdir}/%{name}
-
-popd
+mkdir -p %{buildroot}%{perl_vendorarch}/auto/XrdClientAdmin
+mv %{buildroot}/%{_libdir}/XrdClientAdmin.pm \
+ %{buildroot}%{perl_vendorarch}
+mv %{buildroot}/%{_libdir}/XrdClientAdmin.so \
+ %{buildroot}%{perl_vendorarch}/auto/XrdClientAdmin
# Service start-up scripts et al.
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+mkdir -p %{buildroot}%{_initrddir}
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}
-install -p packaging/rhel/cmsd.init \
- $RPM_BUILD_ROOT%{_initrddir}/cmsd
-install -p packaging/rhel/frm_purged.init \
- $RPM_BUILD_ROOT%{_initrddir}/frm_purged
-install -p packaging/rhel/frm_xfrd.init \
- $RPM_BUILD_ROOT%{_initrddir}/frm_xfrd
-install -p packaging/rhel/%{name}.init \
- $RPM_BUILD_ROOT%{_initrddir}/%{name}
+install -p packaging/rhel/cmsd.init %{buildroot}%{_initrddir}/cmsd
+install -p packaging/rhel/frm_purged.init %{buildroot}%{_initrddir}/frm_purged
+install -p packaging/rhel/frm_xfrd.init %{buildroot}%{_initrddir}/frm_xfrd
+install -p packaging/rhel/%{name}.init %{buildroot}%{_initrddir}/%{name}
-sed s/%{name}.functions/%{name}-functions/ -i $RPM_BUILD_ROOT%{_initrddir}/*
+sed s/%{name}.functions/%{name}-functions/ -i %{buildroot}%{_initrddir}/*
install -m 644 -p packaging/rhel/%{name}.functions \
- $RPM_BUILD_ROOT%{_initrddir}/%{name}-functions
+ %{buildroot}%{_initrddir}/%{name}-functions
sed -e 's/XROOTD_USER=daemon/XROOTD_USER=%{name}/g' \
-e 's/XROOTD_GROUP=daemon/XROOTD_GROUP=%{name}/g' \
packaging/rhel/%{name}.sysconfig > \
- $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+ %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+chmod 644 %{buildroot}%{_sysconfdir}/sysconfig/%{name}
install -m 644 packaging/common/%{name}-clustered.cfg \
- $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}-clustered.cfg
+ %{buildroot}%{_sysconfdir}/%{name}/%{name}-clustered.cfg
install -m 644 packaging/common/%{name}-standalone.cfg \
- $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}-standalone.cfg
+ %{buildroot}%{_sysconfdir}/%{name}/%{name}-standalone.cfg
-chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/XrdCmsNotify.pm
+chmod 644 %{buildroot}%{_datadir}/%{name}/utils/XrdCmsNotify.pm
sed 's!/usr/bin/env perl!/usr/bin/perl!' -i \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/netchk \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/XrdCmsNotify.pm \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/XrdOlbMonPerf
+ %{buildroot}%{_datadir}/%{name}/utils/netchk \
+ %{buildroot}%{_datadir}/%{name}/utils/XrdCmsNotify.pm \
+ %{buildroot}%{_datadir}/%{name}/utils/XrdOlbMonPerf
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name}
+mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
+mkdir -p %{buildroot}%{_localstatedir}/spool/%{name}
-mkdir $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
+mkdir %{buildroot}%{_sysconfdir}/logrotate.d
+install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
# Documentation
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr doxydoc/html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
+cp -pr doxydoc/html %{buildroot}%{_docdir}/%{name}-%{version}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post libs -p /sbin/ldconfig
@@ -346,14 +328,17 @@ fi
%{_mandir}/man8/%{name}.8*
%{_datadir}/%{name}
%{_initrddir}/*
-%config(noreplace) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%dir %{_sysconfdir}/%{name}
+%attr(-,xrootd,xrootd) %config(noreplace) %{_sysconfdir}/%{name}/*.cfg
%attr(-,xrootd,xrootd) %{_localstatedir}/log/%{name}
%attr(-,xrootd,xrootd) %{_localstatedir}/spool/%{name}
%files libs
%defattr(-,root,root,-)
+%{_libdir}/libXrdAppUtils.so.*
+%{_libdir}/libXrdCksCalczcrc32.so.*
%{_libdir}/libXrdCrypto.so.*
%{_libdir}/libXrdCryptoLite.so.*
%{_libdir}/libXrdCryptossl.so.*
@@ -361,6 +346,7 @@ fi
%{_libdir}/libXrdSec*.so.*
%{_libdir}/libXrdUtils.so.*
# Some of the libraries are used as plugins - need the .so symlink at runtime
+%{_libdir}/libXrdCksCalczcrc32.so
%{_libdir}/libXrdCryptossl.so
%{_libdir}/libXrdSec*.so
@@ -370,16 +356,14 @@ fi
%{_includedir}/%{name}/XProtocol
%{_includedir}/%{name}/Xrd
%{_includedir}/%{name}/XrdCks
-%{_includedir}/%{name}/XrdCrypto
%{_includedir}/%{name}/XrdNet
%{_includedir}/%{name}/XrdOuc
%{_includedir}/%{name}/XrdSec
-%{_includedir}/%{name}/XrdSecgsi
-%{_includedir}/%{name}/XrdSecsss
-%{_includedir}/%{name}/XrdSut
%{_includedir}/%{name}/XrdSys
%{_includedir}/%{name}/XrdVersion.hh
+%{_includedir}/%{name}/XrdVersionPlugin.hh
# These libraries are not used as plugins
+%{_libdir}/libXrdAppUtils.so
%{_libdir}/libXrdCrypto.so
%{_libdir}/libXrdCryptoLite.so
%{_libdir}/libXrdMain.so
@@ -387,6 +371,7 @@ fi
%files client-libs
%defattr(-,root,root,-)
+%{_libdir}/libXrdCl.so.*
%{_libdir}/libXrdClient.so.*
%{_libdir}/libXrdFfs.so.*
%{_libdir}/libXrdPosix.so.*
@@ -396,10 +381,11 @@ fi
%files client-devel
%defattr(-,root,root,-)
+%{_includedir}/%{name}/XrdCl
%{_includedir}/%{name}/XrdClient
-%{_includedir}/%{name}/XrdFfs
%{_includedir}/%{name}/XrdPosix
# These libraries are not used as plugins
+%{_libdir}/libXrdCl.so
%{_libdir}/libXrdClient.so
%{_libdir}/libXrdFfs.so
%{_libdir}/libXrdPosix.so
@@ -410,36 +396,45 @@ fi
%{_libdir}/libXrdPss.so.*
%{_libdir}/libXrdOfs.so.*
%{_libdir}/libXrdServer.so.*
+%{_libdir}/libXrdXrootd.so.*
# Some of the libraries are used as plugins - need the .so symlink at runtime
%{_libdir}/libXrdBwm.so
%{_libdir}/libXrdPss.so
+%{_libdir}/libXrdXrootd.so
%files server-devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/XrdAcc
-%{_includedir}/%{name}/XrdBwm
%{_includedir}/%{name}/XrdCms
-%{_includedir}/%{name}/XrdFrc
-%{_includedir}/%{name}/XrdOfs
%{_includedir}/%{name}/XrdOss
-%{_includedir}/%{name}/XrdPss
%{_includedir}/%{name}/XrdSfs
+%{_includedir}/%{name}/XrdXrootd
# These libraries are not used as plugins
%{_libdir}/libXrdOfs.so
%{_libdir}/libXrdServer.so
+%files private-devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}/private
+
%files client
%defattr(-,root,root,-)
%{_bindir}/xprep
%{_bindir}/xrd
%{_bindir}/xrdadler32
+%{_bindir}/xrdcopy
%{_bindir}/xrdcp
+%{_bindir}/xrdcp-old
+%{_bindir}/xrdfs
%{_bindir}/xrdgsiproxy
%{_bindir}/xrdstagetool
%{_mandir}/man1/xprep.1*
%{_mandir}/man1/xrd.1*
%{_mandir}/man1/xrdadler32.1*
+%{_mandir}/man1/xrdcopy.1*
%{_mandir}/man1/xrdcp.1*
+%{_mandir}/man1/xrdcp-old.1*
+%{_mandir}/man1/xrdfs.1*
%{_mandir}/man1/xrdgsiproxy.1*
%{_mandir}/man1/xrdstagetool.1*
@@ -447,21 +442,26 @@ fi
%defattr(-,root,root,-)
%{_bindir}/xrootdfs
%{_mandir}/man1/xrootdfs.1*
+%dir %{_sysconfdir}/%{name}
%files client-admin-perl
%defattr(-,root,root,-)
%{perl_vendorarch}/XrdClientAdmin.pm
%{perl_vendorarch}/auto/XrdClientAdmin
-%files client-admin-java
-%defattr(-,root,root,-)
-%{_libdir}/%{name}
-
%files doc
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Wed Mar 06 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1:3.3.1-1
+- Update to version 3.3.1
+- Remove the java package - no longer part of upstream sources
+- Drop patches fixed upstream: xrootd-cryptoload.patch, xrootd-init.patch and
+ xrootd-perl.patch
+- Drop obsolete patch: xrootd-java.patch
+- Add private-devel package for deprecated header files
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list