rpms/htmldoc/EL-4 htmldoc.spec, 1.13, 1.14 htmldoc-1.8.27-dingbats-standard.patch, 1.1, NONE htmldoc-1.8.27-system-fonts.patch, 1.1, NONE
Adam Goode
agoode at fedoraproject.org
Sat Feb 14 05:00:29 UTC 2009
Author: agoode
Update of /cvs/extras/rpms/htmldoc/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25086
Modified Files:
htmldoc.spec
Removed Files:
htmldoc-1.8.27-dingbats-standard.patch
htmldoc-1.8.27-system-fonts.patch
Log Message:
Synchronize with EL-5 specfile and adjust BuildRequires
Index: htmldoc.spec
===================================================================
RCS file: /cvs/extras/rpms/htmldoc/EL-4/htmldoc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- htmldoc.spec 11 Feb 2009 18:02:25 -0000 1.13
+++ htmldoc.spec 14 Feb 2009 04:59:58 -0000 1.14
@@ -1,7 +1,7 @@
Name: htmldoc
Version: 1.8.27
-Release: 9%{?dist}
-Summary: Converter from HTML into indexed HTML, PostScript, or PDF
+Release: 7%{?dist}.1
+Summary: Convert HTML source files into HTML, PostScript, or PDF
Group: Applications/Publishing
@@ -13,18 +13,10 @@
Source: http://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.tar.bz2
Patch0: htmldoc-1.8.27-desktop-icon.patch
-Patch1: htmldoc-1.8.27-dingbats-standard.patch
-Patch2: htmldoc-1.8.27-system-fonts.patch
BuildRequires: openssl-devel libjpeg-devel libpng-devel zlib-devel
-BuildRequires: fltk-devel libXpm-devel desktop-file-utils
-BuildRequires: dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-serif-fonts
-BuildRequires: urw-fonts fontpackages-devel
-BuildRequires: ttf2pt1 t1utils
-
-Requires: dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-serif-fonts
-Requires: urw-fonts
-Requires: ttf2pt1 t1utils
+BuildRequires: fltk-devel xorg-x11-devel desktop-file-utils
+#Requires:
%description
@@ -45,57 +37,9 @@
# fix up hardcoded documentation path
sed -i 's/\(\$prefix\/share\/doc\/htmldoc\)/\1-%{version}/g' configure
-# fix desktop icon (http://www.htmldoc.org/str.php?L169)
+# fix desktop icon (upstream bug STR #169)
%patch0 -p1 -b .desktop-icon
-# make Dingbats standard (http://www.htmldoc.org/str.php?L198)
-%patch1 -p1 -b .dingbats
-
-# use Fedora system fonts (http://www.htmldoc.org/str.php?L196)
-%patch2 -p1 -b .system-fonts
-cd fonts
-rm -f *.pfa *.afm
-ln -s %{_fontbasedir}/default/Type1/n022003l.afm Courier.afm
-ln -s %{_fontbasedir}/default/Type1/n022004l.afm Courier-Bold.afm
-ln -s %{_fontbasedir}/default/Type1/n022024l.afm Courier-BoldOblique.afm
-ln -s %{_fontbasedir}/default/Type1/n022024l.pfb Courier-BoldOblique.pfb
-ln -s %{_fontbasedir}/default/Type1/n022004l.pfb Courier-Bold.pfb
-ln -s %{_fontbasedir}/default/Type1/n022023l.afm Courier-Oblique.afm
-ln -s %{_fontbasedir}/default/Type1/n022023l.pfb Courier-Oblique.pfb
-ln -s %{_fontbasedir}/default/Type1/n022003l.pfb Courier.pfb
-ln -s %{_fontbasedir}/default/Type1/d050000l.afm Dingbats.afm
-ln -s %{_fontbasedir}/default/Type1/d050000l.pfb Dingbats.pfb
-ln -s %{_fontbasedir}/default/Type1/n019003l.afm Helvetica.afm
-ln -s %{_fontbasedir}/default/Type1/n019004l.afm Helvetica-Bold.afm
-ln -s %{_fontbasedir}/default/Type1/n019024l.afm Helvetica-BoldOblique.afm
-ln -s %{_fontbasedir}/default/Type1/n019024l.pfb Helvetica-BoldOblique.pfb
-ln -s %{_fontbasedir}/default/Type1/n019004l.pfb Helvetica-Bold.pfb
-ln -s %{_fontbasedir}/default/Type1/n019023l.afm Helvetica-Oblique.afm
-ln -s %{_fontbasedir}/default/Type1/n019023l.pfb Helvetica-Oblique.pfb
-ln -s %{_fontbasedir}/default/Type1/n019003l.pfb Helvetica.pfb
-ln -s %{_fontbasedir}/default/Type1/s050000l.afm Symbol.afm
-ln -s %{_fontbasedir}/default/Type1/s050000l.pfb Symbol.pfb
-ln -s %{_fontbasedir}/default/Type1/n021004l.afm Times-Bold.afm
-ln -s %{_fontbasedir}/default/Type1/n021024l.afm Times-BoldItalic.afm
-ln -s %{_fontbasedir}/default/Type1/n021024l.pfb Times-BoldItalic.pfb
-ln -s %{_fontbasedir}/default/Type1/n021004l.pfb Times-Bold.pfb
-ln -s %{_fontbasedir}/default/Type1/n021023l.afm Times-Italic.afm
-ln -s %{_fontbasedir}/default/Type1/n021023l.pfb Times-Italic.pfb
-ln -s %{_fontbasedir}/default/Type1/n021003l.afm Times-Roman.afm
-ln -s %{_fontbasedir}/default/Type1/n021003l.pfb Times-Roman.pfb
-ln -s %{_fontbasedir}/dejavu/DejaVuSans-BoldOblique.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSans-Bold.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSansMono-BoldOblique.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSansMono-Bold.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSansMono-Oblique.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSansMono.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSans-Oblique.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSans.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSerif-BoldItalic.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSerif-Bold.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSerif-Italic.ttf
-ln -s %{_fontbasedir}/dejavu/DejaVuSerif.ttf
-
%build
%configure
@@ -121,8 +65,8 @@
cp -a desktop/htmldoc.xml ${RPM_BUILD_ROOT}%{_datadir}/mime/packages
# desktop file
-desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+desktop-file-install --vendor fedora \
+ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--remove-category=X-Red-Hat-Base \
--add-mime-type=application/vnd.htmldoc-book \
desktop/htmldoc.desktop
@@ -132,7 +76,7 @@
# scriptlet for icons
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# scriptlet for MIME
@@ -146,7 +90,7 @@
# scriptlet for icons
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# scriptlet for MIME
@@ -173,12 +117,8 @@
%changelog
-* Tue Feb 10 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-9
-- Patch to specify Dingbats as a standard PS and PDF font
-- Use system fonts to conform to new font guidelines (#477397)
-
-* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.27-8
-- rebuild with new openssl
+* Fri Feb 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-7.1
+- Update BuildRequires for EL-4
* Sat Aug 30 2008 Adam Goode <adam at spicenitz.org> - 1.8.27-7
- RPM 4.6 fix for patch tag
--- htmldoc-1.8.27-dingbats-standard.patch DELETED ---
--- htmldoc-1.8.27-system-fonts.patch DELETED ---
More information about the fedora-extras-commits
mailing list