[libexplain] Install docs into %{_pkgdocdir} (RHBZ #993957).
corsepiu
corsepiu at fedoraproject.org
Fri Dec 6 07:48:43 UTC 2013
commit 2e977db1f27d7b90b1baefd4c0218ea0952ff78b
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Fri Dec 6 08:25:48 2013 +0100
Install docs into %{_pkgdocdir} (RHBZ #993957).
- Use %configure instead of ./configure.
libexplain.spec | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
---
diff --git a/libexplain.spec b/libexplain.spec
index 4d37683..261e697 100644
--- a/libexplain.spec
+++ b/libexplain.spec
@@ -1,6 +1,6 @@
Name: libexplain
Version: 1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Library functions to explain system call errors
URL: http://libexplain.sourceforge.net
@@ -11,6 +11,8 @@ Group: System Environment/Libraries
BuildRequires: bison libcap-devel libtool groff gettext ghostscript
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
%description
The libexplain project provides a library which may be used to explain
Unix and Linux system call errors. This will make your application's
@@ -66,13 +68,18 @@ do
sed -i "s/\([ \t]\)$t\([ \t]\)/\1/g" Makefile.in
done
+# Propagate %%{_pkgdocdir} into Makefile.in
+case "%{_pkgdocdir}" in
+*/libexplain-%{version} )
+ sed -i "s,\$(datarootdir)/doc/libexplain,\$(datarootdir)/doc/libexplain-%{version}," Makefile.in
+ ;;
+esac
+
+
%build
-./configure --disable-static \
- --prefix=%{_prefix} \
- --libdir=%{_libdir}
-
-make CFLAGS="%{optflags}" \
- %{?_smp_mflags}
+%configure --disable-static
+
+make %{?_smp_mflags}
%check
make check
@@ -86,9 +93,8 @@ chmod 755 %{buildroot}%{_libdir}/%{name}.so.*.*.*
# Get rid of the static library and libtool archives
rm %{buildroot}%{_libdir}/%{name}.{a,la}
-# Move docs into versioned doc dir
-mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
-mv %{buildroot}%{_docdir}/%{name}/*.pdf %{buildroot}%{_docdir}/%{name}-%{version}/
+# Add files to docs
+install -m 0664 README LICENSE %{buildroot}%{_pkgdocdir}
%post -p /sbin/ldconfig
@@ -96,9 +102,11 @@ mv %{buildroot}%{_docdir}/%{name}/*.pdf %{buildroot}%{_docdir}/%{name}-%{version
%files
%{_libdir}/%{name}.so.*
-%doc README LICENSE
-%doc %{_docdir}/%{name}-%{version}/readme.pdf
-%doc %{_docdir}/%{name}-%{version}/reference.pdf
+%dir %doc %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/LICENSE
+%doc %{_pkgdocdir}/readme.pdf
+%doc %{_pkgdocdir}/reference.pdf
%files -n explain
%{_bindir}/explain
@@ -109,13 +117,18 @@ mv %{buildroot}%{_docdir}/%{name}/*.pdf %{buildroot}%{_docdir}/%{name}-%{version
%{_includedir}/%{name}/
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
-%doc %{_docdir}/%{name}-%{version}/building.pdf
-%doc %{_docdir}/%{name}-%{version}/new_system_call.pdf
+%dir %doc %{_pkgdocdir}
+%doc %{_pkgdocdir}/building.pdf
+%doc %{_pkgdocdir}/new_system_call.pdf
# NOTE rpmlint will complain about a use of mktemp. This is because libexplain
# provides a wrapper for mktemp, not because it is used.
%changelog
+* Fri Dec 06 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.2-3
+- Install docs into %%{_pkgdocdir} (RHBZ #993957).
+- Use %%configure instead of ./configure.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list