diff --git a/sources b/sources index 363e8a3..98def52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c16a144e938e43cc637b990d317a3f4 xrootd-3.3.6.tar.gz +2fb3c3ac1d683270f2ec5b276e3fa726 xrootd-4.0.0.tar.gz diff --git a/xrootd.logrotate b/xrootd.logrotate deleted file mode 100644 index 80ae68d..0000000 --- a/xrootd.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/xrootd/*.log { - missingok - notifempty - daily - rotate 30 - compress - copytruncate -} diff --git a/xrootd.spec b/xrootd.spec index 9ac6b7e..af83796 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -1,20 +1,15 @@ -%{!?perl_vendorarch: %global perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - -%{?perl_default_filter} - %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: xrootd Epoch: 1 -Version: 3.3.6 -Release: 2%{?dist} +Version: 4.0.0 +Release: 1%{?dist} Summary: Extended ROOT file server Group: System Environment/Daemons License: LGPLv3+ URL: http://xrootd.org/ Source0: http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz -Source1: %{name}.logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -26,17 +21,12 @@ BuildRequires: openssl-devel BuildRequires: readline-devel BuildRequires: zlib-devel BuildRequires: fuse-devel -%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 6 -BuildRequires: perl-devel -%else -BuildRequires: perl -%endif -BuildRequires: swig BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif +BuildRequires: selinux-policy-devel Provides: %{name}-server = %{epoch}:%{version}-%{release} Provides: %{name}-server%{?_isa} = %{epoch}:%{version}-%{release} @@ -44,6 +34,7 @@ Obsoletes: %{name}-server < %{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: selinux-policy Requires(pre): shadow-utils Requires(pre): chkconfig @@ -51,6 +42,8 @@ Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts +Requires(post): policycoreutils +Requires(postun): policycoreutils %description The Extended root file server consists of a file server called xrootd @@ -70,6 +63,8 @@ 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 +# Perl admin client no longer supported +Obsoletes: %{name}-client-admin-perl < 1:4.0.0 %description libs This package contains libraries used by the xrootd servers and clients. @@ -164,17 +159,6 @@ Requires: fuse This package contains the FUSE (file system in user space) xrootd mount tool. -%package client-admin-perl -Summary: Xrootd client administration Perl module -Group: Development/Libraries -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 doc Summary: Developer documentation for the xrootd libraries Group: Documentation @@ -188,15 +172,23 @@ This package contains the API documentation of the xrootd libraries. %prep %setup -q +%if %{?fedora}%{!?fedora:0} <= 9 && %{?rhel}%{!?rhel:0} <= 5 +# Older versions of SELinux does not have policy for open +sed 's/ open / /' -i packaging/common/%{name}.te +%endif + %build mkdir build pushd build -PERLPATH=$(eval "`perl -V:archlib`"; echo $archlib/CORE) -%cmake -DPERL_LIBRARY=$PERLPATH/libperl.so -DPERL_INCLUDE_PATH=$PERLPATH .. +%cmake .. make %{?_smp_mflags} popd +pushd packaging/common +make -f /usr/share/selinux/devel/Makefile +popd + doxygen Doxyfile %install @@ -206,13 +198,6 @@ pushd build make install DESTDIR=%{buildroot} popd -# Perl module -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 %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_sysconfdir}/sysconfig @@ -228,17 +213,23 @@ sed s/%{name}.functions/%{name}-functions/ -i %{buildroot}%{_initrddir}/* install -m 644 -p packaging/rhel/%{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 > \ +install -m 644 -p packaging/rhel/%{name}.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/%{name} -chmod 644 %{buildroot}%{_sysconfdir}/sysconfig/%{name} -install -m 644 packaging/common/%{name}-clustered.cfg \ +install -m 644 -p packaging/common/%{name}-clustered.cfg \ %{buildroot}%{_sysconfdir}/%{name}/%{name}-clustered.cfg -install -m 644 packaging/common/%{name}-standalone.cfg \ +install -m 644 -p packaging/common/%{name}-standalone.cfg \ %{buildroot}%{_sysconfdir}/%{name}/%{name}-standalone.cfg +# Client config +install -m 644 -p packaging/common/client.conf \ + %{buildroot}%{_sysconfdir}/%{name}/client.conf + +# Client plug-in config +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d +install -m 644 -p packaging/common/client-plugin.conf.example \ + %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d + chmod 644 %{buildroot}%{_datadir}/%{name}/utils/XrdCmsNotify.pm sed 's!/usr/bin/env perl!/usr/bin/perl!' -i \ @@ -250,7 +241,12 @@ mkdir -p %{buildroot}%{_localstatedir}/log/%{name} mkdir -p %{buildroot}%{_localstatedir}/spool/%{name} mkdir %{buildroot}%{_sysconfdir}/logrotate.d -install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -m 644 -p packaging/common/%{name}.logrotate \ + %{buildroot}%{_sysconfdir}/logrotate.d/%{name} + +mkdir -p %{buildroot}%{_datadir}/selinux/packages/%{name} +install -m 644 -p packaging/common/%{name}.pp \ + %{buildroot}%{_datadir}/selinux/packages/%{name} # Documentation mkdir -p %{buildroot}%{_pkgdocdir} @@ -287,6 +283,7 @@ if [ $1 -eq 1 ]; then /sbin/chkconfig --add frm_purged /sbin/chkconfig --add frm_xfrd fi +/usr/sbin/semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp >/dev/null 2>&1 || : %preun if [ $1 -eq 0 ]; then @@ -307,9 +304,11 @@ if [ $1 -ge 1 ]; then /sbin/service frm_purged condrestart >/dev/null 2>&1 || : /sbin/service frm_xfrd condrestart >/dev/null 2>&1 || : fi +if [ $1 -eq 0 ] ; then + /usr/sbin/semodule -r %{name} >/dev/null 2>&1 || : +fi %files -%defattr(-,root,root,-) %{_bindir}/cconfig %{_bindir}/cmsd %{_bindir}/cns_ssi @@ -338,19 +337,17 @@ fi %{_initrddir}/* %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%dir %{_sysconfdir}/%{name} +%{_datadir}/selinux/packages/%{name}/%{name}.pp %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.* -%{_libdir}/libXrdMain.so.* %{_libdir}/libXrdSec*.so.* %{_libdir}/libXrdUtils.so.* # Some of the libraries are used as plugins - need the .so symlink at runtime @@ -360,7 +357,6 @@ fi %doc COPYING* LICENSE %files devel -%defattr(-,root,root,-) %dir %{_includedir}/%{name} %{_includedir}/%{name}/XProtocol %{_includedir}/%{name}/Xrd @@ -375,11 +371,9 @@ fi %{_libdir}/libXrdAppUtils.so %{_libdir}/libXrdCrypto.so %{_libdir}/libXrdCryptoLite.so -%{_libdir}/libXrdMain.so %{_libdir}/libXrdUtils.so %files client-libs -%defattr(-,root,root,-) %{_libdir}/libXrdCl.so.* %{_libdir}/libXrdClient.so.* %{_libdir}/libXrdFfs.so.* @@ -387,9 +381,12 @@ fi %{_libdir}/libXrdPosixPreload.so.* # Some of the libraries are used as plugins - need the .so symlink at runtime %{_libdir}/libXrdPosixPreload.so +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/client.conf +%dir %{_sysconfdir}/%{name}/client.plugins.d +%config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/client-plugin.conf.example %files client-devel -%defattr(-,root,root,-) %{_includedir}/%{name}/XrdCl %{_includedir}/%{name}/XrdClient %{_includedir}/%{name}/XrdPosix @@ -400,34 +397,35 @@ fi %{_libdir}/libXrdPosix.so %files server-libs -%defattr(-,root,root,-) %{_libdir}/libXrdBwm.so.* -%{_libdir}/libXrdPss.so.* +%{_libdir}/libXrdFileCache.so.* +%{_libdir}/libXrdHttp.so.* %{_libdir}/libXrdOfs.so.* +%{_libdir}/libXrdPss.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}/libXrdFileCache.so +%{_libdir}/libXrdHttp.so %{_libdir}/libXrdPss.so %{_libdir}/libXrdXrootd.so %files server-devel -%defattr(-,root,root,-) %{_includedir}/%{name}/XrdAcc %{_includedir}/%{name}/XrdCms %{_includedir}/%{name}/XrdOss %{_includedir}/%{name}/XrdSfs %{_includedir}/%{name}/XrdXrootd +%{_includedir}/%{name}/XrdHttp # 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 @@ -448,21 +446,17 @@ fi %{_mandir}/man1/xrdstagetool.1* %files fuse -%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 doc -%defattr(-,root,root,-) %doc %{_pkgdocdir} %changelog +* Sun Jun 29 2014 Mattias Ellert - 1:4.0.0-1 +- Update to version 4.0.0 +- Remove the perl package - no longer part of upstream sources + * Sun Jun 08 2014 Fedora Release Engineering - 1:3.3.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild