From 11bf7508eac9f84b6f299e42a431d78fa29a9e18 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 12 Mar 2008 17:26:20 +0000 Subject: [PATCH 1/4] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From e8726c516ca1870644ebd5251b22c523f871cf2d Mon Sep 17 00:00:00 2001 From: "Jonathan G. Underwood" Date: Fri, 14 Mar 2008 01:21:25 +0000 Subject: [PATCH 2/4] - Branched for F8 from devel (i.e. branched from rawhide leading to F-9) - Adjust Requires and BuildRequires for F-8 i.e. tetex instead of texlive --- xdvik.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xdvik.spec b/xdvik.spec index f4ec3a8..c3f1aa8 100644 --- a/xdvik.spec +++ b/xdvik.spec @@ -8,7 +8,7 @@ Summary: An X viewer for DVI files Name: xdvik Version: 22.84.13 -Release: 17%{?dist} +Release: 17%{?dist}.1 Url: http://xdvi.sourceforge.net/ # encodings.c is GPLv2+ and LGPL and MIT # read-mapfile.c tfmload.c are from dvips @@ -19,7 +19,7 @@ Obsoletes: tetex-xdvi < 3.0-99 Provides: tetex-xdvi = 3.0-99 Provides: xdvi = %{version}-%{release} Obsoletes: xdvi = 22.84.12 -Requires: tex(dvips) tex(tex) +Requires: tetex-dvips Requires: xdg-utils ghostscript Requires(post): desktop-file-utils >= %{desktop_file_utils_version} Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} @@ -30,7 +30,7 @@ BuildRequires: Xaw3d-devel BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: autoconf213 BuildRequires: libtool -BuildRequires: kpathsea-devel +BuildRequires: tetex %if %{with japanese} BuildRequires: freetype-devel >= 2.1.10 %endif @@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Mar 14 2008 Jonathan G. Underwood - 22.84.13-17.1 +- Branched for F8 from devel (i.e. branched from rawhide leading to F-9) +- Adjust Requires and BuildRequires for F-8 i.e. tetex instead of texlive + * Sun Feb 3 2008 Jonathan G. Underwood - 22.84.13-17 - Fix spec file typo From 190e6a3d044fed969e2e2d13c4009213effd227d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:30:24 +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 de2cbe964e6edebd47a5e646adf06275d1b7a186 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:38:24 +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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8