Merge branch 'f19'

This commit is contained in:
Tim Waugh 2013-08-05 14:30:49 +01:00
commit bd9ee68299

View File

@ -220,6 +220,7 @@ popd
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$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 pushd unix/xserver/hw/vnc
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
@ -339,8 +340,8 @@ fi
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/*
%changelog %changelog
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0-4 * Mon Aug 5 2013 Tim Waugh <twaugh@redhat.com> 1.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Fixed doc-related build failure (bug #992790).
* Wed Jul 24 2013 Tim Waugh <twaugh@redhat.com> 1.3.0-3 * Wed Jul 24 2013 Tim Waugh <twaugh@redhat.com> 1.3.0-3
- Avoid PIDFile problems in systemd unit file (bug #983232). - Avoid PIDFile problems in systemd unit file (bug #983232).