From 537ec82c23588c9d2c7a01a721adf39bd6fd8b65 Mon Sep 17 00:00:00 2001 From: Peter Schiffer <pschiffe@redhat.com> Date: Tue, 1 Oct 2013 19:36:41 +0200 Subject: [PATCH] Removed versioned docdir from .spec file - resolves: #993806 --- groff.spec | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/groff.spec b/groff.spec index 9d76442..3e33a05 100644 --- a/groff.spec +++ b/groff.spec @@ -3,7 +3,7 @@ Summary: A document formatting system Name: groff Version: 1.22.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ and GFDL and BSD and MIT Group: Applications/Publishing URL: http://www.gnu.org/software/groff/ @@ -104,7 +104,7 @@ done %build %configure \ - --docdir=%{_docdir}/%{name}-%{version} \ + --docdir=%{_pkgdocdir} \ --with-appresdir=%{_datadir}/X11/app-defaults \ --with-grofferdir=%{_datadir}/%{name}/%{version}/groffer make %{?_smp_mflags} @@ -119,8 +119,8 @@ for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} zsoelim done # fix absolute symlink to relative symlink -rm -f %{buildroot}%{_docdir}/%{name}-%{version}/pdf/mom-pdf.pdf -ln -s ../examples/mom/mom-pdf.pdf %{buildroot}%{_docdir}/%{name}-%{version}/pdf/mom-pdf.pdf +rm -f %{buildroot}%{_pkgdocdir}/pdf/mom-pdf.pdf +ln -s ../examples/mom/mom-pdf.pdf %{buildroot}%{_pkgdocdir}/pdf/mom-pdf.pdf # rename groff downloadable postscript fonts to meet Fedora Font Packaging guidelines, # as these files are more PS instructions, than general-purpose fonts (bz #477394) @@ -137,7 +137,7 @@ chmod 755 %{buildroot}%{_datadir}/groff/%{version}/groffer/version.sh chmod 755 %{buildroot}%{_datadir}/groff/%{version}/font/devlj4/generate/special.awk # remove CreationDate from documentation -pushd %{buildroot}%{_docdir}/%{name}-%{version} +pushd %{buildroot}%{_pkgdocdir} find -name "*.html" | xargs sed -i "/^<!-- CreationDate: /d" find -name "*.ps" | xargs sed -i "/^%%%%CreationDate: /d" popd @@ -391,14 +391,18 @@ fi %endif %files doc -%doc %{_docdir}/%{name}-%{version}/*.me -%doc %{_docdir}/%{name}-%{version}/*.ps -%doc %{_docdir}/%{name}-%{version}/*.ms -%doc %{_docdir}/%{name}-%{version}/examples/ -%doc %{_docdir}/%{name}-%{version}/html/ -%doc %{_docdir}/%{name}-%{version}/pdf/ +%doc %{_pkgdocdir}/*.me +%doc %{_pkgdocdir}/*.ps +%doc %{_pkgdocdir}/*.ms +%doc %{_pkgdocdir}/examples/ +%doc %{_pkgdocdir}/html/ +%doc %{_pkgdocdir}/pdf/ %changelog +* Tue Oct 1 2013 Peter Schiffer <pschiffe@redhat.com> 1.22.2-8 +- resolves: #993806 + removed versioned docdir from .spec file + * Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 1.22.2-7 - Perl 5.18 rebuild @@ -483,7 +487,7 @@ fi * Fri Mar 19 2010 Jan Vcelak <jvcelak@redhat.com> - 1.20.1-1 - Resolves: #530788 -* Tue Mar 12 2010 Jan Vcelak <jvcelak@redhat.com> - 1.20.1-0 +* Fri Mar 12 2010 Jan Vcelak <jvcelak@redhat.com> - 1.20.1-0 - Package rebase to upstream 1.20.1 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.18.1.4-18 @@ -561,7 +565,7 @@ fi - remove gxditview from groff package (#179684) - remove obsolete "--enable-japanese" configure option -* Fri Jan 12 2006 Miroslav Lichvar <mlichvar@redhat.com> - 1.18.1.1-8 +* Thu Jan 12 2006 Miroslav Lichvar <mlichvar@redhat.com> - 1.18.1.1-8 - fix segfault in grotty on 64-bit big endian machines (#176904) - fix assertion failure on abort message (#141912) - attempt to fix a space problem with several european languages (#137728)