the new docs system generates PDFs, so we can stop

This commit is contained in:
Nalin Dahyabhai 2012-11-15 15:14:28 -05:00
parent 03522e1559
commit d86f9ffaaf
2 changed files with 2 additions and 77 deletions

View File

@ -1,55 +0,0 @@
#!/bin/sh
# Based on Enrico's snippet for using pdflatex for building PDFs, except we're
# switching to pregenerating the docs for the SRPM so that we don't get
# different contents when we build on multiple build machines and architectures
# (timestamps and IDs change, and even some of the compressed content looks
# different). The filename and checksum are used to verify that the PDF always
# matches the doc which was used to generate it, and we flag an error if that
# isn't the case.
create() {
pushd "$1" > /dev/null
touch "$2".ind
pdflatex "$2"
test ! -e "$2".idx || makeindex ${3:+-s "$3".ist} "$2".idx
pdflatex "$2"
pdflatex "$2"
sum=`sha1sum "$2".tex | sed 's,[[:blank:]].*,,g'`
sed -ri \
-e 's|^/ID \[<.{32}> <.{32}>\]|/ID [<'"$1/$2"'> <'"$sum"'>]|g' \
"$2".pdf
popd > /dev/null
}
check() {
pushd "$1" > /dev/null
sum=`sha1sum "$2".tex | sed 's, .*,,g'`
id=`sed -rn -e '/^\/ID \[<[^>]*> <[^>]*>\]/p' "$2".pdf`
filename=`echo "$id" | sed -r 's|^.*\[<([^>]*)> <([^>]*)>\].*|\1|g'`
checksum=`echo "$id" | sed -r 's|^.*\[<([^>]*)> <([^>]*)>\].*|\2|g'`
echo $filename
echo $checksum $sum
popd > /dev/null
test "$filename" = "$1/$2" && test "$checksum" = "$sum"
}
mode=$1
case $mode in
create)
while read subdir doc style ; do
if ! create $subdir $doc $style ; then
exit 1
fi
done
;;
check)
while read subdir doc style ; do
if ! check $subdir $doc $style ; then
exit 1
fi
done
;;
esac
exit 0

View File

@ -42,10 +42,6 @@ Source10: kdc.conf
Source11: kadm5.acl
Source19: krb5kdc.sysconfig
Source20: kadmin.sysconfig
# The same source files we "check", generated with "krb5-tex-pdf.sh create"
# and tarred up.
Source23: krb5-%{version}-pdf.tar.xz
Source24: krb5-tex-pdf.sh
Source25: krb5-1.10-manpaths.txt
Source29: ksu.pamd
Source30: kerberos-iv.portreserve
@ -280,18 +276,8 @@ ln -s NOTICE LICENSE
%patch112 -p1 -b .timeout_over
rm src/lib/krb5/krb/deltat.c
gzip doc/*.ps
sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
sed -i -e '1c\
\\documentclass{article}\
\\usepackage{fixunder}\
\\usepackage{functions}\
\\usepackage{fancyheadings}\
\\usepackage{hyperref}' doc/implement/implement.tex
# Take the execute bit off of documentation.
chmod -x doc/krb5-protocol/*.txt doc/*.html doc/*/*.html
chmod -x doc/krb5-protocol/*.txt
# Rename the man pages so that they'll get generated correctly. Uses the
# "krb5-1.8-manpaths.txt" source file.
@ -303,13 +289,6 @@ if test -z "%{?_rawbuild}" ; then
popd
fi
# Check that the PDFs we built earlier match this source tree, using the
# "krb5-tex-pdf.sh" source file.
sh %{SOURCE24} check << EOF
doc/api library krb5
doc/implement implement
EOF
# Generate an FDS-compatible LDIF file.
inldif=src/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif
cat > 60kerberos.ldif << EOF
@ -851,6 +830,7 @@ exit 0
- drop backported patch for RT #7406
- drop backported patch for RT #7407
- drop backported patch for RT #7408
- the new docs system generates PDFs, so stop including them
* Wed Oct 17 2012 Nalin Dahyabhai <nalin@redhat.com> 1.10.3-7
- tag a couple of other patches which we still need to be applied during