[globus-openssl-module/f19: 2/2] Implement updated packaging guidelines
Mattias Ellert
ellert at fedoraproject.org
Sun Jul 28 08:05:30 UTC 2013
commit 226bbf943a753b6f2120906d0c1fd88f0e263f77
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Jul 28 05:28:54 2013 +0200
Implement updated packaging guidelines
globus-openssl-module.spec | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/globus-openssl-module.spec b/globus-openssl-module.spec
index aeb125f..ae54c7a 100644
--- a/globus-openssl-module.spec
+++ b/globus-openssl-module.spec
@@ -4,10 +4,12 @@
%global flavor gcc32
%endif
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: globus-openssl-module
%global _name %(tr - _ <<< %{name})
Version: 3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Globus Toolkit - Globus OpenSSL Module Wrapper
Group: System Environment/Libraries
@@ -25,11 +27,11 @@ Requires: globus-gsi-proxy-ssl%{?_isa} >= 4
Requires: globus-common%{?_isa} >= 14
Requires: globus-gsi-openssl-error%{?_isa} >= 2
BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core%{?_isa} >= 8
-BuildRequires: globus-gsi-proxy-ssl-devel%{?_isa} >= 4
-BuildRequires: globus-common-devel%{?_isa} >= 14
-BuildRequires: globus-gsi-openssl-error-devel%{?_isa} >= 2
-BuildRequires: openssl-devel%{?_isa}
+BuildRequires: globus-core >= 8
+BuildRequires: globus-gsi-proxy-ssl-devel >= 4
+BuildRequires: globus-common-devel >= 14
+BuildRequires: globus-gsi-openssl-error-devel >= 2
+BuildRequires: openssl-devel
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -136,7 +138,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
@@ -172,7 +174,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 \
@@ -184,23 +186,29 @@ 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-progs.filelist progs
%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> - 3.2-7
+- Implement updated packaging guidelines
+
* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 3.2-6
- Perl 5.18 rebuild
More information about the scm-commits
mailing list