From 0b477fc141993f93ba33531e650db19bb12be9ec Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Tue, 9 Jul 2013 14:16:37 +0200
Subject: [PATCH] revert renaming, upstream doesn't want to rename

---
 texlive.spec          |  5 ++++-
 texlive.spec.template | 10 +++++++---
 texlive.tlpdb         |  2 +-
 tlpdb.patch           |  9 ---------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/texlive.spec b/texlive.spec
index 793ffd2..1bef92a 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -1,6 +1,6 @@
 %global source_date 20130608_r30832
 %global tl_version 2013
-%global tl_rel 0.2
+%global tl_rel 0.3
 %global tl_release %{tl_rel}.%{source_date}%{?dist}
 %global tl_noarch_release %{tl_rel}%{?dist}
 %global source_name texlive-%{source_date}-source
@@ -329241,6 +329241,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Tue Jul 09 2013 Than Ngo <than@redhat.com> - 3:2013-0.3-20130608
+- revert renaming, upstream doesn't want to rename
+
 * Mon Jul  1 2013 Orion Poplawski <orion@cora.nwra.com> - 2013-0.2-20130608
 - Don't rename ht to t4ht (#959696)
 
diff --git a/texlive.spec.template b/texlive.spec.template
index be7e183..3e337ef 100644
--- a/texlive.spec.template
+++ b/texlive.spec.template
@@ -1,6 +1,6 @@
 %global source_date 20130608_r30832
 %global tl_version 2013
-%global tl_rel 0.1
+%global tl_rel 0.3
 %global tl_release %{tl_rel}.%{source_date}%{?dist}
 %global tl_noarch_release %{tl_rel}%{?dist}
 %global source_name texlive-%{source_date}-source
@@ -240,8 +240,6 @@ for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog latexmk; do
 	rm -f %{buildroot}%{_datadir}/texlive/texmf-dist/doc/man/man1/$i.*
 done
 rm -rf %{buildroot}%{_includedir}/ptexenc
-# 959696
-mv ht t4ht
 popd
 
 # fix symlinks
@@ -368,6 +366,12 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Tue Jul 09 2013 Than Ngo <than@redhat.com> - 3:2013-0.3-20130608
+- revert renaming, upstream doesn't want to rename (#959696)
+
+* Mon Jul  1 2013 Orion Poplawski <orion@cora.nwra.com> - 2013-0.2-20130608
+- Don't rename ht to t4ht (#959696)
+
 * Wed Jun 12 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-0.1-20130608
 - formally switch to 2013 based on upstream
 - call updmap-sys and fmtutil-sys for map and format updates
diff --git a/texlive.tlpdb b/texlive.tlpdb
index 59174b4..0c92038 100644
--- a/texlive.tlpdb
+++ b/texlive.tlpdb
@@ -134372,7 +134372,7 @@ category Package
 revision 30088
 shortdesc i386-linux files of tex4ht
 binfiles arch=i386-linux size=68
- bin/i386-linux/t4ht
+ bin/i386-linux/ht
  bin/i386-linux/htcontext
  bin/i386-linux/htlatex
  bin/i386-linux/htmex
diff --git a/tlpdb.patch b/tlpdb.patch
index 3d60255..48e4b19 100644
--- a/tlpdb.patch
+++ b/tlpdb.patch
@@ -290,15 +290,6 @@
   bin/i386-linux/rungs
  
  name texlive-sr
-@@ -134494,7 +134372,7 @@
- revision 30088
- shortdesc i386-linux files of tex4ht
- binfiles arch=i386-linux size=68
-- bin/i386-linux/ht
-+ bin/i386-linux/t4ht
-  bin/i386-linux/htcontext
-  bin/i386-linux/htlatex
-  bin/i386-linux/htmex
 @@ -138272,7 +138150,7 @@
  catalogue-ctan /macros/latex209/contrib/trees/tree-dvips
  catalogue-date 2011-03-14 14:09:23 +0100