new upstream release (1.22.1)

Resolves: #890973 #682857 #885225

1 files changed, 39 insertions, 16 deletions

diff --git a/groff.spec b/groff.spec
index 85bb8d0..782b2f0 100644
--- a/groff.spec
+++ b/groff.spec
@@ -2,26 +2,22 @@
 
 Summary: A document formatting system
 Name: groff
-Version: 1.21
-Release: 10%{?dist}
+Version: 1.22.1
+Release: 1%{?dist}
 License: GPLv3+ and GFDL and BSD and MIT
 Group: Applications/Publishing
 URL: http://groff.ffii.org
-
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
 
-Patch1: groff-info-missing-x11.patch
-Patch2: groff-makefile-typo.patch
-Patch3: groff-manpages-typos.patch
-Patch4: groff-grofferdir-auto.patch
-Patch5: groff-grotty-wc-no-sgr.patch
-Patch6: groff-config-etc.patch
-Patch7: groff-cve-2009-5044_5080_5081.patch
+Patch1: 0001-missing-groff-x11-info-message-when-gxditview-not-fo.patch
+Patch2: 0002-load-site-font-and-site-tmac-from-etc-groff.patch
+Patch3: 0003-various-security-fixes.patch
 
 Requires: coreutils
 Requires: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: nroff-i18n = %{version}-%{release}
+BuildRequires: git
 BuildRequires: netpbm-progs psutils ghostscript
 # when building from CVS add: BuildRequires: texinfo byacc
 Requires: groff-base = %{version}-%{release}
@@ -94,12 +90,15 @@ language and documentation for creating PDF files.
 
 %prep
 %setup -q
-for patch in %patches ; do
-	%__patch %_default_patch_flags --fuzz=%_default_patch_fuzz -p1 -i $patch
-done
+git init
+git config user.email groff-owner@fedoraproject.org
+git config user.name "groff owner"
+git add .
+git commit -n -m "release %{version}"
+git am %{patches}
 
 for file in NEWS src/devices/grolbp/grolbp.man doc/{groff.info*,webpage.ms} \
-				contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom} ; do
+				contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom,mom.vim} ; do
 	iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
 	mv "${file}_" "$file"
 done
@@ -123,6 +122,11 @@ for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} zsoelim
 	ln -s ${file#?}.1.gz %{buildroot}%{_mandir}/man1/${file}.1.gz
 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
+
 # another documentation files
 
 cp BUG-REPORT COPYING FDL LICENSES MORE.STUFF NEWS PROBLEMS %{buildroot}%{_docdir}/%{name}-%{version}
@@ -186,16 +190,20 @@ fi
 %{_datadir}/%{name}/%{version}/tmac/m.tmac
 %{_datadir}/%{name}/%{version}/tmac/me.tmac
 %{_datadir}/%{name}/%{version}/tmac/mm.tmac
+%{_datadir}/%{name}/%{version}/tmac/mm/
 %{_datadir}/%{name}/%{version}/tmac/mmse.tmac
 %{_datadir}/%{name}/%{version}/tmac/mom.tmac
 %{_datadir}/%{name}/%{version}/tmac/ms.tmac
 %{_datadir}/%{name}/%{version}/tmac/mse.tmac
 %{_datadir}/%{name}/%{version}/tmac/om.tmac
 %{_datadir}/%{name}/%{version}/tmac/pdfmark.tmac
+%{_datadir}/%{name}/%{version}/tmac/refer-me.tmac
+%{_datadir}/%{name}/%{version}/tmac/refer-mm.tmac
+%{_datadir}/%{name}/%{version}/tmac/refer-ms.tmac
+%{_datadir}/%{name}/%{version}/tmac/refer.tmac
 %{_datadir}/%{name}/%{version}/tmac/s.tmac
 %{_datadir}/%{name}/%{version}/tmac/spdf.tmac
 %{_datadir}/%{name}/%{version}/tmac/trace.tmac
-%{_datadir}/%{name}/%{version}/tmac/mm/
 # programs
 %{_bindir}/addftinfo
 %{_bindir}/eqn2graph
@@ -284,6 +292,7 @@ fi
 %{_datadir}/%{name}/%{version}/tmac/doc.tmac
 %{_datadir}/%{name}/%{version}/tmac/eqnrc
 %{_datadir}/%{name}/%{version}/tmac/europs.tmac
+%{_datadir}/%{name}/%{version}/tmac/fallbacks.tmac
 %{_datadir}/%{name}/%{version}/tmac/fr.tmac
 %{_datadir}/%{name}/%{version}/tmac/hyphen.cs
 %{_datadir}/%{name}/%{version}/tmac/hyphen.den
@@ -302,6 +311,7 @@ fi
 %{_datadir}/%{name}/%{version}/tmac/man.tmac
 %{_datadir}/%{name}/%{version}/tmac/mandoc.tmac
 %{_datadir}/%{name}/%{version}/tmac/mdoc.tmac
+%{_datadir}/%{name}/%{version}/tmac/mdoc/
 %{_datadir}/%{name}/%{version}/tmac/papersize.tmac
 %{_datadir}/%{name}/%{version}/tmac/pic.tmac
 %{_datadir}/%{name}/%{version}/tmac/ps.tmac
@@ -317,7 +327,6 @@ fi
 %{_datadir}/%{name}/%{version}/tmac/tty.tmac
 %{_datadir}/%{name}/%{version}/tmac/unicode.tmac
 %{_datadir}/%{name}/%{version}/tmac/www.tmac
-%{_datadir}/%{name}/%{version}/tmac/mdoc/
 # programs
 %{_bindir}/eqn
 %{_bindir}/groff
@@ -362,13 +371,17 @@ fi
 %files perl
 %defattr(-,root,root,-)
 # data
+%{_datadir}/%{name}/%{version}/font/devpdf/
 %{_datadir}/%{name}/%{version}/groffer/
+%{_datadir}/%{name}/%{version}/tmac/pdf.tmac
 # programs
 %{_bindir}/afmtodit
 %{_bindir}/chem
 %{_bindir}/groffer
 %{_bindir}/grog
+%{_bindir}/gropdf
 %{_bindir}/mmroff
+%{_bindir}/pdfmom
 %{_bindir}/roff2dvi
 %{_bindir}/roff2html
 %{_bindir}/roff2pdf
@@ -379,7 +392,9 @@ fi
 %{_mandir}/man1/chem.*
 %{_mandir}/man1/groffer.*
 %{_mandir}/man1/grog.*
+%{_mandir}/man1/gropdf.*
 %{_mandir}/man1/mmroff.*
+%{_mandir}/man1/pdfmom.*
 %{_mandir}/man1/roff2dvi.*
 %{_mandir}/man1/roff2html.*
 %{_mandir}/man1/roff2pdf.*
@@ -413,6 +428,14 @@ fi
 %doc %{_docdir}/%{name}-%{version}/pdf/
 
 %changelog
+* Tue Jan 01 2013 Jan Vcelak <jvcelak@redhat.com> 1.22.1-1
+- new upstream release (#890973)
+  + various fixes in manual pages
+  + various fixes and improvements in macros
+  + new gropdf driver for generating PDF files
+- fix: backslash-period escape does not work (#682857)
+- fix: groff ftbfs - patch does not apply (#885225)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.21-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild