groff:

- update to 1.21
- drop cjk patch (1.20.1-1)
- add upstream patches
- do not generate html docs


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3238 ec354946-7b23-47d6-9f5a-488ba84defc7

g/groff/groff-vl.spec

@@ -1,4 +1,3 @@
-%define ver 1.18.1
 # clean old caches when groff =< %{cache_clean_ver}
 # is uninstalled.
 %define cache_clean_ver 1.18.1.1-4%{?_dist_release}
@@ -6,29 +5,41 @@
 Summary: A document formatting system.
 Summary(ja): GNU groff 日本語対応版
 Name: groff
-Version: 1.18.1.1
+Version: 1.21
-Release: 5%{?_dist_release}
+Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/Publishing
-
+URL: http://groff.ffii.org
-Vendor: Project Vine
-Distribution: Vine Linux
 
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
-Source1: troff-to-ps.fpi
+
-Source2: groff-tmac-ja.tar.gz
+#
+Patch2: groff-makefile-typo.patch
+Patch3: groff-manpages-typos.patch
+#
+Patch5: groff-1.21-pic-eqn-warnings.patch
+Patch6: groff-1.21-grotty-no-sgr.patch
+Patch7: groff-1.21-m-syntax.patch
+
 # Japanese Patch from Debian
-Patch1: groff_1.18.1.1-20.diff.gz
+Patch10: groff-1.18.1.1-fix-minus-char.patch
-Patch2: groff-1.18.1.1-fix-minus-char.patch
+
+#
+Patch20: groff-1.21-no-doc.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libX11-devel, libICE-devel, libSM-devel, libXext-devel
 BuildRequires: libXmu-devel, libXpm-devel, libXt-devel
 BuildRequires: libXaw-devel >= 1.0.5
 BuildRequires: psutils, byacc, imake, netpbm-progs, ghostscript
-Requires(post,preun): install-info
+Requires(post): install-info
+Requires(preun): install-info
+Requires(triggerpostun): findutils
 Obsoletes: groff-tools
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
 
 %description
 Groff is a document formatting system.  Groff takes standard text and
@@ -76,131 +87,137 @@ need to install the groff package and the X Window System.
 
 
 %prep
-%setup -q -n groff-%{version}
+%setup -q
-%patch1 -p1 -b .debian
-%patch2 -p0 -b .fix-minus
 
+%patch2 -p1 -b .makefile-typo
+%patch3 -p1 -b .manpages-typos
 
-%build
+%patch5 -p1 -b .pic-eqn-warnings
-PATH=$PATH:/usr/X11R6/bin
+%patch6 -p1 -b .grotty-no-sgr
-#autoconf
+%patch7 -p1 -b .m-syntax
-#configure --enable-japanese
+
-%configure --enable-multibyte
+%patch10 -p0 -b .fix-minus
-make
 
-cd src/xditview
+%patch20 -p1 -b .no-doc
-xmkmf
-make
-cd ../..
 
