rpms/groff/FC-4 groff.spec,1.28,1.29
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 16 13:45:03 UTC 2006
Author: mlichvar
Update of /cvs/dist/rpms/groff/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29394
Modified Files:
groff.spec
Log Message:
- spec cleanup
- work if bash's noclobber is on (#127492)
- fix assertion failure on abort message (#141912)
- attempt to fix a space problem with several european languages (#137728)
Index: groff.spec
===================================================================
RCS file: /cvs/dist/rpms/groff/FC-4/groff.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- groff.spec 13 Jan 2006 12:53:21 -0000 1.28
+++ groff.spec 16 Jan 2006 13:45:00 -0000 1.29
@@ -3,7 +3,7 @@
Summary: A document formatting system.
Name: groff
Version: 1.18.1.1
-Release: 5
+Release: 6.FC4
License: GPL
Group: Applications/Publishing
Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -28,6 +28,7 @@
Patch18: groff-1.18.1.1-do_char.patch
Patch19: groff-1.18.1.1-grn.patch
Patch20: groff-1.18.1.1-tempfile.patch
+Patch21: groff-1.18.1.1-spacefix.patch
URL: ftp://ftp.gnu.org/gnu/groff/
Requires: mktemp
@@ -93,16 +94,18 @@
%patch18 -p1 -b .do_char
%patch19 -p1 -b .grn
%patch20 -p1 -b .tempfile
+%patch21 -p1 -b .spacefix
+
for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \
- src/devices/grolbp/grolbp.man; do
- iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
- mv "${i}_" "$i"
+ src/devices/grolbp/grolbp.man; do
+ iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
+ mv "${i}_" "$i"
done
%build
-PATH=$PATH:%{_prefix}/X11R6/bin
+#PATH=$PATH:%{_prefix}/X11R6/bin
#autoconf
-%configure --enable-japanese --enable-multibyte
+%configure --enable-multibyte
make
(cd doc && makeinfo groff.texinfo)
%if %{with_x}
@@ -112,7 +115,7 @@
%install
rm -rf ${RPM_BUILD_ROOT}
-PATH=$PATH:%{_prefix}/X11R6/bin
+#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}
@@ -122,20 +125,20 @@
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
-ln -s m.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gm.tmac
-ln -s troff ${RPM_BUILD_ROOT}%{_prefix}/bin/gtroff
-ln -s tbl ${RPM_BUILD_ROOT}%{_prefix}/bin/gtbl
-ln -s pic ${RPM_BUILD_ROOT}%{_prefix}/bin/gpic
-ln -s eqn ${RPM_BUILD_ROOT}%{_prefix}/bin/geqn
-ln -s neqn ${RPM_BUILD_ROOT}%{_prefix}/bin/gneqn
-ln -s refer ${RPM_BUILD_ROOT}%{_prefix}/bin/grefer
-ln -s lookbib ${RPM_BUILD_ROOT}%{_prefix}/bin/glookbib
-ln -s indxbib ${RPM_BUILD_ROOT}%{_prefix}/bin/gindxbib
-ln -s soelim ${RPM_BUILD_ROOT}%{_prefix}/bin/gsoelim
-ln -s soelim ${RPM_BUILD_ROOT}%{_prefix}/bin/zsoelim
-ln -s nroff ${RPM_BUILD_ROOT}%{_prefix}/bin/gnroff
+ln -s s.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gs.tmac
+ln -s mse.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gmse.tmac
+ln -s m.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gm.tmac
+ln -s troff ${RPM_BUILD_ROOT}%{_bindir}/gtroff
+ln -s tbl ${RPM_BUILD_ROOT}%{_bindir}/gtbl
+ln -s pic ${RPM_BUILD_ROOT}%{_bindir}/gpic
+ln -s eqn ${RPM_BUILD_ROOT}%{_bindir}/geqn
+ln -s neqn ${RPM_BUILD_ROOT}%{_bindir}/gneqn
+ln -s refer ${RPM_BUILD_ROOT}%{_bindir}/grefer
+ln -s lookbib ${RPM_BUILD_ROOT}%{_bindir}/glookbib
+ln -s indxbib ${RPM_BUILD_ROOT}%{_bindir}/gindxbib
+ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/gsoelim
+ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/zsoelim
+ln -s nroff ${RPM_BUILD_ROOT}%{_bindir}/gnroff
# Build system is compressing man-pages
ln -s eqn.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/geqn.1.gz
@@ -149,23 +152,23 @@
ln -s tbl.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtbl.1.gz
ln -s troff.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtroff.1.gz
-ln -s devnippon ${RPM_BUILD_ROOT}/usr/share/groff/%{version}/font/devkorean
+ln -s devnippon ${RPM_BUILD_ROOT}%{_datadir}/groff/%{version}/font/devkorean
-cat debian/mandoc.local >> ${RPM_BUILD_ROOT}/usr/share/groff/site-tmac/mdoc.local
-cat debian/mandoc.local >> ${RPM_BUILD_ROOT}/usr/share/groff/site-tmac/man.local
+cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/mdoc.local
+cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/man.local
-find ${RPM_BUILD_ROOT}%{_prefix}/bin ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \
+find ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \
grep -v afmtodit | grep -v grog | grep -v mdoc.samples |\
grep -v mmroff |\
sed "s|${RPM_BUILD_ROOT}||g" | sed "s|\.[0-9]|\.*|g" > groff-files
-install -m 644 %SOURCE6 $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/hyphen.cs
+install -m 644 %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/hyphen.cs
-install -m 755 %SOURCE7 $RPM_BUILD_ROOT/usr/bin/nroff
+install -m 755 %SOURCE7 $RPM_BUILD_ROOT%{_bindir}/nroff
-ln -sf doc.tmac $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/docj.tmac
+ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac
# installed, but not packaged in rpm
-rm -fr $RPM_BUILD_ROOT/usr/share/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir
+rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -183,14 +186,14 @@
%defattr(-,root,root)
%doc BUG-REPORT NEWS PROBLEMS README TODO VERSION
%doc doc/meintro.me doc/meref.me doc/pic.ms
-%{_prefix}/share/groff
+%{_datadir}/groff
%{_infodir}/groff*
%files perl
%defattr(-,root,root)
-%{_prefix}/bin/grog
-%{_prefix}/bin/mmroff
-%{_prefix}/bin/afmtodit
+%{_bindir}/grog
+%{_bindir}/mmroff
+%{_bindir}/afmtodit
%{_mandir}/man1/afmtodit.*
%{_mandir}/man1/grog.*
%{_mandir}/man1/mmroff*
@@ -203,6 +206,12 @@
%endif
%changelog
+* Mon Jan 16 2006 Miroslav Lichvar <mlichvar at redhat.com> 1.18.1.1-6.FC4
+- spec cleanup
+- work if bash's noclobber is on (#127492)
+- fix assertion failure on abort message (#141912)
+- attempt to fix a space problem with several european languages (#137728)
+
* Wed Nov 24 2004 Miloslav Trmac <mitr at redhat.com> - 1.18.1.1-5
- Convert also mmroff.1 to UTF-8
More information about the fedora-cvs-commits
mailing list