- Replace groff-1.18-nohtml.patch by a code in spec file
- fix groff-1.18-gzip.patch to apply cleanly - simplify the code for symlinking in %install
This commit is contained in:
Štěpán Kasal
parent
84a8c9e4bb
commit
4a5c4a1fc5
@ -7,7 +7,7 @@
|
||||
+XLIBS=-lz $(LIBGROFF)
|
||||
MLIB=$(LIBM)
|
||||
OBJS=\
|
||||
env.o \
|
||||
env.$(OBJEXT) \
|
||||
--- groff-1.18/src/roff/troff/input.cc.hugo 2002-11-04 21:30:09.000000000 +0100
|
||||
+++ groff-1.18/src/roff/troff/input.cc 2002-11-04 21:36:13.000000000 +0100
|
||||
@@ -42,6 +42,8 @@
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
--- groff-1.18/doc/Makefile.sub.nohtml 2002-06-14 17:18:34.000000000 +0200
|
||||
+++ groff-1.18/doc/Makefile.sub 2002-08-06 13:46:19.000000000 +0200
|
||||
@@ -54,11 +54,9 @@
|
||||
meintro.ps \
|
||||
pic.ps
|
||||
|
||||
-HTMLDOCFILES=\
|
||||
- pic.html
|
||||
+HTMLDOCFILES=
|
||||
|
||||
-HTMLDOCIMAGEFILES=\
|
||||
- pic*
|
||||
+HTMLDOCIMAGEFILES=
|
||||
|
||||
EXAMPLEFILES=\
|
||||
webpage.ms \
|
||||
@@ -71,11 +69,9 @@
|
||||
gnu.png \
|
||||
grnexmpl.ps
|
||||
|
||||
-HTMLEXAMPLEFILES=\
|
||||
- webpage.html
|
||||
+HTMLEXAMPLEFILES=
|
||||
|
||||
-HTMLEXAMPLEIMAGEFILES=\
|
||||
- webpage*
|
||||
+HTMLEXAMPLEIMAGEFILES=
|
||||
|
||||
imagedir=img
|
||||
htmldocimagedir=$(htmldocdir)/$(imagedir)
|
||||
@@ -109,7 +105,7 @@
|
||||
|
||||
|
||||
all: groff $(PROCESSEDDOCFILES) prepare_examples \
|
||||
- $(PROCESSEDEXAMPLEFILES) $(make_html)
|
||||
+ $(PROCESSEDEXAMPLEFILES)
|
||||
|
||||
html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
|
||||
|
||||
@@ -131,7 +127,7 @@
|
||||
|
||||
distfiles: groff
|
||||
|
||||
-install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
|
||||
+install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) \
|
||||
$(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
|
||||
-test -d $(infodir) || $(mkinstalldirs) $(infodir)
|
||||
# Prefer info files in builddir over srcdir; we test for
|
||||
60
groff.spec
60
groff.spec
@ -3,7 +3,7 @@
|
||||
Summary: A document formatting system
|
||||
Name: groff
|
||||
Version: 1.18.1.4
|
||||
Release: 14%{?dist}
|
||||
Release: 15%{?dist}
|
||||
License: GPLv2 and GFDL
|
||||
Group: Applications/Publishing
|
||||
URL: http://groff.ffii.org
|
||||
@ -15,7 +15,6 @@ Source7: nroff
|
||||
Patch1: groff-1.16-safer.patch
|
||||
Patch3: groff_1.18.1-15.diff
|
||||
Patch4: groff-1.18-info.patch
|
||||
Patch5: groff-1.18-nohtml.patch
|
||||
Patch6: groff-1.18-pfbtops_cpp.patch
|
||||
Patch7: groff-1.18-gzip.patch
|
||||
Patch9: groff-1.18.1-fixminus.patch
|
||||
@ -83,7 +82,7 @@ System display.
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
#%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch9 -p1
|
||||
@ -114,7 +113,8 @@ done
|
||||
#PATH=$PATH:%{_prefix}/X11R6/bin
|
||||
#autoconf
|
||||
%configure --enable-multibyte
|
||||
make
|
||||
# no html docs
|
||||
make make_html=
|
||||
(cd doc && makeinfo groff.texinfo)
|
||||
%if %{with_x}
|
||||
cd src/xditview
|
||||
@ -124,8 +124,12 @@ xmkmf && make %{?_smp_mflags}
|
||||
%install
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
#PATH=$PATH:%{_prefix}/X11R6/bin
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir}
|
||||
make install manroot=${RPM_BUILD_ROOT}%{_mandir} \
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
|
||||
# 1) no html docs
|
||||
# 2) the list could be shorter if configure parameters were not expanded;
|
||||
# %%configure should be fixed!
|
||||
make install make_html= make_install_html= \
|
||||
manroot=${RPM_BUILD_ROOT}%{_mandir} \
|
||||
bindir=%{buildroot}%{_bindir} \
|
||||
mandir=%{buildroot}%{_mandir} \
|
||||
prefix=%{buildroot}/usr \
|
||||
@ -148,33 +152,14 @@ cd src/xditview
|
||||
make install DESTDIR=${RPM_BUILD_ROOT}
|
||||
cd ../..
|
||||
%endif
|
||||
#mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_prefix}/share
|
||||
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
|
||||
ln -s indxbib.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gindxbib.1.gz
|
||||
ln -s lookbib.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/glookbib.1.gz
|
||||
ln -s nroff.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gnroff.1.gz
|
||||
ln -s pic.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gpic.1.gz
|
||||
ln -s refer.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/grefer.1.gz
|
||||
ln -s soelim.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gsoelim.1.gz
|
||||
ln -s soelim.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/zsoelim.1.gz
|
||||
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
|
||||
for file in {s,mse,m}.tmac; do
|
||||
ln -s $file ${RPM_BUILD_ROOT}%{_datadir}/groff/%{version}/tmac/g$file
|
||||
done
|
||||
for file in g{{n,t}roff,tbl,pic,{,n}eqn,refer,{look,indx}bib} {g,z}soelim; do
|
||||
ln -s ${file#?} ${RPM_BUILD_ROOT}%{_bindir}/$file
|
||||
ln -s {${file#?},${RPM_BUILD_ROOT}%{_bindir}/$file}.1.gz
|
||||
done
|
||||
|
||||
ln -s devnippon ${RPM_BUILD_ROOT}%{_datadir}/groff/%{version}/font/devkorean
|
||||
|
||||
@ -182,10 +167,8 @@ cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/mdoc.loc
|
||||
cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/man.local
|
||||
|
||||
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 |\
|
||||
grep -v gxditview |\
|
||||
sed "s|${RPM_BUILD_ROOT}||g" | sed "s|\.[0-9]|\.*|g" > groff-files
|
||||
sed "/afmtodit/d;/grog/d;/mdoc\.samples/d;/mmroff/d;/gxditview/d
|
||||
s|${RPM_BUILD_ROOT}||g; s|\.[0-9]|\.*|g" > groff-files
|
||||
|
||||
install -pm 644 %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/hyphen.cs
|
||||
|
||||
@ -241,6 +224,11 @@ exit 0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Sep 29 2008 Stepan Kasal <skasal@redhat.com> - 1.18.1.14-15
|
||||
- Replace groff-1.18-nohtml.patch by a code in spec file
|
||||
- fix groff-1.18-gzip.patch to apply cleanly
|
||||
- simplify the code for symlinking in %%install
|
||||
|
||||
* Wed Mar 26 2008 Marcela Maslanova <mmaslano@redhat.com> - 1.18.1.4-14
|
||||
- 175459 warning goes on stderr
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user