[dcap/el5: 3/3] New upstream release

[Mattias Ellert]

commit bd77ee4d410a08a9388beb4e44a8320bd2cd2053
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Feb 10 17:24:41 2015 +0100

    New upstream release
    
    - Enable tests and add BR CUnit-devel (except EPEL 5)
    - Adapt to new license packaging guidelines

 dcap.spec |   36 +++++++++++++++++++++++-------------
 sources   |    2 +-
 2 files changed, 24 insertions(+), 14 deletions(-)
---
diff --git a/dcap.spec b/dcap.spec
index 24584e8..45edc89 100644
--- a/dcap.spec
+++ b/dcap.spec
@@ -1,6 +1,6 @@
 Name:		dcap
-Version:	2.47.8
-Release:	3%{?dist}
+Version:	2.47.9
+Release:	1%{?dist}
 Summary:	Client Tools for dCache
 
 Group:		Applications/Internet
@@ -20,6 +20,10 @@ BuildRequires:	openssl-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 6
+#		No CUnit in EPEL 5
+BuildRequires:	CUnit-devel
+%endif
 
 %description
 dCache is a distributed mass storage system.
@@ -96,7 +100,7 @@ chmod +x bootstrap.sh
 
 %configure \
     --disable-static \
-    --with-globus-include="%{_includedir}/globus -I%{_libdir}/globus/include" \
+    --with-globus-include=%{_includedir}/globus \
     --with-globus-lib=/dummy
 make %{?_smp_mflags}
 
@@ -118,24 +122,29 @@ rm -rf %{buildroot}/%{_docdir}
 %clean
 rm -rf %{buildroot}
 
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 6
+%check
+make %{?_smp_mflags} check
+%endif
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
+# Redefine license as doc for old rpm versions (EPEL 5 and 6)
+%{!?_licensedir: %global license %%doc}
+
 %files
-%defattr(-,root,root,-)
 %{_bindir}/dccp
 %{_mandir}/man1/dccp.1*
 
 %files libs
-%defattr(-,root,root,-)
 %{_libdir}/libdcap.so.*
 %{_libdir}/libpdcap.so.*
 %dir %{_libdir}/%{name}
-%doc LICENSE COPYING.LIB AUTHORS
+%license LICENSE COPYING.LIB AUTHORS
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/libdcap.so
 %{_libdir}/libpdcap.so
 %{_includedir}/dc_hack.h
@@ -143,24 +152,25 @@ rm -rf %{buildroot}
 %{_includedir}/dcap_errno.h
 
 %files tunnel-gsi
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libgsiTunnel.so
-%doc plugins/gssapi/Copyright
+%license plugins/gssapi/Copyright
 
 %files tunnel-krb
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libgssTunnel.so
-%doc plugins/gssapi/Copyright
+%license plugins/gssapi/Copyright
 
 %files tunnel-ssl
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libsslTunnel.so
 
 %files tunnel-telnet
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/libtelnetTunnel.so
 
 %changelog
+* Tue Feb 10 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.47.9-1
+- New upstream release
+- Enable tests and add BR CUnit-devel (except EPEL 5)
+- Adapt to new license packaging guidelines
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.47.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 4804dcc..c0d0c34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8dfa5b3d665a7c950050b05576c59d8e  2.47.8.tar.gz
+48a358745e9d3a01c899cf31e946d084  2.47.9.tar.gz