Accepting request 179292 from M17N
- Take care of mmroff.1.gz as well as of mmroff perl script - Move important non-graphical macros from groff-full back to groff as otherwise many packages do not build anymore - modify groff_1.22.2-2.debian.diff - remove the part related to src/preproc/html/pre-html.cpp, fixes bnc#755533 - Take care of mmroff.1.gz as well as of mmroff perl script - Move important non-graphical macros from groff-full back to groff as otherwise many packages do not build anymore OBS-URL: https://build.opensuse.org/request/show/179292 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/groff?expand=0&rev=47
This commit is contained in:
commit
79c77c50aa
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 11:18:11 UTC 2013 - werner@suse.de
|
||||
|
||||
- Take care of mmroff.1.gz as well as of mmroff perl script
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 10:18:59 UTC 2013 - werner@suse.de
|
||||
|
||||
- Move important non-graphical macros from groff-full back to groff
|
||||
as otherwise many packages do not build anymore
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 5 09:00:09 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- modify groff_1.22.2-2.debian.diff - remove the part related to
|
||||
src/preproc/html/pre-html.cpp, fixes bnc#755533
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 9 09:16:49 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
@ -12,7 +29,6 @@ Thu May 9 09:16:49 UTC 2013 - mvyskocil@suse.com
|
||||
documents from files formatted with the -mom macros.
|
||||
* and a lot more, see NEWS for details
|
||||
- obsoletes:
|
||||
groff-1.21-groffer-libexecdir.patch, already fixed upstream
|
||||
config-guess-sub-update.patch, dtto
|
||||
groff_1.21-6.debian.diff, replaced by
|
||||
- added groff_1.22.2-2.debian.diff
|
||||
|
@ -31,9 +31,12 @@ Source1: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz.sig
|
||||
Source2: groff-full.keyring
|
||||
Source3: zzz-groff.sh
|
||||
Source4: zzz-groff.csh
|
||||
# rm -f foo
|
||||
# for file in `cat series | grep -v '^#' | grep '^[a-z]' `; do
|
||||
# cat $file >> groff_1.21-6.debian.diff
|
||||
# cat $file >> foo
|
||||
# done
|
||||
##remove a part related to src/preproc/html/pre-html.cpp - see bnc#755533
|
||||
# filterdiff -x 'src/preproc/html/pre-html.cpp' foo > groff_1.22.2-2.debian.diff
|
||||
Patch0: groff_1.22.2-2.debian.diff
|
||||
Patch1: groff-1.20.1-destbufferoverflow.patch
|
||||
Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch
|
||||
@ -112,6 +115,7 @@ programs store their man pages in either /usr/share/man/ or
|
||||
%package -n groff-doc
|
||||
Summary: HTML documentation and examples for groff
|
||||
Group: Productivity/Publishing/Troff
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n groff-doc
|
||||
The groff package provides compatible versions of troff, nroff, eqn,
|
||||
@ -238,20 +242,49 @@ for FONT in devascii devlatin1 devps devutf8; do
|
||||
%endif
|
||||
done
|
||||
|
||||
for TMAC in an-ext.tmac an-old.tmac an.tmac andoc.tmac composite.tmac cp1047.tmac cs.tmac de.tmac den.tmac \
|
||||
devtag.tmac doc.tmac doc-old.tmac eqnrc europs.tmac fr.tmac hyphen.cs hyphen.den hyphen.det \
|
||||
hyphen.fr hyphen.sv hyphen.us hyphenex.cs hyphenex.det hyphenex.us ja.tmac latin1.tmac latin2.tmac \
|
||||
latin5.tmac latin9.tmac man.tmac mandoc.tmac mdoc.tmac papersize.tmac pic.tmac ps.tmac psatk.tmac \
|
||||
psold.tmac pspic.tmac safer.tmac sv.tmac trans.tmac troffrc troffrc-end tty-char.tmac tty.tmac \
|
||||
unicode.tmac www.tmac; do
|
||||
|
||||
for TMAC in a4.tmac an-ext.tmac an-old.tmac an.tmac andoc.tmac composite.tmac \
|
||||
cp1047.tmac cs.tmac de.tmac den.tmac devtag.tmac doc.tmac \
|
||||
doc-old.tmac e.tmac eqnrc europs.tmac fallbacks.tmac fr.tmac \
|
||||
hyphen.cs hyphen.den hyphen.det hyphen.fr hyphen.sv hyphen.us \
|
||||
hyphenex.cs hyphenex.det hyphenex.us ja.tmac latin1.tmac latin2.tmac \
|
||||
latin5.tmac latin9.tmac man.tmac mandoc.tmac mdoc.tmac me.tmac \
|
||||
ms.tmac papersize.tmac pic.tmac ps.tmac psatk.tmac psold.tmac \
|
||||
pspic.tmac refer-me.tmac refer-ms.tmac refer.tmac s.tmac \
|
||||
safer.tmac sv.tmac trace.tmac trans.tmac troffrc troffrc-end \
|
||||
tty-char.tmac tty.tmac unicode.tmac www.tmac
|
||||
do
|
||||
%if %{groff_base_only}
|
||||
cp tmac/${TMAC} %{buildroot}%{_datadir}/%{name}/%{version}/tmac/
|
||||
install -m 0644 tmac/${TMAC} %{buildroot}%{_datadir}/%{name}/%{version}/tmac/
|
||||
%else
|
||||
rm %{buildroot}%{_datadir}/groff/%{version}/tmac/${TMAC}
|
||||
%endif
|
||||
done
|
||||
|
||||
pushd contrib/mm/
|
||||
%if %{groff_base_only}
|
||||
install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm
|
||||
install -c -m 0755 mmroff %{buildroot}%{_bindir}/mmroff
|
||||
install -c -m 0644 mmroff.n %{buildroot}%{_mandir}/man1/mmroff.1
|
||||
for f in 0.MT 5.MT 4.MT ms.cov se_ms.cov ; do
|
||||
install -c -m 644 mm/$f %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm/$f
|
||||
done
|
||||
for f in locale se_locale; do
|
||||
touch %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm/$f
|
||||
chmod 0644 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm/$f
|
||||
done
|
||||
for f in *.tmac; do
|
||||
install -c -m 644 $f %{buildroot}%{_datadir}/%{name}/%{version}/tmac/$f
|
||||
done
|
||||
%else
|
||||
rm %{buildroot}%{_bindir}/mmroff
|
||||
rm %{buildroot}%{_mandir}/man1/mmroff.1*
|
||||
rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mm/
|
||||
for f in *.tmac; do
|
||||
rm -f %{buildroot}%{_datadir}/groff/%{version}/tmac/$f
|
||||
done
|
||||
%endif
|
||||
popd
|
||||
|
||||
%if %{groff_base_only}
|
||||
install -m 0644 tmac/doc-common tmac/doc-ditroff tmac/doc-nroff tmac/doc-syms \
|
||||
%{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/
|
||||
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 11:18:11 UTC 2013 - werner@suse.de
|
||||
|
||||
- Take care of mmroff.1.gz as well as of mmroff perl script
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 10:18:59 UTC 2013 - werner@suse.de
|
||||
|
||||
- Move important non-graphical macros from groff-full back to groff
|
||||
as otherwise many packages do not build anymore
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 5 09:00:09 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
|
46
groff.spec
46
groff.spec
@ -114,6 +114,7 @@ programs store their man pages in either /usr/share/man/ or
|
||||
%package -n groff-doc
|
||||
Summary: HTML documentation and examples for groff
|
||||
Group: Productivity/Publishing/Troff
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n groff-doc
|
||||
The groff package provides compatible versions of troff, nroff, eqn,
|
||||
@ -240,20 +241,49 @@ for FONT in devascii devlatin1 devps devutf8; do
|
||||
%endif
|
||||
done
|
||||
|
||||
for TMAC in an-ext.tmac an-old.tmac an.tmac andoc.tmac composite.tmac cp1047.tmac cs.tmac de.tmac den.tmac \
|
||||
devtag.tmac doc.tmac doc-old.tmac eqnrc europs.tmac fr.tmac hyphen.cs hyphen.den hyphen.det \
|
||||
hyphen.fr hyphen.sv hyphen.us hyphenex.cs hyphenex.det hyphenex.us ja.tmac latin1.tmac latin2.tmac \
|
||||
latin5.tmac latin9.tmac man.tmac mandoc.tmac mdoc.tmac papersize.tmac pic.tmac ps.tmac psatk.tmac \
|
||||
psold.tmac pspic.tmac safer.tmac sv.tmac trans.tmac troffrc troffrc-end tty-char.tmac tty.tmac \
|
||||
unicode.tmac www.tmac; do
|
||||
|
||||
for TMAC in a4.tmac an-ext.tmac an-old.tmac an.tmac andoc.tmac composite.tmac \
|
||||
cp1047.tmac cs.tmac de.tmac den.tmac devtag.tmac doc.tmac \
|
||||
doc-old.tmac e.tmac eqnrc europs.tmac fallbacks.tmac fr.tmac \
|
||||
hyphen.cs hyphen.den hyphen.det hyphen.fr hyphen.sv hyphen.us \
|
||||
hyphenex.cs hyphenex.det hyphenex.us ja.tmac latin1.tmac latin2.tmac \
|
||||
latin5.tmac latin9.tmac man.tmac mandoc.tmac mdoc.tmac me.tmac \
|
||||
ms.tmac papersize.tmac pic.tmac ps.tmac psatk.tmac psold.tmac \
|
||||
pspic.tmac refer-me.tmac refer-ms.tmac refer.tmac s.tmac \
|
||||
safer.tmac sv.tmac trace.tmac trans.tmac troffrc troffrc-end \
|
||||
tty-char.tmac tty.tmac unicode.tmac www.tmac
|
||||
do
|
||||
%if %{groff_base_only}
|
||||
cp tmac/${TMAC} %{buildroot}%{_datadir}/%{name}/%{version}/tmac/
|
||||
install -m 0644 tmac/${TMAC} %{buildroot}%{_datadir}/%{name}/%{version}/tmac/
|
||||
%else
|
||||
rm %{buildroot}%{_datadir}/groff/%{version}/tmac/${TMAC}
|
||||
%endif
|
||||
done
|
||||
|
||||
pushd contrib/mm/
|
||||
%if %{groff_base_only}
|
||||
install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm
|
||||
install -c -m 0755 mmroff %{buildroot}%{_bindir}/mmroff
|
||||
install -c -m 0644 mmroff.n %{buildroot}%{_mandir}/man1/mmroff.1
|
||||
for f in 0.MT 5.MT 4.MT ms.cov se_ms.cov ; do
|
||||
install -c -m 644 mm/$f %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm/$f
|
||||
done
|
||||
for f in locale se_locale; do
|
||||
touch %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm/$f
|
||||
chmod 0644 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm/$f
|
||||
done
|
||||
for f in *.tmac; do
|
||||
install -c -m 644 $f %{buildroot}%{_datadir}/%{name}/%{version}/tmac/$f
|
||||
done
|
||||
%else
|
||||
rm %{buildroot}%{_bindir}/mmroff
|
||||
rm %{buildroot}%{_mandir}/man1/mmroff.1*
|
||||
rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mm/
|
||||
for f in *.tmac; do
|
||||
rm -f %{buildroot}%{_datadir}/groff/%{version}/tmac/$f
|
||||
done
|
||||
%endif
|
||||
popd
|
||||
|
||||
%if %{groff_base_only}
|
||||
install -m 0644 tmac/doc-common tmac/doc-ditroff tmac/doc-nroff tmac/doc-syms \
|
||||
%{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/
|
||||
|
Loading…
Reference in New Issue
Block a user