+for file in NEWS src/devices/grolbp/grolbp.man doc/{groff.info*,webpage.ms} \
+            contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom}
+do
+    iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
+    mv "${file}_" "$file"
+done
+
+
+%build
+export PAGE=A4
+export YACC='bison -y'
+%configure --with-appresdir=%{_datadir}/X11/app-defaults
+%{__make}
+
+GROFF_NO_SGR=1 %{__make} -C doc meintro.txt meref.txt pic.txt
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-PATH=$PATH:/usr/X11R6/bin
+
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
+%{__make} install DESTDIR=%{buildroot} \
-mkdir -p $RPM_BUILD_ROOT%{_mandir}
+                  docdir=%{_docdir}/%{name}-%{version} \
-%makeinstall manroot=$RPM_BUILD_ROOT%{_mandir}
+                  groffer_dir=%{_datadir}/%{name}/%{version}/groffer
-
+
-# install xditview
+# some binaries need alias with 'g' or 'z' prefix
-cd src/xditview
+
-make install DESTDIR=$RPM_BUILD_ROOT
+for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} ; do
-cd ../..
+        ln -s ${file#?} %{buildroot}%{_bindir}/${file}
-
+        ln -s ${file#?}.1.gz %{buildroot}%{_mandir}/man1/${file}.1.gz
-# for groff-ja
+done
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/groff/%{ver}
+		
-#tar xzf %{SOURCE2} -C $RPM_BUILD_ROOT%{_datadir}/groff/%{ver}
+# perl dependent files in /usr/bin will be in separate package
-
+
-ln -s s.tmac	$RPM_BUILD_ROOT%{_datadir}/groff/%{ver}/tmac/tmac.gs
+rm -f files-perl files-nonperl
-ln -s mse.tmac  $RPM_BUILD_ROOT%{_datadir}/groff/%{ver}/tmac/tmac.gmse
+for file in %{buildroot}%{_bindir}/*; do
-ln -s m.tmac	$RPM_BUILD_ROOT%{_datadir}/groff/%{ver}/tmac/tmac.gm
+        # package selection
-ln -s troff	$RPM_BUILD_ROOT%{_bindir}/gtroff
+        if grep -q -m1 '^#!.*\<perl\>' $file; then
-ln -s tbl	$RPM_BUILD_ROOT%{_bindir}/gtbl
+                output_file=files-perl
-ln -s pic	$RPM_BUILD_ROOT%{_bindir}/gpic
+        else
-ln -s eqn	$RPM_BUILD_ROOT%{_bindir}/geqn
+                output_file=files-nonperl
-ln -s neqn	$RPM_BUILD_ROOT%{_bindir}/gneqn
+        fi
-ln -s refer	$RPM_BUILD_ROOT%{_bindir}/grefer
+
-ln -s lookbib	$RPM_BUILD_ROOT%{_bindir}/glookbib
+        echo %{_bindir}/$(basename $file) >> $output_file
-ln -s indxbib	$RPM_BUILD_ROOT%{_bindir}/gindxbib
+
-ln -s soelim	$RPM_BUILD_ROOT%{_bindir}/gsoelim
+        # manpage availability
-ln -s soelim    $RPM_BUILD_ROOT%{_bindir}/zsoelim
+        manfile=%{buildroot}%{_mandir}/man1/$(basename $file).\*
-ln -s nroff	$RPM_BUILD_ROOT%{_bindir}/gnroff
+        if [ -f $manfile -o -L $manfile ]; then
-
+                echo %{_mandir}/man1/$(basename $file).\* >> $output_file
-# whether or not build system is compressing man-pages
+        fi
-ln -s eqn.1	%{buildroot}%{_mandir}/man1/geqn.1
+done
-ln -s indxbib.1 %{buildroot}%{_mandir}/man1/gindxbib.1
+
-ln -s lookbib.1 %{buildroot}%{_mandir}/man1/glookbib.1
+# install info
-ln -s neqn.1	%{buildroot}%{_mandir}/man1/gneqn.1
+install -d $RPM_BUILD_ROOT%{_infodir}
-ln -s nroff.1   %{buildroot}%{_mandir}/man1/gnroff.1
+install -m644 doc/groff.info* $RPM_BUILD_ROOT%{_infodir}
-ln -s pic.1 	%{buildroot}%{_mandir}/man1/gpic.1
+
-ln -s refer.1   %{buildroot}%{_mandir}/man1/grefer.1
+# remove unnecessary files and fix privileges
-ln -s soelim.1  %{buildroot}%{_mandir}/man1/gsoelim.1
+rm -f %{buildroot}%{_infodir}/dir
-ln -s soelim.1  %{buildroot}%{_mandir}/man1/zsoelim.1
+
-ln -s tbl.1 	%{buildroot}%{_mandir}/man1/gtbl.1
+chmod 755 %{buildroot}%{_datadir}/groff/%{version}/groffer/version.sh
-ln -s troff.1   %{buildroot}%{_mandir}/man1/gtroff.1
+chmod 755 %{buildroot}%{_datadir}/groff/%{version}/font/devlj4/generate/special.awk
-
+
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/rhs/rhs-printfilters
+rm -f %{buildroot}%{_bindir}/zsoelim
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rhs/rhs-printfilters
+rm -f %{buildroot}%{_mandir}/man1/zsoelim.1*
-
-# document files
-mkdir -p docs-to-install
-cp -pr $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/%{ver}/* docs-to-install
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
-
-# 
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -rf $RPM_BUILD_ROOT/%{_prefix}/lib/X11/app-defaults
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
+
 %post
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/groff.gz
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/groff.info.gz ||:
+
 
 %preun
 if [ "$1" = 0 ]; then
     /sbin/install-info --delete \
-	--info-dir=%{_infodir} %{_infodir}/groff.gz
+	--info-dir=%{_infodir} %{_infodir}/groff.info.gz ||:
 fi
 
 %triggerpostun -- %{name} <= %{cache_clean_ver}
 find %{_var}/cache/man -type f -name "*.bz2" -exec %{__rm} -f {} \;
 
-# -f groff-files
+%files -f files-nonperl
-%files 
 %defattr(-,root,root)
-%doc BUG-REPORT COPYING ChangeLog NEWS PROBLEMS README TODO
+%doc BUG-REPORT COPYING FDL LICENSES MORE.STUFF NEWS PROBLEMS
-%doc README.jp ChangeLog.jp docs-to-install/* 
+%doc doc/*.txt
-%{_bindir}/*
+%{_datadir}/groff/
+# manpages for binaries are covered by -f
+%{_mandir}/man1/grohtml.*
+%{_mandir}/man5/*
+%{_mandir}/man7/*
+%{_infodir}/groff.info*
+%exclude %{_datadir}/groff/%{version}/groffer
 %exclude %{_bindir}/gxditview
-%{_datadir}/groff
+%exclude %{_bindir}/xtotroff
-%{_libdir}/rhs/*/*
+%exclude %{_mandir}/man1/gxditview.*
-%{_mandir}/man?/*
+%exclude %{_mandir}/man1/xtotroff.*
-%{_infodir}/*
+
-%exclude %{_bindir}/afmtodit
+
-%exclude %{_bindir}/grog
+%files perl -f files-perl
-%exclude %{_bindir}/mmroff
-%exclude %{_mandir}/man1/afmtodit.*
-%exclude %{_mandir}/man1/grog.*
-%exclude %{_mandir}/man1/mmroff.*
-
-
-%files perl
 %defattr(-,root,root)
-%{_bindir}/afmtodit
+%{_datadir}/groff/%{version}/groffer/
-%{_bindir}/grog
-%{_bindir}/mmroff
-%{_mandir}/man1/afmtodit.*
-%{_mandir}/man1/grog.*
-%{_mandir}/man1/mmroff.*
 
 
 %files gxditview
 %defattr(-,root,root)
 %{_bindir}/gxditview
-%config %{_sysconfdir}/X11/app-defaults/GXditview
+%{_bindir}/xtotroff
+%{_datadir}/X11/app-defaults/GXditview
+%{_datadir}/X11/app-defaults/GXditview-color
+%{_mandir}/man1/gxditview.*
+%{_mandir}/man1/xtotroff.*
 
 
 %changelog
+* Tue Mar 31 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.21-1
+- new upstream release
+- drop all cjk patch
+- add patch2,3 to fix typo
+
 * Fri Apr 02 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 1.18.1.1-5
 - add %posttriggerun to clean old caches (<BTS:VineLinux:960>)