summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcvsdist <cvsdist@fedoraproject.org>2004-09-09 05:55:36 +0000
committercvsdist <cvsdist@fedoraproject.org>2004-09-09 05:55:36 +0000
commit752cb86f68b14441db677afc47a740ade8cd5074 (patch)
treedb800e7eb1e366000038ac4445b51cbb4321eab9
parent90c05ab9463f3194f67f3b33adc59441f070d923 (diff)
downloadgroff-752cb86f68b14441db677afc47a740ade8cd5074.tar.gz
groff-752cb86f68b14441db677afc47a740ade8cd5074.tar.xz
groff-752cb86f68b14441db677afc47a740ade8cd5074.zip
auto-import changelog data from groff-1.18.1-29.src.rpmgroff-1_18_1-29FC-2-splitFC-1-split
Tue Sep 23 2003 Florian La Roche <Florian.LaRoche@redhat.de> - allow compiling this without XFree86 Wed Aug 06 2003 Thomas Woerner <twoerner@redhat.com> 1.18.1-28.2 - new devutf8 font description - use -Tutf8 for ru_*.UTF-8 in nroff.sh - fixes #88618 (ru_RU man pages in cambridge are using UTF-8, now) Fri Jun 13 2003 Thomas Woerner <twoerner@redhat.com> 1.18.1-28 - rebuild (debian-9) Tue Jun 10 2003 Thomas Woerner <twoerner@redhat.com> 1.18.1-27 - going back to 1.18.1-4 from debian (the newer versions did not work properly) - fixed nroff.sh for ru_RU.(!UTF-8) Mon May 19 2003 Thomas Woerner <twoerner@redhat.com> 1.18.1-26 - fix input and output handler for 1.18.1-9 to be compatible with 1.18.1-4 Tue Apr 29 2003 Florian La Roche <Florian.LaRoche@redhat.de> - 1.18.1-9 from debian Tue Apr 15 2003 Florian La Roche <Florian.LaRoche@redhat.de> - 1.18.1-8 from debian: use latin1 instead of C locale
-rw-r--r--groff-1.18.1-devutf8.patch24
-rw-r--r--groff-xlibs.patch19
-rw-r--r--groff.spec51
3 files changed, 92 insertions, 2 deletions
diff --git a/groff-1.18.1-devutf8.patch b/groff-1.18.1-devutf8.patch
new file mode 100644
index 0000000..b957f2a
--- /dev/null
+++ b/groff-1.18.1-devutf8.patch
@@ -0,0 +1,24 @@
+--- groff-1.18.1/font/devutf8/M.proto.new_utf8 2003-08-06 13:49:19.000000000 +0200
++++ groff-1.18.1/font/devutf8/M.proto 2003-08-06 13:54:51.000000000 +0200
+@@ -2,5 +2,4 @@
+ internalname 4
+ spacewidth 48
+ charset
+-u2E00..u9FFF 48 0
+-uFF00..uFFEF 48 0
++u0100..uFFFF 48 0
+--- groff-1.18.1/font/devutf8/DESC.proto.new_utf8 2003-08-06 13:49:19.000000000 +0200
++++ groff-1.18.1/font/devutf8/DESC.proto 2003-08-06 13:53:20.000000000 +0200
+@@ -3,10 +3,7 @@
+ vert 40
+ unitwidth 10
+ sizes 10 0
+-fonts 6 R I B BI M G
+-fontset B G 2E00..9FFF
+-fontset B G FF00..FFEF
+-fontset - M 2E00..9FFF
+-fontset - M FF00..FFEF
++fonts 5 R I B BI M
++fontset - M 0100..FFFF
+ tcommand
+ postpro grotty
diff --git a/groff-xlibs.patch b/groff-xlibs.patch
new file mode 100644
index 0000000..aa72c29
--- /dev/null
+++ b/groff-xlibs.patch
@@ -0,0 +1,19 @@
+--- groff-1.18.1/Makefile.ccpg.sopwith Mon Feb 10 08:33:21 2003
++++ groff-1.18.1/Makefile.ccpg Mon Feb 10 08:54:00 2003
+@@ -8,7 +8,7 @@
+
+ all: $(PROG) $(MANPAGES)
+
+-$(PROG): $(OBJS) $(XLIBS)
++$(PROG): $(OBJS)
+ $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
+
+ install_bin: install_prog
+@@ -28,6 +28,6 @@
+
+ pure: $(PROG).pure
+
+-$(PROG).pure: $(OBJS) $(XLIBS)
++$(PROG).pure: $(OBJS)
+ $(PURIFY) $(PURIFYCCFLAGS) \
+ $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
diff --git a/groff.spec b/groff.spec
index 6e9e592..79fa002 100644
--- a/groff.spec
+++ b/groff.spec
@@ -1,7 +1,9 @@
+%{!?with_xfree86:%define with_xfree86 1}
+
Summary: A document formatting system.
Name: groff
Version: 1.18.1
-Release: 20
+Release: 29
Copyright: GPL
Group: Applications/Publishing
Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -10,7 +12,7 @@ Source3: mandocj.tar.gz
Source4: man-pages-ja-GNU_groff-20000115.tar.gz
Source6: hyphen.cs
Patch1: groff-1.16-safer.patch
-Patch3: groff_1.18.1-4.patch
+Patch3: groff_1.18.1-9.patch
Patch4: groff-1.18-info.patch
Patch5: groff-1.18-nohtml.patch
Patch6: groff-1.18-pfbtops_cpp.patch
@@ -21,6 +23,9 @@ Patch10: groff-1.18.1-iconv.patch
Patch11: groff-1.18.1-8bit.patch
Patch12: groff-1.18.1-korean.patch
Patch13: groff-1.18.1-gzext.patch
+Patch14: groff-xlibs.patch
+Patch15: groff-1.18.1-fix9.patch
+Patch16: groff-1.18.1-devutf8.patch
URL: ftp://ftp.gnu.org/gnu/groff/
Requires: mktemp
Prereq: /sbin/install-info
@@ -51,6 +56,7 @@ for creating PostScript font files, the grog utility that can be used
to automatically determine groff command-line options, and the
troff-to-ps print filter.
+%if %{with_xfree86}
%package gxditview
Summary: An X previewer for groff text processor output.
Group: Applications/Publishing
@@ -58,6 +64,7 @@ Group: Applications/Publishing
%description gxditview
Gxditview displays the groff text processor's output on an X Window
System display.
+%endif
%prep
%setup -q -a 4
@@ -73,6 +80,9 @@ System display.
%patch11 -p1
%patch12 -p1
%patch13 -p1 -b .gzext
+%patch14 -p1
+%patch15 -p1 -b .fix9
+%patch16 -p1 -b .devutf8
%build
PATH=$PATH:%{_prefix}/X11R6/bin
@@ -80,8 +90,10 @@ PATH=$PATH:%{_prefix}/X11R6/bin
%configure --enable-japanese --enable-multibyte
make
(cd doc && makeinfo groff.texinfo)
+%if %{with_xfree86}
cd src/xditview
xmkmf && make
+%endif
%install
rm -rf ${RPM_BUILD_ROOT}
@@ -89,9 +101,11 @@ PATH=$PATH:%{_prefix}/X11R6/bin
mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir}
%makeinstall manroot=${RPM_BUILD_ROOT}/%{_mandir}
#install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir}
+%if %{with_xfree86}
cd src/xditview
%makeinstall DESTDIR=$RPM_BUILD_ROOT
cd ../..
+%endif
#mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_prefix}/share
ln -s s.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gs.tmac
ln -s mse.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gmse.tmac
@@ -164,12 +178,45 @@ fi
%{_mandir}/man1/grog.*
%{_mandir}/man1/mmroff*
+%if %{with_xfree86}
%files gxditview
%defattr(-,root,root)
%{_prefix}/X11R6/bin/gxditview
%{_prefix}/X11R6/lib/X11/app-defaults/GXditview
+%endif
%changelog
+* Tue Sep 23 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- allow compiling this without XFree86
+
+* Wed Aug 6 2003 Thomas Woerner <twoerner@redhat.com> 1.18.1-28.2
+- new devutf8 font description
+- use -Tutf8 for ru_*.UTF-8 in nroff.sh
+- fixes #88618 (ru_RU man pages in cambridge are using UTF-8, now)
+
+* Fri Jun 13 2003 Thomas Woerner <twoerner@redhat.com> 1.18.1-28
+- rebuild (debian-9)
+
+* Tue Jun 10 2003 Thomas Woerner <twoerner@redhat.com> 1.18.1-27
+- going back to 1.18.1-4 from debian (the newer versions did not work properly)
+- fixed nroff.sh for ru_RU.(!UTF-8)
+
+* Mon May 19 2003 Thomas Woerner <twoerner@redhat.com> 1.18.1-26
+- fix input and output handler for 1.18.1-9 to be compatible with 1.18.1-4
+
+* Tue Apr 29 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- 1.18.1-9 from debian
+
+* Tue Apr 15 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- 1.18.1-8 from debian: use latin1 instead of C locale
+
+* Sun Mar 09 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- update to debian patch 1.18.1-7 located at
+ ftp://ftp.debian.org/debian/pool/main/g/groff/
+
+* Thu Feb 13 2003 Elliot Lee <sopwith@redhat.com> 1.18.1-21
+- groff-xlibs.patch to fix ppc64 builds
+
* Wed Feb 12 2003 Tim Waugh <twaugh@redhat.com> 1.18.1-20
- Make the iconv patch a little less broken (bug #84132).