[globus-gridmap-verify-myproxy-callout/f19] Implement updated packaging guidelines

[Mattias Ellert]

commit 44b09ceba21b36fb57c7fbf121fefd953420c525
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 09:18:26 2013 +0200

    Implement updated packaging guidelines

 globus-gridmap-verify-myproxy-callout.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/globus-gridmap-verify-myproxy-callout.spec b/globus-gridmap-verify-myproxy-callout.spec
index 3d872c2..6a33aaf 100644
--- a/globus-gridmap-verify-myproxy-callout.spec
+++ b/globus-gridmap-verify-myproxy-callout.spec
@@ -4,10 +4,12 @@
 %global flavor gcc32
 %endif
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gridmap-verify-myproxy-callout
 %global _name %(tr - _ <<< %{name})
 Version:	1.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Globus gridmap myproxy callout
 
 Group:		System Environment/Libraries
@@ -53,7 +55,7 @@ unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
 %configure --disable-static --with-flavor=%{flavor} \
-	   --with-docdir=%{_docdir}/%{name}-%{version}
+	   --with-docdir=%{_pkgdocdir}
 
 # Reduce overlinking
 sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -78,7 +80,7 @@ grep 'lib.*\.la$' $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
 sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 
 # 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}/*.so
@@ -104,10 +106,13 @@ rm -rf %{buildroot}
 
 %files -f package.filelist
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-5
+- Implement updated packaging guidelines
+
 * Fri Jul 19 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-4
 - Remove isa from BuildRequires :-(