[globus-usage/f19] Implement updated packaging guidelines
Mattias Ellert
ellert at fedoraproject.org
Sun Jul 28 08:13:14 UTC 2013
commit 3e72578ea3fc03205c50c2b702a0ea1af906802a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Jul 28 08:13:21 2013 +0200
Implement updated packaging guidelines
globus-usage.spec | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/globus-usage.spec b/globus-usage.spec
index a9bd376..2a70990 100644
--- a/globus-usage.spec
+++ b/globus-usage.spec
@@ -4,10 +4,12 @@
%global flavor gcc32
%endif
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: globus-usage
%global _name %(tr - _ <<< %{name})
Version: 3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Globus Toolkit - Usage Library
Group: System Environment/Libraries
@@ -21,9 +23,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-common%{?_isa} >= 14
Requires: globus-xio%{?_isa} >= 3
BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core%{?_isa} >= 8
-BuildRequires: globus-common-devel%{?_isa} >= 14
-BuildRequires: globus-xio-devel%{?_isa} >= 3
+BuildRequires: globus-core >= 8
+BuildRequires: globus-common-devel >= 14
+BuildRequires: globus-xio-devel >= 3
%package devel
Summary: Globus Toolkit - Usage Library Development Files
@@ -68,7 +70,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
@@ -86,7 +88,7 @@ find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
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
# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
@@ -96,18 +98,24 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
| sed s!^!%{_prefix}! > package-devel.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
%changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1-7
+- Implement updated packaging guidelines
+
* Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1-6
- Add aarch64 to the list of 64 bit platforms
More information about the scm-commits
mailing list