From a05104b98bc288c6860a90ba4da56028c980b331 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:46:16 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for xdvik --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From b794b3fc3759e111ef6304e84d139ba90a4bc47a Mon Sep 17 00:00:00 2001 From: "Jonathan G. Underwood" Date: Wed, 12 Nov 2008 00:26:23 +0000 Subject: [PATCH 2/4] - Add patch to fix zero key handling (BZ 470942) - Remove texlive-2007-xprint.patch which actually hasn't been applied during 22.84.14 packaging --- texlive-2007-xprint.patch | 13 ------------- xdvik-22.84.14-zerofix.patch | 10 ++++++++++ xdvik.spec | 17 ++++++++++++++--- 3 files changed, 24 insertions(+), 16 deletions(-) delete mode 100644 texlive-2007-xprint.patch create mode 100644 xdvik-22.84.14-zerofix.patch diff --git a/texlive-2007-xprint.patch b/texlive-2007-xprint.patch deleted file mode 100644 index 9d28e89..0000000 --- a/texlive-2007-xprint.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- tetex-src-3.0/texk/xdvik/configure.in.xprint 2006-05-05 16:31:52.000000000 -0400 -+++ tetex-src-3.0/texk/xdvik/configure.in 2006-05-05 16:32:07.000000000 -0400 -@@ -105,8 +105,8 @@ - else - XLFLAG= - fi -- AC_CHECK_LIB(Xp, XpQueryVersion, -- x_ext_lib="-lXp -lXext", :, -lXext -lX11 $X_EXTRA_LIBS $XLFLAG) -+# AC_CHECK_LIB(Xp, XpQueryVersion, -+# x_ext_lib="-lXp -lXext", :, -lXext -lX11 $X_EXTRA_LIBS $XLFLAG) - fi - dnl - dnl If libXp not found, try libXext only: diff --git a/xdvik-22.84.14-zerofix.patch b/xdvik-22.84.14-zerofix.patch new file mode 100644 index 0000000..3345a0f --- /dev/null +++ b/xdvik-22.84.14-zerofix.patch @@ -0,0 +1,10 @@ +diff -up xdvik-22.84.14/texk/xdvik/texmf/XDvi.zerofix xdvik-22.84.14/texk/xdvik/texmf/XDvi +--- xdvik-22.84.14/texk/xdvik/texmf/XDvi.zerofix 2008-11-12 00:09:46.000000000 +0000 ++++ xdvik-22.84.14/texk/xdvik/texmf/XDvi 2008-11-12 00:10:02.000000000 +0000 +@@ -368,3 +368,6 @@ Ctrl:set-shrink-factor(-)\n\ + !!!-------------- used for internal checking - DO NOT CHANGE THIS! -------------- + !!!------------------------------------------------------------------------------ + *appDefaultsFileVersion: 20030303 ++ ++*mainTranslations: #override\n\ ++ 0: digit(0) diff --git a/xdvik.spec b/xdvik.spec index 8577130..032a47d 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: 3%{?dist} +Release: 4%{?dist} Url: http://xdvi.sourceforge.net/ # encodings.c is GPLv2+ and LGPL and MIT # read-mapfile.c tfmload.c are from dvips @@ -41,8 +41,11 @@ Source30: xdvi48x48.png Source100: xdvi-ptex.map %endif -# This patch not pushed upstream. Unclear if it's actually still needed. -Patch1: texlive-2007-xprint.patch +# Fix handling of the 0 key. See: +# http://sourceforge.net/tracker/index.php?func=detail&aid=2067614&group_id=23164&atid=377580 +# https://bugzilla.redhat.com/show_bug.cgi?id=470942 +# Fixed upstream post 22.84.14 ? +Patch0: xdvik-22.84.14-zerofix.patch %if %{with japanese} # Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/ @@ -71,6 +74,9 @@ formatting package which provides an easier-to-use interface for TeX). %prep %setup -q +# Fix handling of zero key +%patch0 -p1 -b .zerofix + # Allow Xaw3d enabled build of xdvi sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch] @@ -239,6 +245,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Nov 12 2008 Jonathan G. Underwood - 22.84.14-4 +- Add patch to fix zero key handling (BZ 470942) +- Remove texlive-2007-xprint.patch which actually hasn't been applied during + 22.84.14 packaging + * Sun Oct 12 2008 Jonathan G. Underwood - 22.84.14-3 - Fix package build breakage From 5c87674dae6eb0890d6295ca63de759859a56e8a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:30:23 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index da22414..8e19bb1 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xdvik -# $Id$ +# $Id: Makefile,v 1.1 2008/01/15 02:07:07 kevin Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 8ccda435a24bd8f6c47807af93431cfaf9031373 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:38:31 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 8e19bb1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xdvik -# $Id: Makefile,v 1.1 2008/01/15 02:07:07 kevin Exp $ -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 $$d/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/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10