[globus-gram-job-manager-lsf/f19] Implement updated packaging guidelines

[Mattias Ellert]

commit 964e2bd88a106cf7380a2994e41d232954ce9543
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 09:12:58 2013 +0200

    Implement updated packaging guidelines

 globus-gram-job-manager-lsf.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/globus-gram-job-manager-lsf.spec b/globus-gram-job-manager-lsf.spec
index 09cf667..a86ee2f 100644
--- a/globus-gram-job-manager-lsf.spec
+++ b/globus-gram-job-manager-lsf.spec
@@ -6,10 +6,12 @@
 
 %{!?perl_vendorlib: %global perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gram-job-manager-lsf
 %global _name %(tr - _ <<< %{name})
 Version:	1.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - LSF Job Manager Support
 
 Group:		Applications/Internet
@@ -110,7 +112,7 @@ unset GPT_LOCATION
 export MPIEXEC=no
 export MPIRUN=no
 %configure --disable-static --with-flavor=%{flavor} \
-	   --with-docdir=%{_docdir}/%{name}-%{version} \
+	   --with-docdir=%{_pkgdocdir} \
 	   --with-globus-state-dir=%{_localstatedir}/lib/globus
 
 # Reduce overlinking
@@ -139,7 +141,7 @@ sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 rm %{buildroot}/etc/grid-services/jobmanager-lsf
 
 # Install README file
-install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
+install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 
 # Devel package is redundant
 rm %{buildroot}%{_libdir}/libglobus_seg_lsf.so
@@ -187,8 +189,8 @@ fi
 %{perl_vendorlib}/Globus
 %config(noreplace) %{_sysconfdir}/globus/globus-lsf.conf
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
 
 %files setup-poll
 %config(noreplace) %{_sysconfdir}/grid-services/available/jobmanager-lsf-poll
@@ -198,6 +200,9 @@ fi
 %config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/lsf
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1-4
+- Implement updated packaging guidelines
+
 * Fri Jul 19 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1-3
 - Remove isa from BuildRequires :-(