[globus-callout/f19] Implement updated packaging guidelines
Mattias Ellert
ellert at fedoraproject.org
Sun Jul 28 07:37:51 UTC 2013
commit 7d1e3e2ef0cd23ddf92d14089fd08e542f41f9c6
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Jul 28 06:02:19 2013 +0200
Implement updated packaging guidelines
globus-callout.spec | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/globus-callout.spec b/globus-callout.spec
index 999ad27..4fc43e6 100644
--- a/globus-callout.spec
+++ b/globus-callout.spec
@@ -4,10 +4,12 @@
%global flavor gcc32
%endif
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: globus-callout
%global _name %(tr - _ <<< %{name})
Version: 2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Globus Toolkit - Globus Callout Library
Group: System Environment/Libraries
@@ -23,10 +25,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-common%{?_isa} >= 14
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
%if %{?fedora}%{!?fedora:0} >= 4 || %{?rhel}%{!?rhel:0} >= 5
-BuildRequires: libtool-ltdl-devel%{?_isa}
+BuildRequires: libtool-ltdl-devel
%else
BuildRequires: libtool
%endif
@@ -119,7 +121,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
@@ -146,7 +148,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 \
@@ -156,21 +158,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> - 2.2-6
+- Implement updated packaging guidelines
+
* Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-5
- Add aarch64 to the list of 64 bit platforms
More information about the scm-commits
mailing list