From 026c092ba7b39ef16377327ff32914d36c7c4613 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:23:04 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for xmltex --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From f1d3a77d3d47306dd4247c41cad90d21fe79c6d8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:29 +0000 Subject: [PATCH 2/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 b929dcc..996d3ae 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xmltex -# $Id: Makefile,v 1.1 2004/09/09 14:51:41 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:32:26 notting Exp $ NAME := xmltex 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 680d67e4279c84f3ca5a1b80480bf3ad70ade1aa Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Fri, 11 Dec 2009 16:17:31 +0000 Subject: [PATCH 3/4] Merge review(#226567) - fix buildroot, source0 location, do not zip readme.txt --- xmltex.spec | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/xmltex.spec b/xmltex.spec index 8b9ef77..83a6b8b 100644 --- a/xmltex.spec +++ b/xmltex.spec @@ -1,15 +1,16 @@ Summary: Namespace-aware XML parser written in TeX Name: xmltex Version: 20020625 -Release: 15%{?dist} +Release: 16%{?dist} License: LPPL Group: Applications/Publishing -URL: http://www.dcarlisle.demon.co.uk/xmltex/manual.html -Source0: ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex-1.9.tar.gz -Source1: xmltex.1 +URL: http://www.dcarlisle.demon.co.uk/xmltex/manual.html +#Source0 located at ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex +Source0: xmltex-1.9.tar.gz +Source1: xmltex.1 Requires: tex(latex) BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tex(latex) @@ -27,15 +28,13 @@ mv -f xmltex/base/* . rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex install -d $RPM_BUILD_ROOT%{_bindir} -install -p *.xmt %{name}.cfg *.ini *.tex $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex +install -p -m 0644 *.xmt %{name}.cfg *.ini *.tex $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex ln -s pdftex ${RPM_BUILD_ROOT}%{_bindir}/pdf%{name} ln -s latex ${RPM_BUILD_ROOT}%{_bindir}/%{name} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 install -c -p -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1 ln -s xmltex.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/pdfxmltex.1 -gzip -9nf readme.txt - %clean rm -rf $RPM_BUILD_ROOT @@ -56,14 +55,19 @@ done exit 0 %files -%defattr(644,root,root,755) -%doc *.gz *.html -%attr(755,root,root) %{_bindir}/* +%defattr(-,root,root,-) +%doc readme.txt manual.html +%attr(755,root,root) %{_bindir}/xmltex +%attr(755,root,root) %{_bindir}/pdfxmltex %{_datadir}/texmf/tex/xmltex %{_mandir}/man1/xmltex.1* %{_mandir}/man1/pdfxmltex.1* %changelog +* Fri Dec 11 2009 Ondrej Vasik - 20020625-16 +- Merge review(#226567) - fix buildroot, source0 location, do not + zip readme.txt + * Fri Aug 28 2009 Ondrej Vasik - 20020625-15 - ship xmltex manpage from Debian @@ -167,8 +171,8 @@ exit 0 All persons listed below can be reached at @pld.org.pl $Log: xmltex.spec,v $ -Revision 1.24 2009/08/28 08:27:14 ovasik -ship xmltex manpage from Debian +Revision 1.25 2009/12/11 16:17:31 ovasik +Merge review(#226567) - fix buildroot, source0 location, do not zip readme.txt Revision 1.6 2001/03/27 16:50:29 wiget add xmltex.cfg file and one missing dir in %%files; release 3 From 16f7ac7dbae4922abc25559895f469e54f033d61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:57:39 +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 996d3ae..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmltex -# $Id: Makefile,v 1.2 2007/10/15 19:32:26 notting Exp $ -NAME := xmltex -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),) -# attempt 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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12