[globus-rsl/f19] Implement updated packaging guidelines
Mattias Ellert
ellert at fedoraproject.org
Sun Jul 28 08:09:05 UTC 2013
commit 1e8c150f8c137bd6f51fa94d41b0590b55895721
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Jul 28 08:11:32 2013 +0200
Implement updated packaging guidelines
globus-rsl.spec | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/globus-rsl.spec b/globus-rsl.spec
index 005597d..60c1f30 100644
--- a/globus-rsl.spec
+++ b/globus-rsl.spec
@@ -4,10 +4,12 @@
%global flavor gcc32
%endif
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: globus-rsl
%global _name %(tr - _ <<< %{name})
Version: 9.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Globus Toolkit - Resource Specification Language Library
Group: System Environment/Libraries
@@ -26,8 +28,8 @@ Provides: globus-rsl-assist = 3
Provides: globus-rsl-assist%{?_isa} = 3
Obsoletes: globus-rsl-assist < 3
BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core%{?_isa} >= 8
-BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-core >= 8
+BuildRequires: globus-common-devel >= 14
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -121,7 +123,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
@@ -148,7 +150,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 \
@@ -158,21 +160,27 @@ 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
%files -f package.filelist
%dir %{_datadir}/globus/packages/%{_name}
-%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 %{_pkgdocdir}/html
%changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.1-7
+- Implement updated packaging guidelines
+
* Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.1-6
- Add aarch64 to the list of 64 bit platforms
More information about the scm-commits
mailing list