[globus-gram-protocol/f19: 2/2] Implement updated packaging guidelines
Mattias Ellert
ellert at fedoraproject.org
Sun Jul 28 07:54:29 UTC 2013
commit 550363d8dc9843463e1af80932ab18e47c091f1e
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Jul 28 08:35:11 2013 +0200
Implement updated packaging guidelines
globus-gram-protocol.spec | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/globus-gram-protocol.spec b/globus-gram-protocol.spec
index b36eb4e..52f44c3 100644
--- a/globus-gram-protocol.spec
+++ b/globus-gram-protocol.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-protocol
%global _name %(tr - _ <<< %{name})
Version: 11.3
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Globus Toolkit - GRAM Protocol Library
Group: System Environment/Libraries
@@ -29,11 +31,11 @@ Requires: globus-gssapi-gsi%{?_isa} >= 10
Requires: globus-io%{?_isa} >= 8
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core%{?_isa} >= 8
-BuildRequires: globus-common-devel%{?_isa} >= 14
-BuildRequires: globus-gss-assist-devel%{?_isa} >= 8
-BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 10
-BuildRequires: globus-io-devel%{?_isa} >= 8
+BuildRequires: globus-core >= 8
+BuildRequires: globus-common-devel >= 14
+BuildRequires: globus-gss-assist-devel >= 8
+BuildRequires: globus-gssapi-gsi-devel >= 10
+BuildRequires: globus-io-devel >= 8
BuildRequires: globus-common-doc >= 14
BuildRequires: doxygen
BuildRequires: graphviz
@@ -126,7 +128,7 @@ unset GPT_LOCATION
%{_datadir}/globus/globus-bootstrap.sh
%configure --disable-static --with-flavor=%{flavor} \
- --enable-doxygen --with-docdir=%{_docdir}/%{name}-%{version}
+ --enable-doxygen --with-docdir=%{_pkgdocdir}
# Reduce overlinking
sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -156,7 +158,7 @@ grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
# Install README file
-install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
+install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
@@ -167,6 +169,9 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
| sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
+%clean
+rm -rf %{buildroot}
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -175,18 +180,21 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
%files -f package-devel.filelist devel
%files -f package-doc.filelist doc
-%dir %{_docdir}/%{name}-%{version}/html
-%dir %{_docdir}/%{name}-%{version}/perl
-%dir %{_docdir}/%{name}-%{version}/perl/Globus
-%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM
+%dir %{_pkgdocdir}/html
+%dir %{_pkgdocdir}/perl
+%dir %{_pkgdocdir}/perl/Globus
+%dir %{_pkgdocdir}/perl/Globus/GRAM
%changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 11.3-9
+- Implement updated packaging guidelines
+
* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 11.3-8
- Perl 5.18 rebuild
More information about the scm-commits
mailing list