From bd9ee682996cb4a1dda3a8b262c19a076b0bf8a2 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Aug 05 2013 13:30:49 +0000 Subject: Merge branch 'f19' --- diff --git a/tigervnc.spec b/tigervnc.spec index 08e1578..5d9b439 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -220,6 +220,7 @@ popd %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{README.txt,LICENCE.TXT} pushd unix/xserver/hw/vnc make install DESTDIR=$RPM_BUILD_ROOT @@ -339,8 +340,8 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog -* Sun Aug 04 2013 Fedora Release Engineering - 1.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild +* Mon Aug 5 2013 Tim Waugh 1.3.0-4 +- Fixed doc-related build failure (bug #992790). * Wed Jul 24 2013 Tim Waugh 1.3.0-3 - Avoid PIDFile problems in systemd unit file (bug #983232).