diff --git a/sources b/sources index f80c011..8d59cf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12f13a484389173994e8ef7344cf0ae6 xrootd-3.2.5.tar.gz +32202edc5afd7f726887f5825ae5b0f5 xrootd-3.2.7.tar.gz diff --git a/xrootd.spec b/xrootd.spec index 480ce48..a0a3e31 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -4,7 +4,7 @@ Name: xrootd Epoch: 1 -Version: 3.2.5 +Version: 3.2.7 Release: 1%{?dist} Summary: Extended ROOT file server @@ -21,11 +21,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: krb5-devel -BuildRequires: openssl-devel +BuildRequires: libxml2-devel BuildRequires: ncurses-devel +BuildRequires: openssl-devel BuildRequires: readline-devel +BuildRequires: zlib-devel BuildRequires: fuse-devel -BuildRequires: libxml2-devel %if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: perl-devel %else @@ -44,6 +45,8 @@ 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(pre): shadow-utils Requires(pre): chkconfig @@ -70,25 +73,60 @@ Summary: Libraries used by xrootd servers and clients Group: System Environment/Libraries %description libs -This package contains the libraries used by the xrootd servers and -clients. +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}-client-devel = %{epoch}:%{version}-%{release} -Provides: %{name}-client-devel%{?_isa} = %{epoch}:%{version}-%{release} -Provides: %{name}-server-devel = %{epoch}:%{version}-%{release} -Provides: %{name}-server-devel%{?_isa} = %{epoch}:%{version}-%{release} %description devel -This package contains header files and development libraries for xrootd. +This package contains header files and development libraries for xrootd +development. + +%package client-libs +Summary: Libraries used by xrootd clients +Group: System Environment/Libraries +Requires: %{name}-libs = %{epoch}:%{version}-%{release} + +%description client-libs +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} + +%description client-devel +This package contains header files and development libraries for xrootd +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} + +%description server-libs +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} + +%description server-devel +This package contains header files and development libraries for xrootd +server development. %package client Summary: Xrootd command line client tools Group: Applications/Internet Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: %{name}-client-libs = %{epoch}:%{version}-%{release} %description client This package contains the command line tools used to communicate with @@ -98,6 +136,7 @@ xrootd servers. Summary: Xrootd FUSE tool Group: Applications/Internet Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: %{name}-client-libs = %{epoch}:%{version}-%{release} %description fuse This package contains the FUSE (file system in user space) xrootd mount @@ -107,6 +146,7 @@ tool. Summary: Xrootd client administration Perl module Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: %{name}-client-libs = %{epoch}:%{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description client-admin-perl @@ -117,6 +157,7 @@ Perl module. 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 @@ -232,6 +273,14 @@ rm -rf $RPM_BUILD_ROOT %postun libs -p /sbin/ldconfig +%post client-libs -p /sbin/ldconfig + +%postun client-libs -p /sbin/ldconfig + +%post server-libs -p /sbin/ldconfig + +%postun server-libs -p /sbin/ldconfig + %pre getent group %{name} >/dev/null || groupadd -r %{name} getent passwd %{name} >/dev/null || useradd -r -g %{name} -s /sbin/nologin \ @@ -274,7 +323,10 @@ fi %{_bindir}/cconfig %{_bindir}/cmsd %{_bindir}/cns_ssi -%{_bindir}/frm_* +%{_bindir}/frm_admin +%{_bindir}/frm_purged +%{_bindir}/frm_xfragent +%{_bindir}/frm_xfrd %{_bindir}/mpxstats %{_bindir}/wait41 %{_bindir}/XrdCnsd @@ -302,35 +354,79 @@ fi %files libs %defattr(-,root,root,-) -%{_libdir}/libXrd*.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 -%{_libdir}/libXrdBwm.so %{_libdir}/libXrdCryptossl.so -%{_libdir}/libXrdPosixPreload.so -%{_libdir}/libXrdPss.so -%{_libdir}/libXrdSec.so -%{_libdir}/libXrdSecgsi.so -%{_libdir}/libXrdSecgsiAuthzVO.so -%{_libdir}/libXrdSecgsiGMAPDN.so -%{_libdir}/libXrdSecgsiGMAPLDAP.so -%{_libdir}/libXrdSeckrb5.so -%{_libdir}/libXrdSecpwd.so -%{_libdir}/libXrdSecsss.so -%{_libdir}/libXrdSecunix.so +%{_libdir}/libXrdSec*.so %files devel %defattr(-,root,root,-) -%{_includedir}/%{name} +%dir %{_includedir}/%{name} +%{_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 # These libraries are not used as plugins -%{_libdir}/libXrdClient.so %{_libdir}/libXrdCrypto.so %{_libdir}/libXrdCryptoLite.so -%{_libdir}/libXrdFfs.so %{_libdir}/libXrdMain.so -%{_libdir}/libXrdOfs.so +%{_libdir}/libXrdUtils.so + +%files client-libs +%defattr(-,root,root,-) +%{_libdir}/libXrdClient.so.* +%{_libdir}/libXrdFfs.so.* +%{_libdir}/libXrdPosix.so.* +%{_libdir}/libXrdPosixPreload.so.* +# Some of the libraries are used as plugins - need the .so symlink at runtime +%{_libdir}/libXrdPosixPreload.so + +%files client-devel +%defattr(-,root,root,-) +%{_includedir}/%{name}/XrdClient +%{_includedir}/%{name}/XrdFfs +%{_includedir}/%{name}/XrdPosix +# These libraries are not used as plugins +%{_libdir}/libXrdClient.so +%{_libdir}/libXrdFfs.so %{_libdir}/libXrdPosix.so + +%files server-libs +%defattr(-,root,root,-) +%{_libdir}/libXrdBwm.so.* +%{_libdir}/libXrdPss.so.* +%{_libdir}/libXrdOfs.so.* +%{_libdir}/libXrdServer.so.* +# Some of the libraries are used as plugins - need the .so symlink at runtime +%{_libdir}/libXrdBwm.so +%{_libdir}/libXrdPss.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 +# These libraries are not used as plugins +%{_libdir}/libXrdOfs.so %{_libdir}/libXrdServer.so -%{_libdir}/libXrdUtils.so %files client %defattr(-,root,root,-) @@ -366,6 +462,11 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Thu Jan 17 2013 Mattias Ellert - 1:3.2.7-1 +- Update to version 3.2.7 +- Split libs package into libs, client-libs and server-libs +- Split devel package into devel, client-devel and server-devel + * Fri Oct 12 2012 Mattias Ellert - 1:3.2.5-1 - Update to version 3.2.5 @@ -411,7 +512,7 @@ fi - Perl mass rebuild * Mon May 02 2011 Mattias Ellert - 1:3.0.3-2 -- Proper fix for the atomic detection om ppc - no bug in gcc after all +- Proper fix for the atomic detection on ppc - no bug in gcc after all * Sun Apr 24 2011 Mattias Ellert - 1:3.0.3-1.1 - Workaround for broken gcc on RHEL5 ppc (rhbz #699149)