[globus-gfork/f19] Implement updated packaging guidelines
Mattias Ellert
ellert at fedoraproject.org
Sun Jul 28 07:45:53 UTC 2013
commit 3323ac97579bb218ee874cfbe78c79f7bb4dd6d6
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Jul 28 08:26:24 2013 +0200
Implement updated packaging guidelines
globus-gfork.spec | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/globus-gfork.spec b/globus-gfork.spec
index 9aad2b8..d3b33b9 100644
--- a/globus-gfork.spec
+++ b/globus-gfork.spec
@@ -4,10 +4,12 @@
%global flavor gcc32
%endif
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: globus-gfork
%global _name %(tr - _ <<< %{name})
Version: 3.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Globus Toolkit - GFork
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 progs
Summary: Globus Toolkit - GFork Programs
@@ -83,7 +85,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
@@ -101,7 +103,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
# Add empty default configuration file
mkdir -p %{buildroot}%{_sysconfdir}
@@ -109,7 +111,7 @@ echo "# This is the default gfork configuration file" > \
%{buildroot}%{_sysconfdir}/gfork.conf
# Remove README.txt from main package
-rm %{buildroot}%{_docdir}/%{name}-%{version}/README.txt
+rm %{buildroot}%{_pkgdocdir}/README.txt
sed '/README.txt/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
# Generate package filelists
@@ -122,14 +124,17 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.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-progs.filelist progs
%config(noreplace) %{_sysconfdir}/gfork.conf
@@ -138,6 +143,9 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
%files -f package-devel.filelist devel
%changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-6
+- Implement updated packaging guidelines
+
* Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-5
- Add aarch64 to the list of 64 bit platforms
More information about the scm-commits
mailing list