- remove dvipng, it's now packaged separately (#431356)

texlive.spec

@@ -1,5 +1,6 @@
 # This spec file is based on texjive project created by Michael A. Peters.
 # Adopted and modified for Fedora by Jindrich Novy.
+%define f8_packaging 0
 
 %define texlive_ver	2007
 %define	ptex_src_ver	3.1.10
@@ -7,13 +8,14 @@
 %define	mendexk_ver	2.6e
 %define dvipdfm_ver	0.13.2d
 %define dvipdfmx_ver	0
+%if %{f8_packaging}
 %define dvipng_ver	1.9
+%endif
 
 %define desktop_file_utils_version 0.9
 %define default_letter_paper 0
 # lcdf typetools can be easily built as a separate tool, so it should be
 %define disable_lcdf_typetools 1
-%define f8_packaging 0
 
 # These need to match what is in the texlive-texmf package.
 #  since texlive-texmf is a BuildRequires, it installs an rpm macro
@@ -25,7 +27,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	18%{?dist}
+Release:	19%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -339,6 +341,7 @@ symbolic link.
 You only need to install this package if you will be compiling software that
 wants to link against the kpathsea library.
 
+%if %{f8_packaging}
 %package -n dvipng
 Summary: DVI-to-PNG converter
 Version: %{dvipng_ver}
@@ -349,6 +352,7 @@ Group: Applications/Publishing
 %description -n dvipng
 This program makes PNG and/or GIF graphics from DVI files as obtained 
 from TeX and its relatives.
+%endif
 
 %package -n mendexk
 Summary: Replacement for makeindex with many enhancements
@@ -706,6 +710,12 @@ rm %{buildroot}%{_bindir}/afm2pl %{buildroot}%{_mandir}/man1/afm2pl.1*
 # remove unused ConTeXt stuff
 rm %{buildroot}%{_mandir}/man1/texfind.1* %{buildroot}%{_mandir}/man1/fdf2tex.1*
 
+%if !%{f8_packaging}
+# remove dvipng, it's now packaged separately (#431356)
+rm %{buildroot}%{_bindir}/dvipng %{buildroot}%{_mandir}/man1/dvipng.1* %{buildroot}%{_infodir}/dvipng.info*
+%endif
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -738,8 +748,10 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/kpathsea.info.gz %{_infodir}/dir || :
 
+%if %{f8_packaging}
 %post -n dvipng
 [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/dvipng.info.gz %{_infodir}/dir || :
+%endif
 
 
 %preun
@@ -752,10 +764,12 @@ if [ "$1" = 0 ]; then
   [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/dvips.info.gz %{_infodir}/dir || :
 fi
 
+%if %{f8_packaging}
 %preun -n dvipng
 if [ "$1" = 0 ]; then
   [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/dvipng.info.gz %{_infodir}/dir || :
 fi
+%endif
 
 %preun latex
 if [ "$1" = 0 ]; then
@@ -1093,11 +1107,13 @@ fi
 #  against the shared. I can't name any, but so i hear.
 %{_libdir}/libkpathsea.a
 
+%if %{f8_packaging}
 %files -n dvipng
 %defattr(-,root,root,-)
 %{_bindir}/dvipng
 %{_mandir}/man1/dvipng.1*
 %{_infodir}/dvipng.info*
+%endif
 
 %files -n mendexk
 %defattr(-,root,root,-)
@@ -1203,6 +1219,9 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Thu Feb 21 2008 Jindrich Novy <jnovy@redhat.com> - 2007-19
+- remove dvipng, it's now packaged separately (#431356)
+
 * Tue Feb 19 2008 Jindrich Novy <jnovy@redhat.com> - 2007-18
 - package ConTeXt separately to get rid of the ruby dependency
 - fix summary for texlive-japanese