summaryrefslogtreecommitdiffstats
path: root/groff.spec
diff options
context:
space:
mode:
Diffstat (limited to 'groff.spec')
-rw-r--r--groff.spec98
1 files changed, 42 insertions, 56 deletions
diff --git a/groff.spec b/groff.spec
index 12331b4..6a9245b 100644
--- a/groff.spec
+++ b/groff.spec
@@ -3,7 +3,7 @@
Summary: A document formatting system
Name: groff
Version: 1.18.1.4
-Release: 19%{?dist}
+Release: 20%{?dist}
License: GPLv2 and GFDL
Group: Applications/Publishing
URL: http://groff.ffii.org
@@ -13,27 +13,21 @@ Source4: man-pages-ja-GNU_groff-20000115.tar.gz
Source6: hyphen.cs
Source7: nroff
Patch1: groff-1.16-safer.patch
-Patch3: groff_1.18.1-15.diff
-Patch4: groff-1.18-info.patch
-Patch6: groff-1.18-pfbtops_cpp.patch
-Patch7: groff-1.18-gzip.patch
-Patch9: groff-1.18.1-fixminus.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-fix15.patch
-Patch16: groff-1.18.1-devutf8.patch
-#Patch17: groff-1.18.1.3-revision.patch
-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-gcc41.patch
-#Patch22: groff-1.18.1.1-bigendian.patch
-Patch23: groff-1.18.1.1-spacefix.patch
-Patch24: groff-1.18.1.4-sectmp.patch
-Patch25: groff-1.18.1.4-grofferpath.patch
-Patch26: groff-1.18.1.4-gcc4.3.0.patch
+Patch2: groff_1.18.1-15.diff
+Patch3: groff-1.18-info.patch
+Patch4: groff-1.18-pfbtops_cpp.patch
+Patch5: groff-1.18-gzip.patch
+Patch6: groff-1.18.1-fixminus.patch
+Patch7: groff-1.18.1-8bit.patch
+Patch8: groff-1.18.1-korean.patch
+Patch9: groff-1.18.1-gzext.patch
+Patch10: groff-1.18.1-fix15.patch
+Patch11: groff-1.18.1-devutf8.patch
+Patch12: groff-1.18.1.1-do_char.patch
+Patch13: groff-1.18.1.1-spacefix.patch
+Patch14: groff-1.18.1.4-sectmp.patch
+Patch15: groff-1.18.1.4-gcc4.3.0.patch
+Patch16: groff-groffer.patch
Requires: mktemp
Requires: /sbin/install-info
@@ -81,29 +75,22 @@ System display.
%prep
%setup -q -a 4
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch9 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1 -b .gzext
-#%patch14 -p1
-%patch15 -p1 -b .fix9
-%patch16 -p1 -b .devutf8
-#%patch17 -p1 -b .revision
-%patch18 -p1 -b .do_char
-#%patch19 -p1 -b .grn
-#%patch20 -p1 -b .tempfile
-#%patch21 -p1 -b .gcc41
-#%patch22 -p1 -b .bigendian
-%patch23 -p1 -b .spacefix
-%patch24 -p1 -b .sectmp
-%patch25 -p1 -b .grofferpath
-%patch26 -p1 -b .gcc43
+%patch1 -p1 -b .safer
+%patch2 -p1 -b .v15
+%patch3 -p1 -b .info
+%patch4 -p1 -b .pfbtops_cpp
+%patch5 -p1 -b .gzip
+%patch6 -p1 -b .fixminus
+%patch7 -p1 -b .8bit
+%patch8 -p1 -b .korean
+%patch9 -p1 -b .gzext
+%patch10 -p1 -b .fix15
+%patch11 -p1 -b .devutf8
+%patch12 -p1 -b .do_char
+%patch13 -p1 -b .spacefix
+%patch14 -p1 -b .sectmp
+%patch15 -p1 -b .gcc43
+%patch16 -p1 -b .groffer
for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \
src/devices/grolbp/grolbp.man; do
@@ -114,7 +101,7 @@ done
%build
#PATH=$PATH:%{_prefix}/X11R6/bin
#autoconf
-%configure --enable-multibyte
+%configure --enable-multibyte --libdir=%{_datadir}
# no html docs
make make_html=
(cd doc && makeinfo groff.texinfo)
@@ -142,7 +129,7 @@ make install make_html= make_install_html= \
infodir=%{buildroot}/%{_prefix}/info \
sysconfdir=%{buildroot}/etc \
includedir=%{buildroot}/usr/include \
- libdir=%{buildroot}/%{_libdir} \
+ libdir=%{buildroot}/%{_datadir} \
libexecdir=%{buildroot}/usr/libexec \
localstatedir=%{buildroot}/var \
sharedstatedir=%{buildroot}/usr/com \
@@ -179,15 +166,11 @@ install -pm 755 %SOURCE7 $RPM_BUILD_ROOT%{_bindir}/nroff
ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac
# installed, but not packaged in rpm
mkdir -p $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/groffer/
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/symbol.sed
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devdvi/generate/CompileFonts
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/afmname
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/groff/groffer/version.sh
-mv $RPM_BUILD_ROOT%{_libdir}/groff/groffer/* $RPM_BUILD_ROOT/%{_datadir}/groff/%{version}/groffer/
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/font/devps/generate/symbol.sed
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/font/devdvi/generate/CompileFonts
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/font/devps/generate/afmname
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/groffer/version.sh
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_prefix}/lib/X11/app-defaults
-rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/groffer
-rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/site-tmac
-rm -rf $RPM_BUILD_ROOT%{_libdir}/groff
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -224,7 +207,10 @@ exit 0
%endif
%changelog
-* Wed Feb 3 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.18.1.4-19
+* Wed Apr 6 2010 Jan Vcelak <jvcelak@redhat.com> - 1.18.1.4-20
+- Fixes not working groffer (#468102).
+
+* Wed Feb 3 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.18.1.4-19
- Move grog to main package, add main package dependency to -perl (#468102).
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.18.1.4-18