Fix paths to docs when doc dir is unversioned. BZ #994053

This commit is contained in:
Ville Skyttä 2013-10-25 00:16:06 +03:00
parent 719018ded9
commit 04aa159f81

View File

@ -22,7 +22,7 @@
Name: publican Name: publican
Version: 3.2.1 Version: 3.2.1
Release: 0%{?dist} Release: 1%{?dist}
Summary: Common files and scripts for publishing with DocBook XML Summary: Common files and scripts for publishing with DocBook XML
# For a breakdown of the licensing, refer to LICENSE # For a breakdown of the licensing, refer to LICENSE
License: (GPLv2+ or Artistic) and CC0 License: (GPLv2+ or Artistic) and CC0
@ -194,6 +194,7 @@ Website style for common brand for DocBook5 content
%prep %prep
%setup -q -n Publican-v%{version} %setup -q -n Publican-v%{version}
%{?_docdir_fmt:%{__perl} -pi -e 's|/publican-\$VERSION|/publican|' bin/publican}
%build %build
%{__perl} Build.PL installdirs=vendor --nocolours=1 %{__perl} Build.PL installdirs=vendor --nocolours=1
@ -211,8 +212,8 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} $RPM_BUILD_ROOT/* %{_fixperms} $RPM_BUILD_ROOT/*
sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc-%{version}/en-US/index.html|' %{name}.desktop sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc%{!?_docdir_fmt:-%{version}}/en-US/index.html|' %{name}.desktop
sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc-%{version}/en-US/images/icon.svg|' %{name}.desktop sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc%{!?_docdir_fmt:-%{version}}/en-US/images/icon.svg|' %{name}.desktop
desktop-file-install \ desktop-file-install \
%if 0%{?with_desktop_vendor_tag} %if 0%{?with_desktop_vendor_tag}
@ -291,6 +292,9 @@ rm -rf $RPM_BUILD_ROOT
%{wwwdir}/common-db5 %{wwwdir}/common-db5
%changelog %changelog
* Thu Oct 24 2013 Ville Skyttä <ville.skytta@iki.fi> - 3.2.1-1
- Fix paths to docs when doc dir is unversioned. BZ #994053
* Wed Sep 04 2013 Jeff Fearn <jfearn@redhat.com> 3.2.1-0 * Wed Sep 04 2013 Jeff Fearn <jfearn@redhat.com> 3.2.1-0
- Fix empty images dir causing packaging fail. BZ #996349 - Fix empty images dir causing packaging fail. BZ #996349
- Fix draft background being in front. BZ #996361 - Fix draft background being in front. BZ #996361