rpms/texlive/devel texlive.spec, 1.15, 1.16 texlive-2007-pxdvi.patch, 1.1, NONE texlive-2007-xdvi-keepflag.patch, 1.1, NONE texlive-2007-xprint.patch, 1.1, NONE texlive-source-xdvi-numlock.patch, 1.1, NONE texlive-source-xdvizilla.patch, 1.1, NONE texlive-xdvi-maxchar.patch, 1.1, NONE texlive-xdvi.patch, 1.1, NONE vfontmap, 1.2, NONE xdvi48x48.png, 1.1, NONE xdvik-22.84.10-j1.34.patch, 1.1, NONE
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Tue Jan 15 13:40:23 UTC 2008
Author: jnovy
Update of /cvs/extras/rpms/texlive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5145
Modified Files:
texlive.spec
Removed Files:
texlive-2007-pxdvi.patch texlive-2007-xdvi-keepflag.patch
texlive-2007-xprint.patch texlive-source-xdvi-numlock.patch
texlive-source-xdvizilla.patch texlive-xdvi-maxchar.patch
texlive-xdvi.patch vfontmap xdvi48x48.png
xdvik-22.84.10-j1.34.patch
Log Message:
- don't build/package xdvik/pxdvik, it's now separated
- fix texlive-doc requires, description
- use virtual provides with parentheses to avoid clashes
with real packages (#410401)
Index: texlive.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- texlive.spec 14 Jan 2008 11:15:20 -0000 1.15
+++ texlive.spec 15 Jan 2008 13:37:53 -0000 1.16
@@ -8,7 +8,6 @@
%define dvipdfm_ver 0.13.2d
%define dvipdfmx_ver 0
%define dvipng_ver 1.9
-%define xdvi_ver 22.84.12
%define enable_japanese 1
@@ -27,7 +26,7 @@
Name: texlive
Version: %{texlive_ver}
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Binaries for the TeX formatting system
Group: Applications/Publishing
@@ -43,8 +42,6 @@
#Source1: xpdf-3.02.tar.bz2
Source10: texlive.cron
-# Source30 is http://xdvi.sourceforge.net/xdvi48x48.gif converted to png
-Source30: xdvi48x48.png
# Filter out bad requirements (RH bug #59819).
Source99: texlive-filter-requires.sh
Source100: texlive-generate-tarball.sh
@@ -53,7 +50,6 @@
Source1000: ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ptex-src-%{ptex_src_ver}.tar.gz
Source1001: ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/dvipsk-jpatch-%{pdvipsk_ver}.tar.bz2
Source1002: ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/mendexk%{mendexk_ver}.tar.gz
-Source1003: vfontmap
# Don't run brp-python-bytecompile
%define __os_install_post /usr/lib/rpm/redhat/brp-compress /usr/lib/rpm/redhat/brp-strip %{__strip} /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} %{nil}
@@ -64,7 +60,6 @@
# and sane defaults to build against can be inserted via sed
Patch5: texlive-2007-browser.patch
-Patch8: texlive-2007-xprint.patch
Patch9: texlive-teckit.patch
Patch21: texlive-more_paths.patch
@@ -77,12 +72,10 @@
Patch10: texlive-2007-dvipdfm-security.patch
Patch11: texlive-2007-makej.patch
Patch12: texlive-2007-badscript.patch
-Patch15: texlive-2007-xdvi-keepflag.patch
Patch17: texlive-2007-tmpcleanup.patch
Patch19: texlive-2007-kpse-extensions.patch
Patch20: texlive-CVE-2007-4033.patch
Patch23: texlive-CVE-2007-4352-5392-5393.patch
-Patch24: texlive-xdvi-maxchar.patch
Patch25: texlive-dvipsoverflow.patch
Patch26: texlive-dviljktemp.patch
Patch27: texlive-poppler.patch
@@ -108,7 +101,6 @@
Patch107: texlive-12d_fix_ebong_invocation.patch
Patch108: texlive-12e_fix_vpe_invocation.patch
Patch109: texlive-texdoc.patch
-Patch111: texlive-xdvi.patch
Patch114: texlive-dvips_fontbug_fix_upstream.patch
Patch115: texlive-maketexmf.patch
Patch117: texlive-fmtutil_keep_failedlog.patch
@@ -128,16 +120,10 @@
Patch301: texlive-source-t1lib.patch
Patch302: texlive-source-warns.patch
Patch303: texlive-source-x11r7.patch
-Patch304: texlive-source-xdvi-numlock.patch
-Patch305: texlive-source-xdvizilla.patch
Patch306: texlive-source-CVE-2007-0650.patch
# 1000-: Japanese pTeX
Patch1000: dvipsk-jpatch-pdvips.patch
-# prepare from http://sourceforge.jp/projects/xdvi/
-# remove patch for configure because it is regenerated from autoconf2.13.
-Patch1002: xdvik-22.84.10-j1.34.patch
-Patch1003: texlive-2007-pxdvi.patch
Patch1004: texlive-2007-jp-platex209.patch
Patch1005: texlive-2007-pdvips.patch
Patch1006: texlive-2007-ptex-3.1.10.patch
@@ -153,10 +139,6 @@
BuildRequires: Xaw3d-devel
BuildRequires: poppler-devel >= 0.6.2-2
BuildRequires: teckit-devel
-# pxdvi buildrequires freetype >= 2.1.10
-%if %{enable_japanese}
-BuildRequires: freetype-devel >= 2.1.10
-%endif
Requires: xdg-utils ruby
Requires: texlive-texmf = %{version}
Requires: texlive-texmf-errata = %{version}
@@ -173,7 +155,7 @@
# make sure fonts package installed before running post - since
# fmtutil-sys is symlink to fmtutil
Requires(post): %{_bindir}/fmtutil
-Provides: tex
+Provides: tex(tex)
Obsoletes: tetex < 3.0-99
Provides: tetex = 3.0-99
Obsoletes: tetex-fonts < 3.0-99
@@ -214,7 +196,7 @@
also need to install texlive-dvips (for converting .dvi files to PostScript
format for printing on PostScript printers), texlive-latex (a higher level
formatting package which provides an easier-to-use interface for TeX), and
-texlive-xdvi (for previewing .dvi files in X).
+xdvi (for previewing .dvi files in X).
The TeX documentation is located in the texlive-doc package.
@@ -227,7 +209,7 @@
Obsoletes: texlive-doc < 2007-7
Provides: texlive-doc = %{version}-%{release}
Requires: texlive-texmf-doc = %{version}
-Requires: texlive-texmf-doc-errata = %{version}
+Requires: texlive-texmf-errata-doc = %{version}
%description doc
If you are installing texlive and need a documentation to describe
@@ -244,7 +226,7 @@
Provides: tetex-dvips = 3.0-99
Requires: texlive-texmf-dvips = %{version}
Requires: texlive-texmf-errata = %{version}
-Provides: tex-dvips
+Provides: tex(dvips)
%description dvips
Dvips converts .dvi files, for example those produced by the TeX text
@@ -282,7 +264,7 @@
Provides: tetex-latex = 3.0-99
Requires: texlive-texmf-latex = %{version}
Requires: texlive-texmf-errata = %{version}
-Provides: tex-latex
+Provides: tex(latex)
%description latex
LaTeX is a front end for the TeX text formatting system. Easier to
@@ -313,27 +295,6 @@
You only need to install this package if you will be compiling software that
wants to link against the kpathsea library.
-%package -n xdvi
-Summary: An X viewer for DVI files
-Group: Applications/Publishing
-Requires: texlive-dvips = %{version}-%{release}
-Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
-Version: %{xdvi_ver}
-#Url: http://xdvi.sourceforge.net/
-#Source0: http://downloads.sourceforge.net/xdvi/xdvik-%{xdvi_ver}.tar.gz
-Obsoletes: tetex-xdvi < 3.0-99
-Provides: tetex-xdvi = 3.0-99
-
-%description -n xdvi
-Xdvik, the kpathsea version of xdvi, is a previewer for DVI files
-produced e.g. by the TeX or troff typesetting systems.
-
-If you are installing texlive and you use PlainTeX or you are using DVI files,
-you will also need to install xdvi which allows you to view DVI files.
-Consider installing texlive-dvips (for converting .dvi files to PostScript
-format for printing on PostScript printers), and texlive-latex (a higher level
-formatting package which provides an easier-to-use interface for TeX).
-
%package -n dvipng
Summary: DVI-to-PNG converter
Version: %{dvipng_ver}
@@ -413,7 +374,6 @@
######
# Use htmlview first
%patch5 -p1 -b .browser
-%patch8 -p1 -b .xprint
%patch9 -p1 -b .teckit
%patch22 -p1 -b .fedora_paths
@@ -427,8 +387,6 @@
%patch11 -p1 -b .makej
# Don't use PID for temporary file names in scripts (RH bug #41269)
%patch12 -p1 -b .badscript
-# Fix xdvi - navigation with a spacebar does not keep position (RH bug #168124)
-%patch15 -p1 -b .xdvi-keepflag
# Always cleanup temporary directories for texconfig, updmap, fmtutil
# (RH #172534)
%patch17 -p1 -b .tmpcleanup
@@ -436,7 +394,6 @@
%patch20 -p1 -b .CVE-2007-4033
%patch21 -p1 -b .more_paths
#%patch23 -p1 -b .CVE-2007-4352-5392-5393
-%patch24 -p1 -b .maxchar
%patch25 -p1 -b .dvipsoverflow
%patch26 -p1 -b .dviljktemp
%patch27 -p1 -b .poppler
@@ -456,7 +413,6 @@
%patch107 -p3
%patch108 -p3
%patch109 -p1
-%patch111 -p3
%patch114 -p3
%patch115 -p3
%patch117 -p3
@@ -470,8 +426,6 @@
%patch301 -p0
%patch302 -p0
%patch303 -p0
-%patch304 -p0
-%patch305 -p0
%patch306 -p0
%patch1007 -p1 -b .ptex
@@ -492,9 +446,6 @@
popd
%endif
-# allow Xaw3d enabled build of xdvi
-%{__sed} -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch]
-
## Japanese pTeX
%if %{enable_japanese}
# create customized cid-x.map for dvipdfmx (#418091)
@@ -535,16 +486,6 @@
%patch1000 -p1 -b .pdvips
ln -s dvips.1 texk/pdvipsk/pdvips.1
-# set up Japanese xdvi
-cp -a texk/xdvik texk/pxdvik
-
-cd texk/pxdvik
-%patch1002 -p3
-cd -
-%patch1003 -p1 -b .pxdvi
-mv texk/pxdvik/vfontmap.sample texk/pxdvik/vfontmap.sample.orig
-install -p -m 644 %{SOURCE1003} texk/pxdvik/vfontmap.sample
-
# set up mendexk
tar xfz %{SOURCE1002} -C texk
%endif
@@ -561,9 +502,9 @@
# Japanese pTeX
%if %{enable_japanese}
-for i in texk/xdvik texk/pxdvik texk ; do
- ( cd ${i} ; $RPM_BUILD_DIR/%{name}-%{version}/texk/autoconf2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf )
-done
+pushd texk
+$RPM_BUILD_DIR/%{name}-%{version}/texk/autoconf2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf
+popd
%endif
%configure \
@@ -596,7 +537,7 @@
--with-lcdf-typetools=no \
%endif
--with-mf-x-toolkit=yes \
- --with-xdvi-x-toolkit=xaw3d \
+ --without-xdvik \
--without-cxx-runtime-hack
# Remove everything except:
@@ -604,14 +545,6 @@
# md5: the aladdin md5 code (not a library)
%{__rm} -r libs/{curl,expat,freetype,freetype2,gd,howto,jpeg,libgnuw32,libgsw32,libpng,libttf,ncurses,regex,unzip,zlib,type1,t1lib,xpdf}/
-# Japanese pTeX
-# configure pxdvi with more options
-%if %{enable_japanese}
-cd texk/pxdvik
-sh `grep "# ./con" config.status |sed -e s/^#\ //` --program-prefix=p --with-default-dvips-path=pdvips
-cd -
-%endif
-
# %%{?_smp_mflags} does not work in texlive-2007/libs/icu-xetex/common
make
@@ -645,20 +578,6 @@
texmf=%{buildroot}%{_texmf_main} \
texmfmain=%{buildroot}%{_texmf_main}
-# desktop entry things
-cat > xdvi.desktop <<EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=DVI Viewer
-Type=Application
-Comment=DVI viewer for TeX DVI files
-Icon=xdvi
-MiniIcon=mini-doc1.xpm
-Exec=%{_bindir}/xdvi
-MimeType=application/x-dvi
-NoDisplay=true
-EOF
-
# remove all .la files
rm -f %{buildroot}%{_infodir}/dir
find %{buildroot} | grep -e "\\.la$" | xargs rm -f
@@ -704,17 +623,6 @@
# install cron file
install -p -D -m755 %{SOURCE10} %{buildroot}%{_sysconfdir}/cron.daily/texlive.cron
-# install the xdvi desktop file
-mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-
-install -p -m644 %{SOURCE30} %{buildroot}%{_datadir}/pixmaps/
-install -p -m644 %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/xdvi.png
-desktop-file-install --vendor tetex --delete-original \
- --dir %{buildroot}%{_datadir}/applications \
- --add-category Graphics \
- xdvi.desktop
-
# remove pool files, they belong to texlive-texmf
rm -rf %{buildroot}%{_texmf_main}/web2c/*.pool
# ptex pool file is added later, and therefore kept
@@ -725,8 +633,7 @@
rm -f %{buildroot}%{_bindir}/platex
# Convert documents to UTF-8
mkdir -p %{buildroot}%{_texmf_main}/doc/ptex/ptex-src-%{name} \
- %{buildroot}%{_texmf_main}/doc/pdvipsk \
- %{buildroot}%{_texmf_main}/doc/pxdvik/READMEs
+ %{buildroot}%{_texmf_main}/doc/pdvipsk
cd texk/web2c/ptex-src-%{ptex_src_ver}
iconv -f ISO-2022-JP -t UTF-8 \
COPYRIGHT.jis \
@@ -741,12 +648,6 @@
iconv -f EUC-JP -t UTF-8 ${i} -o %{buildroot}%{_texmf_main}/doc/pdvipsk/${i}
done
cd -
-cd texk/pxdvik
-for i in CHANGES.xdvik-jp README.xdvik-jp READMEs/* ; do
- iconv -f EUC-JP -t UTF-8 ${i} \
- -o %{buildroot}%{_texmf_main}/doc/pxdvik/${i}
-done
-cd -
cd texk/web2c/ptex-src-%{ptex_src_ver}
%makeinstall INSTALL="install -p" prefix=%{buildroot}%{_prefix} \
@@ -756,8 +657,6 @@
rm %{buildroot}%{_texmf_main}/web2c/texmf.cnf
cd -
-install -p -m 644 texk/pxdvik/vfontmap.sample.orig %{buildroot}%{_datadir}/texmf/doc/pxdvik/vfontmap.sample
-
# mendexk install
cd texk/mendexk%{mendexk_ver}
install -p -m 755 mendex %{buildroot}%{_bindir}
@@ -808,14 +707,6 @@
%{_bindir}/texconfig-sys rehash 2> /dev/null || :
%{_bindir}/fmtutil-sys --all > /dev/null 2>&1 || :
-%post -n xdvi
-%{_bindir}/texconfig-sys rehash 2> /dev/null || :
-%{_bindir}/update-desktop-database %{_datadir}/applications || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
%post -n kpathsea
/sbin/ldconfig
[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/kpathsea.info.gz %{_infodir}/dir || :
@@ -862,13 +753,6 @@
%postun latex
%{_bindir}/texconfig-sys rehash 2> /dev/null || :
-%postun -n xdvi
-%{_bindir}/texconfig-sys rehash 2> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
%postun -n kpathsea
/sbin/ldconfig
@@ -1273,29 +1157,6 @@
%{_bindir}/platex209
%endif
-%files -n xdvi
-%defattr(-,root,root,-)
-%{_bindir}/oxdvi
-%{_bindir}/xdvi
-%{_bindir}/xdvizilla
-%{_bindir}/xdvi-xaw3d.bin
-%{_texmf_main}/xdvi/
-%{_mandir}/man1/oxdvi.1*
-%{_mandir}/man1/xdvi.1*
-%{_mandir}/man1/xdvizilla.1*
-%{_datadir}/pixmaps/xdvi48x48.png
-%{_datadir}/icons/hicolor/48x48/apps/xdvi.png
-%{_datadir}/applications/tetex-xdvi.desktop
-# Japanese pTeX
-%if %{enable_japanese}
-%{_bindir}/opxdvi
-%{_bindir}/pxdvi
-%{_bindir}/pxdvizilla
-%{_bindir}/pxdvi-xaw3d.bin
-%{_texmf_main}/pxdvi/
-%doc %{_texmf_main}/doc/pxdvik/
-%endif
-
%files -n kpathsea
%defattr(-,root,root,-)
%{_libdir}/libkpathsea.so.*
@@ -1342,6 +1203,12 @@
%{_texmf_main}/dvipdfm/
%changelog
+* Tue Jan 15 2008 Jindrich Novy <jnovy at redhat.com> - 2007-10
+- don't build/package xdvik/pxdvik, it's now separated
+- fix texlive-doc requires, description
+- use virtual provides with parentheses to avoid clashes
+ with real packages (#410401)
+
* Mon Jan 14 2008 Jindrich Novy <jnovy at redhat.com> - 2007-9
- unify texlive and texlive-fonts filelists
- package texdoc and texdoctk to a separate subpackage
--- texlive-2007-pxdvi.patch DELETED ---
--- texlive-2007-xdvi-keepflag.patch DELETED ---
--- texlive-2007-xprint.patch DELETED ---
--- texlive-source-xdvi-numlock.patch DELETED ---
--- texlive-source-xdvizilla.patch DELETED ---
--- texlive-xdvi-maxchar.patch DELETED ---
--- texlive-xdvi.patch DELETED ---
--- vfontmap DELETED ---
--- xdvik-22.84.10-j1.34.patch DELETED ---
More information about the fedora-extras-commits
mailing list