[avr-libc] use unversioned docdir (#993677)
Michal Hlavinka
mhlavink at fedoraproject.org
Thu Aug 8 17:14:18 UTC 2013
commit 19b1811900d7058afb83ecaf227c77395bce01e7
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Thu Aug 8 19:14:08 2013 +0200
use unversioned docdir (#993677)
avr-libc.spec | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/avr-libc.spec b/avr-libc.spec
index 5c0f550..7e48a82 100644
--- a/avr-libc.spec
+++ b/avr-libc.spec
@@ -7,7 +7,7 @@
Name: avr-libc
Version: 1.8.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: C library for use with GCC on Atmel AVR microcontrollers
Group: Development/Tools
License: BSD
@@ -99,9 +99,12 @@ find man/ -type f -exec gzip {} \;
mv man $RPM_BUILD_ROOT%{_prefix}/avr/share
# we only want to use %doc with an absolute path to avoid rpmbuild from erasing
-# %{_docdir}/%{name}-%{version}
+# %{_docdir}/%{name}
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}
install -p -m 644 doc/TODO doc/CHANGES.old AUTHORS ChangeLog* LICENSE NEWS \
- README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+ pdf/* README $RPM_BUILD_ROOT%{_docdir}/%{name}
+mkdir $RPM_BUILD_ROOT%{_docdir}/%{name}/html
+install -p -m 644 html/%{name}-user-manual*/* $RPM_BUILD_ROOT%{_docdir}/%{name}/html
# despite us being noarch redhat-rpm-config insists on stripping our files
%define __os_install_post /usr/lib/rpm/redhat/brp-compress
@@ -116,25 +119,27 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_prefix}/avr
%dir %{_prefix}/avr/share
%doc %{_prefix}/avr/share/man
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/AUTHORS
-%doc %{_docdir}/%{name}-%{version}/C*
-%doc %{_docdir}/%{name}-%{version}/LICENSE
-%doc %{_docdir}/%{name}-%{version}/NEWS
-%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/TODO
-%doc %{_docdir}/%{name}-%{version}/examples
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/AUTHORS
+%doc %{_docdir}/%{name}/C*
+%doc %{_docdir}/%{name}/LICENSE
+%doc %{_docdir}/%{name}/NEWS
+%doc %{_docdir}/%{name}/README
+%doc %{_docdir}/%{name}/TODO
+%doc %{_docdir}/%{name}/examples
%{_prefix}/avr/include
%{_prefix}/avr/lib
%{_bindir}/avr-man
%files doc
%defattr(-,root,root,-)
-#%doc %{_docdir}/%{name}-%{version}/%{name}-user-manual-%{version}*
-%doc html/*
-%doc pdf/*
+%doc %{_docdir}/%{name}/html
+%doc %{_docdir}/%{name}/%{name}*.pdf
%changelog
+* Thu Aug 08 2013 Michal Hlavinka <mhlavink at redhat.com> - 1.8.0-7
+- use unversioned docdir (#993677)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list