[voms/el5] Rebuild for gsoap 2.8.21 (Fedora 22)

[Mattias Ellert]

commit 387bfdbe4009bb3adce0c669ab3726abb7e09fa5
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Wed Jan 21 10:34:45 2015 +0100

    Rebuild for gsoap 2.8.21 (Fedora 22)
    
    - Implement updated license packaging guidelines

 voms.spec |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/voms.spec b/voms.spec
index 98f34cb..6cba628 100644
--- a/voms.spec
+++ b/voms.spec
@@ -4,7 +4,7 @@
 
 Name:		voms
 Version:	2.0.12
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Virtual Organization Membership Service
 
 Group:		System Environment/Libraries
@@ -131,7 +131,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 echo VOMS_USER=voms > %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
 mkdir -p %{buildroot}%{_pkgdocdir}
-install -m 644 -p AUTHORS LICENSE README.md %{buildroot}%{_pkgdocdir}
+install -m 644 -p AUTHORS README.md %{buildroot}%{_pkgdocdir}
+%{!?_licensedir: install -m 644 -p LICENSE %{buildroot}%{_pkgdocdir}}
 
 mkdir -p %{buildroot}%{_pkgdocdir}/VOMS_C_API
 cp -pr doc/apidoc/api/VOMS_C_API/html %{buildroot}%{_pkgdocdir}/VOMS_C_API
@@ -142,7 +143,7 @@ cp -pr doc/apidoc/api/VOMS_CC_API/html %{buildroot}%{_pkgdocdir}/VOMS_CC_API
 rm -f %{buildroot}%{_pkgdocdir}/VOMS_CC_API/html/installdox
 
 for b in voms-proxy-init voms-proxy-info voms-proxy-destroy; do
-  ## Rename client binaries 
+  ## Rename client binaries
   mv %{buildroot}%{_bindir}/${b} %{buildroot}%{_bindir}/${b}2
   touch %{buildroot}/%{_bindir}/${b}
   chmod 755 %{buildroot}/%{_bindir}/${b}
@@ -230,8 +231,9 @@ fi
 %{_datadir}/%{name}/vomses.template
 %doc %dir %{_pkgdocdir}
 %doc %{_pkgdocdir}/AUTHORS
-%doc %{_pkgdocdir}/LICENSE
 %doc %{_pkgdocdir}/README.md
+%{!?_licensedir: %doc %{_pkgdocdir}/LICENSE}
+%{?_licensedir: %license LICENSE}
 
 %files devel
 %{_libdir}/libvomsapi.so
@@ -242,9 +244,10 @@ fi
 
 %files doc
 %doc %{_pkgdocdir}/AUTHORS
-%doc %{_pkgdocdir}/LICENSE
 %doc %{_pkgdocdir}/VOMS_C_API
 %doc %{_pkgdocdir}/VOMS_CC_API
+%{!?_licensedir: %doc %{_pkgdocdir}/LICENSE}
+%{?_licensedir: %license LICENSE}
 
 %files clients
 %{_bindir}/voms-proxy-destroy2
@@ -282,6 +285,10 @@ fi
 %doc README.Fedora
 
 %changelog
+* Wed Jan 21 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.12-2
+- Rebuild for gsoap 2.8.21 (Fedora 22)
+- Implement updated license packaging guidelines
+
 * Mon Nov 17 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.12-1
 - Update to version 2.0.12
 - Drop patches voms-gsoap.patch, voms-sha2-proxy.patch and voms-strndup.patch
@@ -505,7 +512,7 @@ fi
 - Make conditinal dependency on expat-devel (OpenSuSE 10.20 has only expat)
 
 * Thu Jul 05 2007 Anders Wäänänen <waananen at nbi.dk> - 1.7.20-1ng
-- Upstream 1.7.20 (CVS tag glite-security-voms_R_1_7_20_1) 
+- Upstream 1.7.20 (CVS tag glite-security-voms_R_1_7_20_1)
 
 * Thu Jul 05 2007 Anders Wäänänen <waananen at nbi.dk> - 1.7.19-2ng
 - Added patches:
@@ -516,7 +523,7 @@ fi
 - Added openssl-devel build dependency
 
 * Fri Jun 22 2007 Anders Wäänänen <waananen at nbi.dk> - 1.7.19-1ng
-- Upstream 1.7.19 (CVS tag glite-security-voms_R_1_7_19_P2) 
+- Upstream 1.7.19 (CVS tag glite-security-voms_R_1_7_19_P2)
 - Remove patches (use shell substitutions instead)
 - Disable Java API build