Install docs to %{_pkgdocdir} where available (#993836).

- Fix bogus date in %changelog.
This commit is contained in:
Ville Skyttä 2013-11-09 20:42:05 +02:00
parent 17b1d41bfd
commit 5bb38d11e6

View File

@ -1,7 +1,9 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Summary: X Athena Widget Set
Name: libXaw
Version: 1.0.11
Release: 6%{?dist}
Release: 7%{?dist}
License: MIT
URL: http://www.x.org
Group: System Environment/Libraries
@ -33,7 +35,7 @@ X.Org X11 libXaw development package
autoreconf -v --install --force
export CFLAGS="$RPM_OPT_FLAGS -Os"
%configure \
--docdir=%{_docdir}/%{name}-%{version}-%{release} \
--docdir=%{_pkgdocdir} \
--disable-xaw8 --disable-static \
--disable-xaw6
make %{?_smp_mflags}
@ -42,6 +44,7 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
install -pm 644 COPYING README ChangeLog $RPM_BUILD_ROOT%{_pkgdocdir}
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
@ -52,7 +55,10 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING README ChangeLog
%dir %{_pkgdocdir}
%{_pkgdocdir}/ChangeLog
%{_pkgdocdir}/COPYING
%{_pkgdocdir}/README
%{_libdir}/libXaw.so.7
%{_libdir}/libXaw7.so.7
%{_libdir}/libXaw7.so.7.0.0
@ -60,7 +66,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/X11/Xaw
%doc COPYING
%{_includedir}/X11/Xaw/*.h
# FIXME: Is this C file really supposed to be here?
%{_includedir}/X11/Xaw/Template.c
@ -68,12 +73,15 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libXaw7.so
%{_libdir}/pkgconfig/xaw7.pc
%{_mandir}/man3/*.3*
%dir %{_docdir}/%{name}-%{version}-%{release}
%{_docdir}/%{name}-%{version}-%{release}/*.xml
#{_docdir}/%{name}-%{version}-%{release}/%{name}.html
#{_docdir}/%{name}-%{version}-%{release}/%{name}.txt
%{_pkgdocdir}/*.xml
#{_pkgdocdir}/%{name}.html
#{_pkgdocdir}/%{name}.txt
%changelog
* Sat Nov 9 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.0.11-7
- Install docs to %%{_pkgdocdir} where available (#993836).
- Fix bogus date in %%changelog.
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@ -229,7 +237,7 @@ rm -rf $RPM_BUILD_ROOT
- Add missing documentation files to doc macro
- Fix all "BuildRequires:" deps with s/xorg-x11-//g
* Wed Aug 25 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-4
* Thu Aug 25 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-4
- Added dependency on xorg-x11-libXmu-devel to devel subpackage, as libXaw
headers include libXmu headers directly which caused xkbutils to fail to
build.