diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index da22414..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xdvik -# $Id$ -NAME := xdvik -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/xdvi-ptex.map b/xdvi-ptex.map index 0ed4f5f..9f52632 100644 --- a/xdvi-ptex.map +++ b/xdvi-ptex.map @@ -14,59 +14,59 @@ % "JIS-H" "Unicode-H" "Identity-H" % "JIS-V" "Unicode-V" "Identity-V" -rml JIS-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -rmlv JIS-V /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -gbm JIS-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -gbmv JIS-V /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -fmin JIS-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -fgoth JIS-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +rml JIS-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +rmlv JIS-V /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +gbm JIS-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +gbmv JIS-V /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +fmin JIS-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +fgoth JIS-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf maru JIS-H /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf % UTF package -unijmin-h Unicode-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf % \UTF font -unijmin-v Unicode-V /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf % \UTF font -cidmin-h Identity-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf % \CID font -cidmin-v Identity-V /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf % \CID font -hmr JIS-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -hmrv JIS-V /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf +unijmin-h Unicode-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf % \UTF font +unijmin-v Unicode-V /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf % \UTF font +cidmin-h Identity-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf % \CID font +cidmin-v Identity-V /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf % \CID font +hmr JIS-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +hmrv JIS-V /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf -unijgoth-h Unicode-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf % \UTF font -unijgoth-v Unicode-V /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf % \UTF font -cidgoth-h Identity-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf % \CID font -cidgoth-v Identity-V /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf % \CID font -hkb JIS-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -hkbv JIS-V /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +unijgoth-h Unicode-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf % \UTF font +unijgoth-v Unicode-V /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf % \UTF font +cidgoth-h Identity-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf % \CID font +cidgoth-v Identity-V /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf % \CID font +hkb JIS-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +hkbv JIS-V /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf % OTF package -otf-ujmr-h Unicode-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -otf-ujmr-v Unicode-V /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -otf-cjmr-h Identity-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -otf-cjmr-v Identity-V /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -hminr-h JIS-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -hminr-v JIS-V /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf +otf-ujmr-h Unicode-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +otf-ujmr-v Unicode-V /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +otf-cjmr-h Identity-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +otf-cjmr-v Identity-V /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +hminr-h JIS-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +hminr-v JIS-V /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf -otf-ujgr-h Unicode-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -otf-ujgr-v Unicode-V /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -otf-cjgr-h Identity-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -otf-cjgr-v Identity-V /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -hgothr-h JIS-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -hgothr-v JIS-V /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +otf-ujgr-h Unicode-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +otf-ujgr-v Unicode-V /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +otf-cjgr-h Identity-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +otf-cjgr-v Identity-V /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +hgothr-h JIS-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +hgothr-v JIS-V /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf -otf-ujmb-h Unicode-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -otf-ujmb-v Unicode-V /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -otf-cjmb-h Identity-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -otf-cjmb-v Identity-V /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -hminb-h JIS-H /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf -hminb-v JIS-V /usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf +otf-ujmb-h Unicode-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +otf-ujmb-v Unicode-V /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +otf-cjmb-h Identity-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +otf-cjmb-v Identity-V /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +hminb-h JIS-H /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf +hminb-v JIS-V /usr/share/fonts/sazanami/mincho/sazanami-mincho.ttf -otf-ujgb-h Unicode-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -otf-ujgb-v Unicode-V /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -otf-cjgb-h Identity-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -otf-cjgb-v Identity-V /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -hgothb-h JIS-H /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf -hgothb-v JIS-V /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +otf-ujgb-h Unicode-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +otf-ujgb-v Unicode-V /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +otf-cjgb-h Identity-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +otf-cjgb-v Identity-V /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +hgothb-h JIS-H /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf +hgothb-v JIS-V /usr/share/fonts/sazanami/gothic/sazanami-gothic.ttf otf-ujmgr-h Unicode-H /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf otf-ujmgr-v Unicode-V /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf diff --git a/xdvik.spec b/xdvik.spec index 8a878e7..b84e3f8 100644 --- a/xdvik.spec +++ b/xdvik.spec @@ -7,7 +7,7 @@ Summary: An X viewer for DVI files Name: xdvik Version: 22.84.14 -Release: 5%{?dist} +Release: 6%{?dist} Url: http://xdvi.sourceforge.net/ # encodings.c is GPLv2+ and LGPL and MIT # read-mapfile.c tfmload.c are from dvips @@ -245,6 +245,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Jul 12 2009 Jonathan G. Underwood - 22.84.14-6 +- Correct paths in xdvi-ptex.map to fix BZ 508429 (Yuki Watanabe) + * Thu Feb 26 2009 Fedora Release Engineering - 22.84.14-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild