From a5b3bdc30c2478fce22d8b5c5f10cc110fd4aeff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 2 Dec 2013 18:28:36 +0200 Subject: [PATCH] Install docs to %{_pkgdocdir} where available (#993878). --- xorg-x11-xtrans-devel.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/xorg-x11-xtrans-devel.spec b/xorg-x11-xtrans-devel.spec index a625873..bb2e6a2 100644 --- a/xorg-x11-xtrans-devel.spec +++ b/xorg-x11-xtrans-devel.spec @@ -1,3 +1,5 @@ +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + # NOTE: This package contains only C source and header files and pkg-config # *.pc files, and does not contain any ELF binaries or DSOs, so we disable # debuginfo generation. @@ -6,7 +8,7 @@ Summary: X.Org X11 developmental X transport library Name: xorg-x11-xtrans-devel Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -31,16 +33,16 @@ X.Org X11 developmental X transport library %build autoreconf -vif # yes, this looks horrible, but it's to get the .pc file in datadir -%configure --libdir=%{_datadir} \ - --docdir=%{_docdir}/%{name}-%{version}-%{release} +%configure --libdir=%{_datadir} --docdir=%{_pkgdocdir} # Running 'make' not needed. %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +install -pm 644 AUTHORS ChangeLog COPYING README $RPM_BUILD_ROOT%{_pkgdocdir} %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README +%{_pkgdocdir} %dir %{_includedir}/X11 %dir %{_includedir}/X11/Xtrans %{_includedir}/X11/Xtrans/Xtrans.c @@ -52,10 +54,11 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %{_includedir}/X11/Xtrans/transport.c %{_datadir}/aclocal/xtrans.m4 %{_datadir}/pkgconfig/xtrans.pc -%dir %{_docdir}/%{name}-%{version}-%{release} -%{_docdir}/%{name}-%{version}-%{release}/xtrans.xml %changelog +* Mon Dec 2 2013 Ville Skyttä - 1.3.2-2 +- Install docs to %%{_pkgdocdir} where available (#993878). + * Mon Nov 18 2013 Dave Airlie 1.3.2-1 - xtrans 1.3.2