rpms/texlive/devel texlive.spec, 1.38, 1.39 texlive-2007-dvipdfm-security.patch, 1.1, NONE texlive-2007-kuesterei-man.patch, 1.1, NONE texlive-dvipdfm_timezone.patch, 1.1, NONE

Jindrich Novy (jnovy) fedora-extras-commits at redhat.com
Mon May 12 14:38:34 UTC 2008


Author: jnovy

Update of /cvs/extras/rpms/texlive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3370

Modified Files:
	texlive.spec 
Removed Files:
	texlive-2007-dvipdfm-security.patch 
	texlive-2007-kuesterei-man.patch 
	texlive-dvipdfm_timezone.patch 
Log Message:
* Mon May 12 2008 Jindrich Novy <jnovy at redhat.com> - 2007-31
- don't build/package dvipdfm, it's now packaged separately (#445983),
  thanks to Jonathan Underwood
- remove F8 related chunks from spec



Index: texlive.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- texlive.spec	5 May 2008 18:03:04 -0000	1.38
+++ texlive.spec	12 May 2008 14:37:58 -0000	1.39
@@ -1,15 +1,10 @@
 # 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
 %define pdvipsk_ver	p1.7a
 %define mendexk_ver	2.6e
-%define dvipdfm_ver	0.13.2d
-%if %{f8_packaging}
-%define dvipng_ver	1.9
-%endif
 
 %define desktop_file_utils_version 0.9
 %define default_letter_paper 0
@@ -26,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	30%{?dist}
+Release:	31%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -68,7 +63,6 @@
 # TeX patches
 ######
 
-Patch10:	texlive-2007-dvipdfm-security.patch
 Patch11:	texlive-2007-makej.patch
 Patch12:	texlive-2007-badscript.patch
 Patch17:	texlive-2007-tmpcleanup.patch
@@ -85,7 +79,6 @@
 # mpeters contributed patches
 ######
 # fixes man pages to utf-8
-Patch41:	texlive-2007-kuesterei-man.patch
 Patch42:	texlive-2007-copyright-utf8-man.patch
 # use proper shellbang
 Patch43:	texlive-2007-epstopdf-shellbang.patch
@@ -106,7 +99,6 @@
 Patch115:	texlive-maketexmf.patch
 Patch117:	texlive-fmtutil_keep_failedlog.patch
 Patch119:	texlive-checklib_fixes.patch
-Patch120:	texlive-dvipdfm_timezone.patch
 Patch123:	texlive-fix_makempx_installation.patch
 
 ######
@@ -138,11 +130,7 @@
 BuildRequires:	libSM-devel libICE-devel
 # for non-modular xorg - use xorg-devel instead of above
 BuildRequires:	Xaw3d-devel
-%if %{f8_packaging}
-BuildRequires:	poppler-devel >= 0.6.2-1
-%else
 BuildRequires:	poppler-devel >= 0.6.2-2
-%endif
 BuildRequires:	teckit-devel
 Requires:	texlive-texmf = %{version}
 Requires:	texlive-texmf-fonts = %{version}
@@ -356,20 +344,6 @@
 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}
-Group: Applications/Publishing
-Requires(post,preun,postun): /sbin/restorecon
-#Url: http://savannah.nongnu.org/projects/dvipng/
-#Source0: http://download.savannah.gnu.org/releases/dvipng/dvipng-%{dvipng_ver}.tar.gz
-
-%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
 Group: Applications/Publishing
@@ -380,20 +354,6 @@
 %description -n mendexk
 Replacement for makeindex with many enhancements.
 
-%package -n dvipdfm
-Summary: DVI to PDF translator
-Version: %{dvipdfm_ver}
-Group: Applications/Publishing
-#Url: http://gaspra.kettering.edu/dvipdfm/
-#Source0: http://gaspra.kettering.edu/dvipdfm/dvipdfm-%{dvipdfm_ver}.tar.gz
-# for dvipdft
-Requires: ghostscript
-# for .enc files
-Requires: texlive-texmf-dvips = %{texlive_ver}
-
-%description -n dvipdfm
-DVI to PDF translator.
-
 # without this define, the version is overriden by separated subpackages
 # versions
 %define version %{texlive_ver}
@@ -418,8 +378,6 @@
 # TeX patches
 ######
 
-# Don't use tmpnam() in dvipdfm.
-%patch10 -p1 -b .dvipdfm-security
 # Fix parallel builds.
 %patch11 -p1 -b .makej
 # Don't use PID for temporary file names in scripts (RH bug #41269)
@@ -439,7 +397,6 @@
 %patch29 -p1 -b .man-context
 
 # fix non utf man pages
-%patch41 -p1 -b .notutf8
 %patch42 -p1 -b .notutf8-2
 # user a proper shellbang
 %patch43 -p1 -b .perl
@@ -457,7 +414,6 @@
 %patch115 -p3
 %patch117 -p3
 %patch119 -p3
-%patch120 -p3
 %patch123 -p3
 
 %patch202 -p1 -b .pdftex
@@ -552,11 +508,10 @@
 	--without-xdvik \
 	--with-mf-x-toolkit=yes \
 	--without-cxx-runtime-hack \
-%if !%{f8_packaging}
 	--without-dvipng \
+	--without-dvipdfm \
 	--without-dvipdfmx \
 	--without-xdvipdfmx
-%endif
 
 # Remove everything except:
 # icu: includes some changes
@@ -770,13 +725,6 @@
 [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
 :
 
-%if %{f8_packaging}
-%post -n dvipng
-[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/dvipng.info.gz %{_infodir}/dir
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
-:
-%endif
-
 
 %preun
 if [ "$1" = 0 ]; then
@@ -791,15 +739,6 @@
 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
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
-:
-%endif
-
 %preun latex
 if [ "$1" = 0 ]; then
   [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/latex.info.gz %{_infodir}/dir
@@ -855,13 +794,6 @@
 [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
 :
 
-%if %{f8_packaging}
-%postun -n dvipng
-%{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
-:
-%endif
-
 %postun -n kpathsea
 /sbin/ldconfig
 [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
@@ -1186,29 +1118,12 @@
 #  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,-)
 %doc %{_texmf_main}/doc/mendexk-%{name}/
 %{_bindir}/mendex
 %{_mandir}/ja/man1/mendex.1*
 
-%files -n dvipdfm
-%defattr(-,root,root,-)
-%{_bindir}/ebb
-%{_bindir}/dvipdfm
-%{_bindir}/dvipdft
-%{_mandir}/man1/ebb.1*
-%{_mandir}/man1/dvipdfm.1*
-%{_mandir}/man1/dvipdft.1*
-
 %files east-asian
 %doc %{_texmf_main}/doc/pdvipsk/
 %doc %{_texmf_main}/doc/ptex/
@@ -1278,6 +1193,11 @@
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Mon May 12 2008 Jindrich Novy <jnovy at redhat.com> - 2007-31
+- don't build/package dvipdfm, it's now packaged separately (#445983),
+  thanks to Jonathan Underwood
+- remove F8 related chunks from spec
+
 * Mon May 05 2008 Jindrich Novy <jnovy at redhat.com> - 2007-30
 - fix SELinux contexts everywhere possible, don't allow restorecon
   to fail (#444922)


--- texlive-2007-dvipdfm-security.patch DELETED ---


--- texlive-2007-kuesterei-man.patch DELETED ---


--- texlive-dvipdfm_timezone.patch DELETED ---




More information about the fedora-extras-commits mailing list