From 4f986d9a40574c4e1746698104c7046d24c2df78 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Aug 01 2013 21:42:14 +0000 Subject: Install docs to %{_pkgdocdir} where available. --- diff --git a/alsa-tools.spec b/alsa-tools.spec index 7567b90..e122290 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -16,6 +16,8 @@ %{?!_without_firmware: %global builddirsfirmw hdsploader mixartloader usx2yloader vxloader } +%{?!_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + # Note that the Version is intended to coincide with the version of ALSA # included with the Fedora kernel, rather than necessarily the very latest # upstream version of alsa-tools @@ -23,7 +25,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.27 -Release: 2%{?dist} +Release: 3%{?dist} # Checked at least one source file from all the sub-projects contained in # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15 @@ -145,19 +147,19 @@ do esac if [[ -s "${i}"/README ]] then - if [[ ! -d "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" ]] + if [[ ! -d "%{buildroot}%{_pkgdocdir}/${i}" ]] then - mkdir -p "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" + mkdir -p "%{buildroot}%{_pkgdocdir}/${i}" fi - cp "${i}"/README "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" + cp "${i}"/README "%{buildroot}%{_pkgdocdir}/${i}" fi if [[ -s "${i}"/COPYING ]] then - if [[ ! -d "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" ]] + if [[ ! -d "%{buildroot}%{_pkgdocdir}/${i}" ]] then - mkdir -p "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" + mkdir -p "%{buildroot}%{_pkgdocdir}/${i}" fi - cp "${i}"/COPYING "%{buildroot}%{_docdir}/%{name}-%{version}/${i}" + cp "${i}"/COPYING "%{buildroot}%{_pkgdocdir}/${i}" fi if [[ -s %{buildroot}%{_datadir}/applications/${i}.desktop ]] ; then desktop-file-install --dir %{buildroot}%{_datadir}/applications \ @@ -174,17 +176,17 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %if 0%{!?_without_tools:1} %files -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/as10k1 -%doc %{_docdir}/%{name}-%{version}/echomixer -%doc %{_docdir}/%{name}-%{version}/envy24control -%doc %{_docdir}/%{name}-%{version}/hdspconf -%doc %{_docdir}/%{name}-%{version}/hdspmixer -%doc %{_docdir}/%{name}-%{version}/hwmixvolume -%doc %{_docdir}/%{name}-%{version}/rmedigicontrol -%doc %{_docdir}/%{name}-%{version}/sbiload -%doc %{_docdir}/%{name}-%{version}/hda-verb -%doc %{_docdir}/%{name}-%{version}/hdajackretask +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/as10k1 +%doc %{_pkgdocdir}/echomixer +%doc %{_pkgdocdir}/envy24control +%doc %{_pkgdocdir}/hdspconf +%doc %{_pkgdocdir}/hdspmixer +%doc %{_pkgdocdir}/hwmixvolume +%doc %{_pkgdocdir}/rmedigicontrol +%doc %{_pkgdocdir}/sbiload +%doc %{_pkgdocdir}/hda-verb +%doc %{_pkgdocdir}/hdajackretask %{_bindir}/as10k1 %{_bindir}/echomixer %{_bindir}/envy24control @@ -213,7 +215,7 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d # sb16_csp stuff which is excluded for PPCx %ifnarch ppc ppc64 -%doc %{_docdir}/%{name}-%{version}/sb16_csp +%doc %{_pkgdocdir}/sb16_csp %{_bindir}/cspctl %{_datadir}/man/man1/cspctl.1.gz %endif @@ -222,11 +224,11 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %if 0%{!?_without_firmware:1} %files firmware -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/hdsploader -%doc %{_docdir}/%{name}-%{version}/mixartloader -%doc %{_docdir}/%{name}-%{version}/usx2yloader -%doc %{_docdir}/%{name}-%{version}/vxloader +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/hdsploader +%doc %{_pkgdocdir}/mixartloader +%doc %{_pkgdocdir}/usx2yloader +%doc %{_pkgdocdir}/vxloader /lib/udev/rules.d/*.rules /lib/udev/tascam_fpga /lib/udev/tascam_fw @@ -237,6 +239,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Thu Aug 1 2013 Ville Skyttä - 1.0.27-3 +- Install docs to %%{_pkgdocdir} where available. + * Tue May 21 2013 Dan Horák - 1.0.27-2 - fix build on non-x86 arches