rpms/linuxdoc-tools/devel linuxdoc-tools.spec,1.41,1.42

[Ondrej Vasik]

Author: ovasik

Update of /cvs/pkgs/rpms/linuxdoc-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12357

Modified Files:
	linuxdoc-tools.spec 
Log Message:
 Merge review changes(#226098) - ship more docs, remove unnecessary things, require 5.10.1 perl for directory,  structure


Index: linuxdoc-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxdoc-tools/devel/linuxdoc-tools.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- linuxdoc-tools.spec	18 Dec 2009 09:37:43 -0000	1.41
+++ linuxdoc-tools.spec	2 Feb 2010 13:04:52 -0000	1.42
@@ -3,7 +3,7 @@
 Summary: A text formatting package based on SGML
 Name: linuxdoc-tools
 Version: 0.9.66
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Copyright only
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
@@ -12,7 +12,11 @@ Patch1: linuxdoc-tools-0.9.20-lib64.patc
 Url: http://packages.qa.debian.org/l/linuxdoc-tools.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex sgml-common jade gawk groff autoconf texinfo
+#need actual perl directory structure
+BuildRequires: perl >= 4:5.10.1
 Requires: jade gawk groff
+Requires(post): %{_bindir}/texconfig-sys
+Requires(postun): %{_bindir}/texconfig-sys
 # this should anyway be only a "suggest"
 %if %{tetex}
 Requires: tex(latex)
@@ -36,7 +40,7 @@ documentation.
 %patch1 -p1 -b .lib64
 
 %build
-%configure --with-installed-nsgmls --with-installed-iso-entities
+%configure --with-installed-iso-entities
 # Packaging brain-damage
 pushd entity-map
 autoconf
@@ -55,6 +59,15 @@ make install DESTDIR=$RPM_BUILD_ROOT per
 mv $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 perl -pi -e 's,/usr/share/sgml/iso-entities-8879.1986/iso-entities.cat,\$main::prefix/share/sgml/sgml-iso-entities-8879.1986/catalog,' \
            $RPM_BUILD_ROOT$installvendorlib/LinuxDocTools.pm
+#Copy license files for parts into docdir
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sgmls-1.1
+cp -pr sgmls-1.1/LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sgmls-1.1/LICENSE
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/iso-entities
+cp -pr iso-entities/COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/iso-entities/COPYING
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/entity-map
+cp -pr entity-map/COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/entity-map/COPYING
+cp -pr COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+
 
 # Some files need moving around.
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/epsf.*
@@ -63,22 +76,15 @@ install -d $RPM_BUILD_ROOT%{_datadir}/te
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*.sty \
   $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/misc
 
-cat > doc/COPYRIGHT <<EOF
-(C) International Organization for Standardization 1986
-Permission to copy in any form is granted for use with
-conforming SGML systems and applications as defined in
-ISO 8879, provided this notice is included in all copies.
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+%{_bindir}/texconfig-sys rehash 2> /dev/null || :
 exit 0
 
 %postun
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+%{_bindir}/texconfig-sys rehash 2> /dev/null || :
 exit 0
 
 %files
@@ -96,6 +102,11 @@ exit 0
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 02 2010 Ondrej Vasik <ovasik at redhat.com> 0.9.66-5
+- Merge review changes(#226098) - ship more docs, remove
+  unnecessary things, require 5.10.1 perl for directory
+  structure
+
 * Fri Dec 18 2009 Ondrej Vasik <ovasik at redhat.com> 0.9.66-4
 - fix perl5 dir paths