[xrootd/f16: 3/3] Update to version 3.1.1
Mattias Ellert
ellert at fedoraproject.org
Sat Mar 17 17:16:43 UTC 2012
commit b42968e3ad24473219c54f1bc5493259a0b397d2
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Mar 17 18:14:37 2012 +0100
Update to version 3.1.1
sources | 2 +-
xrootd-bonjour.patch | 147 --------
xrootd-circular-deps.patch | 803 ------------------------------------------
xrootd-dso.patch | 834 --------------------------------------------
xrootd-gridsite.patch | 123 -------
xrootd-headers.patch | 319 -----------------
xrootd-init.patch | 50 +---
xrootd-java.patch | 207 +++++++++++
xrootd-jni.patch | 25 --
xrootd-nsl-link.patch | 14 -
xrootd-perl-java.patch | 46 ---
xrootd-perl.patch | 32 ++
xrootd-undef.patch | 109 ------
xrootd-xmi.patch | 46 ---
xrootd.spec | 135 ++------
15 files changed, 280 insertions(+), 2612 deletions(-)
---
diff --git a/sources b/sources
index 597445e..97ac3b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4b084a994363186629eefe8e102668f xrootd-3.0.5.tar.gz
+6466b12a99aed3f8ea0b56b5b3ace093 xrootd-3.1.1.tar.gz
diff --git a/xrootd-init.patch b/xrootd-init.patch
index f232a95..2d42c23 100644
--- a/xrootd-init.patch
+++ b/xrootd-init.patch
@@ -1,54 +1,16 @@
-diff -ur xrootd-3.0.3.orig/packaging/rhel/xrootd.functions xrootd-3.0.3/packaging/rhel/xrootd.functions
---- xrootd-3.0.3.orig/packaging/rhel/xrootd.functions 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/packaging/rhel/xrootd.functions 2011-04-23 06:58:54.770444143 +0200
+diff -ur xrootd-3.1.1.orig/packaging/rhel/xrootd.functions xrootd-3.1.1/packaging/rhel/xrootd.functions
+--- xrootd-3.1.1.orig/packaging/rhel/xrootd.functions 2012-03-05 18:19:18.000000000 +0100
++++ xrootd-3.1.1/packaging/rhel/xrootd.functions 2012-03-13 18:56:33.806739068 +0100
@@ -1,4 +1,3 @@
-#!/bin/sh
#-------------------------------------------------------------------------------
# Library for handling xrootd daemons on RHEL
# Author: Lukasz Janyst <ljanyst at cern.ch> (09.03.2011)
-@@ -20,9 +19,6 @@
-
- chown $XROOTD_USER:$XROOTD_GROUP -R /var/spool/xrootd
- chown $XROOTD_USER:$XROOTD_GROUP -R /var/log/xrootd
-- chown $XROOTD_USER:$XROOTD_GROUP -R /var/run/xrootd
-- chown $XROOTD_USER:$XROOTD_GROUP -R /etc/xrootd
-- chown $XROOTD_USER:$XROOTD_GROUP /etc/sysconfig/xrootd
- }
-
- #-------------------------------------------------------------------------------
-@@ -96,6 +92,8 @@
- chown $XROOTD_USER:$XROOTD_GROUP -R /var/spool/xrootd
- fi
-
-+ mkdir -p /var/run/xrootd
-+ chown $XROOTD_USER:$XROOTD_GROUP
- checkDirectory /var/run/xrootd $XROOTD_USER $XROOTD_GROUP
- if test $? -ne 0; then
- chown $XROOTD_USER:$XROOTD_GROUP -R /var/run/xrootd
-diff -ur xrootd-3.0.3.orig/packaging/rhel/xrootd.functions-slc4 xrootd-3.0.3/packaging/rhel/xrootd.functions-slc4
---- xrootd-3.0.3.orig/packaging/rhel/xrootd.functions-slc4 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/packaging/rhel/xrootd.functions-slc4 2011-04-23 06:59:27.871088146 +0200
+diff -ur xrootd-3.1.1.orig/packaging/rhel/xrootd.functions-slc4 xrootd-3.1.1/packaging/rhel/xrootd.functions-slc4
+--- xrootd-3.1.1.orig/packaging/rhel/xrootd.functions-slc4 2012-03-05 18:19:18.000000000 +0100
++++ xrootd-3.1.1/packaging/rhel/xrootd.functions-slc4 2012-03-13 18:56:40.030739217 +0100
@@ -1,4 +1,3 @@
-#!/bin/sh
#-------------------------------------------------------------------------------
# Library for handling xrootd daemons on antique RHEL
# Author: Lukasz Janyst <ljanyst at cern.ch> (18.03.2011)
-@@ -20,9 +19,6 @@
-
- chown $XROOTD_USER:$XROOTD_GROUP -R /var/spool/xrootd
- chown $XROOTD_USER:$XROOTD_GROUP -R /var/log/xrootd
-- chown $XROOTD_USER:$XROOTD_GROUP -R /var/run/xrootd
-- chown $XROOTD_USER:$XROOTD_GROUP -R /etc/xrootd
-- chown $XROOTD_USER:$XROOTD_GROUP /etc/sysconfig/xrootd
- }
-
- #-------------------------------------------------------------------------------
-@@ -96,6 +92,8 @@
- chown $XROOTD_USER:$XROOTD_GROUP -R /var/spool/xrootd
- fi
-
-+ mkdir -p /var/run/xrootd
-+ chown $XROOTD_USER:$XROOTD_GROUP
- checkDirectory /var/run/xrootd $XROOTD_USER $XROOTD_GROUP
- if test $? -ne 0; then
- chown $XROOTD_USER:$XROOTD_GROUP -R /var/run/xrootd
diff --git a/xrootd-java.patch b/xrootd-java.patch
new file mode 100644
index 0000000..fe95e72
--- /dev/null
+++ b/xrootd-java.patch
@@ -0,0 +1,207 @@
+diff -ur xrootd-3.1.1.orig/src/XrdClient/XrdClientAdminJNI.cc xrootd-3.1.1/src/XrdClient/XrdClientAdminJNI.cc
+--- xrootd-3.1.1.orig/src/XrdClient/XrdClientAdminJNI.cc 2012-03-05 18:19:18.000000000 +0100
++++ xrootd-3.1.1/src/XrdClient/XrdClientAdminJNI.cc 2012-03-17 17:11:29.546253549 +0100
+@@ -9,7 +9,7 @@
+ #define DBGLVL 3
+ #define SETDEBUG EnvPutInt("DebugLevel", DBGLVL);
+
+-extern "C" JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_locate(JNIEnv *env,
++extern "C" JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_locate(JNIEnv *env,
+ jobject jobj,
+ jstring pathfile,
+ jstring hostname) {
+@@ -36,7 +36,7 @@
+
+ // Now we get the filename passed as parameter.
+ kXR_char *filename = (kXR_char *)env->GetStringUTFChars(pathfile, 0);
+- XrdClientUrlInfo finalloc;
++ XrdClientLocate_Info finalloc;
+
+ // Hence we locate that file
+ // the answer is in finalloc
+@@ -49,13 +49,15 @@
+
+ delete xrda;
+
+- if (r)
+- hostname = env->NewStringUTF(finalloc.Host.c_str());
++ if (r) {
++ XrdClientUrlInfo url((const char *)finalloc.Location);
++ hostname = env->NewStringUTF(url.Host.c_str());
++ }
+
+ return (jobject)(new jboolean(r));
+ }
+
+-extern "C" JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_stat(JNIEnv *env,
++extern "C" JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_stat(JNIEnv *env,
+ jobject jobj,
+ jstring pathfile,
+ jint id,
+@@ -112,7 +114,7 @@
+
+ }
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_chmod(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_chmod(JNIEnv *env,
+ jobject jobj,
+ jstring pathfile,
+ jint user,
+@@ -159,7 +161,7 @@
+ }
+
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_dirlist(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_dirlist(JNIEnv *env,
+ jobject jobj,
+ jstring path,
+ jobjectArray result) {
+@@ -215,7 +217,7 @@
+
+ }
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_existfiles(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_existfiles(JNIEnv *env,
+ jobject jobj,
+ jobjectArray filez,
+ jobjectArray xstfilez) {
+@@ -286,7 +288,7 @@
+ }
+
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_existdirs(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_existdirs(JNIEnv *env,
+ jobject jobj,
+ jobjectArray dirz,
+ jobjectArray xstdirz) {
+@@ -356,7 +358,7 @@
+
+ }
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_getchecksum(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_getchecksum(JNIEnv *env,
+ jobject jobj,
+ jstring pathfile,
+ jstring chksum) {
+@@ -406,7 +408,7 @@
+
+ }
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_isfileonline(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_isfileonline(JNIEnv *env,
+ jobject jobj,
+ jobjectArray filez,
+ jobjectArray flzonline) {
+@@ -477,7 +479,7 @@
+
+
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_mv(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_mv(JNIEnv *env,
+ jobject jobj,
+ jstring pathname1,
+ jstring pathname2) {
+@@ -526,7 +528,7 @@
+
+
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_mkdir(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_mkdir(JNIEnv *env,
+ jobject jobj,
+ jstring pathname,
+ jint user, jint group, jint other) {
+@@ -576,7 +578,7 @@
+
+
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_rm(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_rm(JNIEnv *env,
+ jobject jobj,
+ jstring fname) {
+
+@@ -626,7 +628,7 @@
+
+
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_rmdir(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_rmdir(JNIEnv *env,
+ jobject jobj,
+ jstring pathname) {
+
+@@ -669,7 +671,7 @@
+
+ }
+
+-JNIEXPORT jobject JNICALL Java_XrdClientAdminJNI_prepare(JNIEnv *env,
++JNIEXPORT jobject JNICALL Java_xrootdadmin_XrdClientAdminJNI_prepare(JNIEnv *env,
+ jobject jobj,
+ jobjectArray filez,
+ jchar opts, jchar prio) {
+diff -ur xrootd-3.1.1.orig/src/XrdClient.cmake xrootd-3.1.1/src/XrdClient.cmake
+--- xrootd-3.1.1.orig/src/XrdClient.cmake 2012-03-05 18:19:18.000000000 +0100
++++ xrootd-3.1.1/src/XrdClient.cmake 2012-03-17 18:00:44.935292947 +0100
+@@ -178,6 +178,43 @@
+ endif()
+
+ #-------------------------------------------------------------------------------
++# java bindings
++#-------------------------------------------------------------------------------
++if( BUILD_JAVA )
++ include_directories( ${JAVA_HOME}/include ${JAVA_HOME}/include/linux )
++
++ add_library(
++ XrdClientAdminJNI
++ MODULE
++ XrdClient/XrdClientAdminJNI.cc )
++
++ target_link_libraries(
++ XrdClientAdminJNI
++ XrdClient
++ XrdUtils
++ pthread)
++
++ set_target_properties(
++ XrdClientAdminJNI
++ PROPERTIES
++ LINK_INTERFACE_LIBRARIES "" )
++
++ add_custom_command(
++ OUTPUT XrdClientAdminJNI.jar
++ COMMAND
++ ${JAVA_HOME}/bin/javac -d . ${CMAKE_SOURCE_DIR}/src/XrdClient/XrdClientAdminJNI.java
++ COMMAND
++ ${JAVA_HOME}/bin/jar cvf XrdClientAdminJNI.jar xrootdadmin/XrdClientAdminJNI.class
++ MAIN_DEPENDENCY XrdClient/XrdClientAdminJNI.java )
++
++ add_custom_target(
++ jar ALL
++ DEPENDS XrdClientAdminJNI.jar
++ )
++
++endif()
++
++#-------------------------------------------------------------------------------
+ # Install
+ #-------------------------------------------------------------------------------
+ install(
+@@ -215,6 +252,20 @@
+ DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ endif()
+
++#-------------------------------------------------------------------------------
++# Install the java bindings
++#-------------------------------------------------------------------------------
++if( BUILD_JAVA )
++ install(
++ TARGETS XrdClientAdminJNI
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
++
++ install(
++ FILES
++ ${PROJECT_BINARY_DIR}/src/XrdClientAdminJNI.jar
++ DESTINATION ${CMAKE_INSTALL_LIBDIR} )
++endif()
++
+ # FIXME: files
+ #-rw-r--r-- 1 ljanyst ljanyst 1643 2011-03-21 16:13 TestXrdClient.cc
+ #-rw-r--r-- 1 ljanyst ljanyst 20576 2011-03-21 16:13 TestXrdClient_read.cc
diff --git a/xrootd-perl.patch b/xrootd-perl.patch
new file mode 100644
index 0000000..b9a021a
--- /dev/null
+++ b/xrootd-perl.patch
@@ -0,0 +1,32 @@
+diff -ur xrootd-3.1.1.orig/src/XrdClient.cmake xrootd-3.1.1/src/XrdClient.cmake
+--- xrootd-3.1.1.orig/src/XrdClient.cmake 2012-03-05 18:19:18.000000000 +0100
++++ xrootd-3.1.1/src/XrdClient.cmake 2012-03-13 06:34:04.356120842 +0100
+@@ -7,9 +7,6 @@
+ set( XRD_CLIENT_VERSION 0.1.0 )
+ set( XRD_CLIENT_SOVERSION 0 )
+
+-set( XRD_CLIENT_ADMIN_VERSION 0.0.1 )
+-set( XRD_CLIENT_ADMIN_SOVERSION 0 )
+-
+ #-------------------------------------------------------------------------------
+ # The XrdClient lib
+ #-------------------------------------------------------------------------------
+@@ -157,7 +154,7 @@
+
+ add_library(
+ XrdClientAdmin
+- SHARED
++ MODULE
+ XrdClientAdmin_c_wrap.cc
+ XrdClient/XrdClientAdmin_c.cc XrdClient/XrdClientAdmin_c.hh )
+
+@@ -171,8 +168,7 @@
+ set_target_properties(
+ XrdClientAdmin
+ PROPERTIES
+- VERSION ${XRD_CLIENT_ADMIN_VERSION}
+- SOVERSION ${XRD_CLIENT_ADMIN_SOVERSION}
++ PREFIX ""
+ LINK_INTERFACE_LIBRARIES "" )
+
+ endif()
diff --git a/xrootd.spec b/xrootd.spec
index b7a0fa5..2a92310 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -4,45 +4,29 @@
Name: xrootd
Epoch: 1
-Version: 3.0.5
-Release: 3%{?dist}
+Version: 3.1.1
+Release: 1%{?dist}
Summary: Extended ROOT file server
Group: System Environment/Daemons
-# Sources are BSD, man pages are LGPLv2+
-License: BSD and LGPLv2+
+License: BSD
URL: http://xrootd.org/
Source0: http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.logrotate
-Patch0: %{name}-jni.patch
-Patch1: %{name}-perl-java.patch
-Patch2: %{name}-circular-deps.patch
-Patch3: %{name}-dso.patch
-Patch4: %{name}-undef.patch
-Patch5: %{name}-nsl-link.patch
-Patch6: %{name}-bonjour.patch
-Patch7: %{name}-headers.patch
-Patch8: %{name}-gridsite.patch
-Patch9: %{name}-cryptoload.patch
-Patch10: %{name}-xmi.patch
-Patch11: %{name}-init.patch
+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: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: cmake
BuildRequires: krb5-devel
BuildRequires: openssl-devel
-BuildRequires: gridsite-devel
BuildRequires: ncurses-devel
BuildRequires: readline-devel
%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5
BuildRequires: fuse-devel
%endif
-%if %{?fedora}%{!?fedora:0} >= 6 || %{?rhel}%{!?rhel:0} >= 5
-BuildRequires: avahi-compat-libdns_sd-devel
-BuildRequires: avahi-devel
-%endif
BuildRequires: libxml2-devel
BuildRequires: perl(ExtUtils::Embed)
BuildRequires: java-devel
@@ -151,80 +135,34 @@ This package contains the API documentation of the xrootd libraries.
%prep
%setup -q
-# Resolve libXrdNetUtil → libXrdOuc → libXrdNet circular dependencies
-mkdir src/XrdNetUtil
-mv src/XrdNet/XrdNetDNS.cc src/XrdNetUtil
-cp -p src/XrdNet/Makefile.am src/XrdNetUtil
-
-# Resolve libXrdFrm → libXrdOss → XrdFrm utilities circular dependencies
-mv src/XrdFrm src/XrdFrmUtil
-mkdir src/XrdFrm
-for f in XrdFrmCID XrdFrmProxy XrdFrmReqAgent XrdFrmReqFile XrdFrmRequest \
- XrdFrmTrace XrdFrmUtils XrdFrmXAttr XrdFrmXLock ; do
- mv src/XrdFrmUtil/$f.* src/XrdFrm
-done
-cp -p src/XrdFrmUtil/Makefile.am src/XrdFrm
-
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-
-# Turn off static linking
-find . -name Makefile.am -exec sed -e 's/ -static//g' -i {} ';'
-
-# Remove windows pthreads (not used, and has different license - GPL)
-rm -rf pthreads-win32
-
-# Remove bundled gridsite library
-for f in grst_asn1.c grst_err.c grst_gacl.c grst_http.c grst_x509.c \
- grst_xacml.c gridsite.h ; do
- rm -rf src/XrdSecssl/libsslGridSite/$f
-done
# Use absolute path to load JNI library
sed 's!loadLibrary("\(.*\)")!load("%{_libdir}/%{name}/lib\1.so")!' \
-i src/XrdClient/XrdClientAdminJNI.java
-# Fix JNI interface namespace
-sed 's!Java_XrdClientAdminJNI!Java_xrootdadmin_XrdClientAdminJNI!' \
- -i src/XrdClient/XrdClientAdminJNI.cc
-
-./bootstrap.sh
-
%build
-%configure --enable-gsi --enable-mon --enable-doc \
-%if %{?fedora}%{!?fedora:0} <= 11 && %{?rhel}%{!?rhel:0} <= 5
- --enable-krb4 \
-%else
- --disable-krb4 \
-%endif
- --enable-krb5 --with-krb5-incdir=/usr/include \
- --enable-javaint --with-java-home=/usr/lib/jvm/java --disable-static
+mkdir build
+pushd build
+
+%cmake -DBUILD_JAVA:BOOL=ON -DJAVA_HOME:PATH=/usr/lib/jvm/java ..
make %{?_smp_mflags}
-pushd src/XrdClient
-jar cvf XrdClientAdminJNI.jar xrootdadmin/XrdClientAdminJNI.class
popd
+doxygen Doxyfile
+
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-# Remove libtool archives
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+pushd build
+
+make install DESTDIR=$RPM_BUILD_ROOT
# Remove some junk
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
-rm -rf $RPM_BUILD_ROOT%{_bindir}/xrootdutils
%if %{?fedora}%{!?fedora:0} < 7 && %{?rhel}%{!?rhel:0} < 5
rm $RPM_BUILD_ROOT%{_bindir}/xrootdfs
rm $RPM_BUILD_ROOT%{_mandir}/man1/xrootdfs.1
@@ -240,10 +178,11 @@ mv $RPM_BUILD_ROOT/%{_libdir}/XrdClientAdmin.so \
# Java JNI
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mv $RPM_BUILD_ROOT/%{_libdir}/libXrdClientAdminJNI.so \
- $RPM_BUILD_ROOT%{_libdir}/%{name}
-install -m 644 src/XrdClient/XrdClientAdminJNI.jar \
+ $RPM_BUILD_ROOT/%{_libdir}/XrdClientAdminJNI.jar \
$RPM_BUILD_ROOT%{_libdir}/%{name}
+popd
+
# Service start-up scripts et al.
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@@ -279,6 +218,8 @@ install -m 644 packaging/common/%{name}-clustered.cfg \
install -m 644 packaging/common/%{name}-standalone.cfg \
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}-standalone.cfg
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/XrdCmsNotify.pm
+
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name}
@@ -306,7 +247,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -s /sbin/nologin \
/sbin/chkconfig --del olbd >/dev/null 2>&1 || :
%post
-if [ $1 = 1 ]; then
+if [ $1 -eq 1 ]; then
/sbin/chkconfig --add %{name}
/sbin/chkconfig --add cmsd
/sbin/chkconfig --add frm_purged
@@ -314,7 +255,7 @@ if [ $1 = 1 ]; then
fi
%preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
/sbin/service %{name} stop >/dev/null 2>&1 || :
/sbin/service cmsd stop >/dev/null 2>&1 || :
/sbin/service frm_purged stop >/dev/null 2>&1 || :
@@ -342,8 +283,6 @@ fi
%{_bindir}/mpxstats
%{_bindir}/wait41
%{_bindir}/XrdCnsd
-%{_bindir}/xrdmonAdmin
-%{_bindir}/xrdmonCollector
%{_bindir}/xrdpwdadmin
%{_bindir}/xrdsssadmin
%{_bindir}/%{name}
@@ -358,6 +297,7 @@ fi
%{_mandir}/man8/xrdpwdadmin.8*
%{_mandir}/man8/xrdsssadmin.8*
%{_mandir}/man8/%{name}.8*
+%{_datadir}/%{name}
%{_initrddir}/*
%config(noreplace) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -373,16 +313,13 @@ fi
%{_libdir}/libXrdCryptossl.so
%{_libdir}/libXrdPosixPreload.so
%{_libdir}/libXrdPss.so
-%{_libdir}/libXrdRootd.so
%{_libdir}/libXrdSec.so
%{_libdir}/libXrdSecgsi.so
-%{_libdir}/libXrdSecgsiGMAPLADP.so
-%if %{?fedora}%{!?fedora:0} <= 11 && %{?rhel}%{!?rhel:0} <= 5
-%{_libdir}/libXrdSeckrb4.so
-%endif
+%{_libdir}/libXrdSecgsiAuthzVO.so
+%{_libdir}/libXrdSecgsiGMAPDN.so
+%{_libdir}/libXrdSecgsiGMAPLDAP.so
%{_libdir}/libXrdSeckrb5.so
%{_libdir}/libXrdSecpwd.so
-%{_libdir}/libXrdSecssl.so
%{_libdir}/libXrdSecsss.so
%{_libdir}/libXrdSecunix.so
@@ -390,22 +327,15 @@ fi
%defattr(-,root,root,-)
%{_includedir}/%{name}
# These libraries are not used as plugins
-%{_libdir}/libXrd.so
-%{_libdir}/libXrdAcc.so
%{_libdir}/libXrdClient.so
-%{_libdir}/libXrdCms.so
%{_libdir}/libXrdCrypto.so
%{_libdir}/libXrdCryptoLite.so
%{_libdir}/libXrdFfs.so
-%{_libdir}/libXrdFrm.so
-%{_libdir}/libXrdNet.so
-%{_libdir}/libXrdNetUtil.so
+%{_libdir}/libXrdMain.so
%{_libdir}/libXrdOfs.so
-%{_libdir}/libXrdOss.so
-%{_libdir}/libXrdOuc.so
%{_libdir}/libXrdPosix.so
-%{_libdir}/libXrdSut.so
-%{_libdir}/libXrdSys.so
+%{_libdir}/libXrdServer.so
+%{_libdir}/libXrdUtils.so
%files client
%defattr(-,root,root,-)
@@ -443,6 +373,9 @@ fi
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Sat Mar 17 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1:3.1.1-1
+- Update to version 3.1.1
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.5-3
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list