[xrootd/epel7] Update to version 4.0.1

Mattias Ellert ellert at fedoraproject.org
Sun Jul 13 12:33:35 UTC 2014 

commit bb3fe3247812bf386e89dd7daeebf8beac636ce6
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 13 14:31:58 2014 +0200

    Update to version 4.0.1
    
    - Split main package into server and selinux
    - New main package installs server and selinux
    - Drop patches accepted upstream (-32bit, -range, -narrowing)

 sources                |    2 +-
 xrootd-32bit.patch     |   21 --------
 xrootd-narrowing.patch |   39 ---------------
 xrootd-range.patch     |  122 ------------------------------------------------
 xrootd.spec            |   88 ++++++++++++++++++++++-------------
 5 files changed, 57 insertions(+), 215 deletions(-)
---
diff --git a/sources b/sources
index 98def52..7ef9152 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fb3c3ac1d683270f2ec5b276e3fa726  xrootd-4.0.0.tar.gz
+8e384d1b6f3eaad16ccce2a829488f07  xrootd-4.0.1.tar.gz
diff --git a/xrootd.spec b/xrootd.spec
index 1a702a7..39be90c 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -2,7 +2,7 @@
 
 Name:		xrootd
 Epoch:		1
-Version:	4.0.0
+Version:	4.0.1
 Release:	1%{?dist}
 Summary:	Extended ROOT file server
 
@@ -10,12 +10,6 @@ Group:		System Environment/Daemons
 License:	LGPLv3+
 URL:		http://xrootd.org/
 Source0:	http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz
-#		Fix for uninitialized varible on 32 bit systems
-Patch0:		%{name}-32bit.patch
-#		Fix for unsigned char
-Patch1:		%{name}-range.patch
-#		Fix for big endian
-Patch2:		%{name}-narrowing.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake
@@ -34,22 +28,9 @@ BuildRequires:	graphviz-gd
 %endif
 BuildRequires:	selinux-policy-devel
 
-Provides:	%{name}-server = %{epoch}:%{version}-%{release}
-Provides:	%{name}-server%{?_isa} = %{epoch}:%{version}-%{release}
-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
-Requires(post):		chkconfig
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(postun):	initscripts
-Requires(post):		policycoreutils
-Requires(postun):	policycoreutils
+Requires:	%{name}-server%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-selinux = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-server < 1:4.0.0
 
 %description
 The Extended root file server consists of a file server called xrootd
@@ -64,6 +45,37 @@ originally developed to cluster and load balance Objectivity/DB AMS
 database servers. It provides enhanced capability along with lower
 latency and increased throughput.
 
+%package server
+Summary:	Xrootd server daemons
+Group:		System Environment/Daemons
+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
+Requires(post):		chkconfig
+Requires(preun):	chkconfig
+Requires(preun):	initscripts
+Requires(postun):	initscripts
+
+%description server
+This package contains the xrootd servers without the SELinux support.
+Unless you are installing on a system without SELinux also install the
+xrootd-selinux package.
+
+%package selinux
+Summary:	SELinux policy module for the xrootd server
+Group:		System Environment/Daemons
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildArch:	noarch
+%endif
+Requires:	selinux-policy
+Requires(post):		policycoreutils
+Requires(postun):	policycoreutils
+
+%description selinux
+This package contains SELinux policy module for the xrootd server package.
+
 %package libs
 Summary:	Libraries used by xrootd servers and clients
 Group:		System Environment/Libraries
@@ -177,9 +189,6 @@ This package contains the API documentation of the xrootd libraries.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %if %{?fedora}%{!?fedora:0} <= 9 && %{?rhel}%{!?rhel:0} <= 5
 # Older versions of SELinux does not have policy for open
@@ -276,7 +285,7 @@ rm -rf %{buildroot}
 
 %postun server-libs -p /sbin/ldconfig
 
-%pre
+%pre server
 getent group %{name} >/dev/null || groupadd -r %{name}
 getent passwd %{name} >/dev/null || useradd -r -g %{name} -s /sbin/nologin \
   -d %{_localstatedir}/spool/%{name} -c "XRootD runtime user" %{name}
@@ -285,16 +294,15 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -s /sbin/nologin \
 /sbin/service olbd stop >/dev/null 2>&1 || :
 /sbin/chkconfig --del olbd >/dev/null 2>&1 || :
 
-%post
+%post server
 if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add %{name}
     /sbin/chkconfig --add cmsd
     /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
+%preun server
 if [ $1 -eq 0 ]; then
     /sbin/service %{name} stop >/dev/null 2>&1 || :
     /sbin/service cmsd stop >/dev/null 2>&1 || :
@@ -306,18 +314,26 @@ if [ $1 -eq 0 ]; then
     /sbin/chkconfig --del frm_xfrd
 fi
 
-%postun
+%postun server
 if [ $1 -ge 1 ]; then
     /sbin/service %{name} condrestart >/dev/null 2>&1 || :
     /sbin/service cmsd condrestart >/dev/null 2>&1 || :
     /sbin/service frm_purged condrestart >/dev/null 2>&1 || :
     /sbin/service frm_xfrd condrestart >/dev/null 2>&1 || :
 fi
+
+%post selinux
+/usr/sbin/semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp >/dev/null 2>&1 || :
+
+%postun selinux
 if [ $1 -eq 0 ] ; then
     /usr/sbin/semodule -r %{name} >/dev/null 2>&1 || :
 fi
 
 %files
+# Empty
+
+%files server
 %{_bindir}/cconfig
 %{_bindir}/cmsd
 %{_bindir}/cns_ssi
@@ -346,11 +362,13 @@ fi
 %{_initrddir}/*
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{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 selinux
+%{_datadir}/selinux/packages/%{name}/%{name}.pp
+
 %files libs
 %{_libdir}/libXrdAppUtils.so.*
 %{_libdir}/libXrdCksCalczcrc32.so.*
@@ -462,6 +480,12 @@ fi
 %doc %{_pkgdocdir}
 
 %changelog
+* Fri Jul 11 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1:4.0.1-1
+- Update to version 4.0.1
+- Split main package into server and selinux
+- New main package installs server and selinux
+- Drop patches accepted upstream (-32bit, -range, -narrowing)
+
 * Sun Jun 29 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1:4.0.0-1
 - Update to version 4.0.0
 - Remove the perl package - no longer part of upstream sources

More information about the scm-commits mailing list