[texlive/f18] Obsolete chktex (#864211), config.ps is now a config file (#441171)

[Jindrich Novy]

commit aa812ea77163d6bb05dd464592b3a7407d179e31
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Tue Oct 9 09:13:48 2012 +0200

    Obsolete chktex (#864211), config.ps is now a config file (#441171)

 texlive.spec          |   14 +++++++++-----
 texlive.spec.template |    6 +++++-
 tl2rpm.c              |    5 +++++
 3 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/texlive.spec b/texlive.spec
index acdf766..b3a8b80 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -1,6 +1,6 @@
 %global source_date 20120926_r27815
 %global tl_version 2012
-%global tl_release 2.%{source_date}
+%global tl_release 3.%{source_date}
 %global tl_noarch_release %{tl_release}
 %global source_name texlive-%{source_date}-source
 
@@ -43661,6 +43661,8 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-chktex-bin
+Provides: chktex = %{tl_version}
+Obsoletes: chktex < %{tl_version}
 
 %description chktex
 The program reports typographic and other errors in LaTeX
@@ -211725,7 +211727,7 @@ fi
 %{_texdir}/texmf/dvips/config/config.mga
 %{_texdir}/texmf/dvips/config/config.mirrorprint
 %{_texdir}/texmf/dvips/config/config.ot2
-%{_texdir}/texmf/dvips/config/config.ps
+%config(noreplace) %{_texdir}/texmf/dvips/config/config.ps
 %{_texdir}/texmf/dvips/config/config.qms
 %{_texdir}/texmf/dvips/config/config.toshiba
 %{_texdir}/texmf/dvips/config/config.unms
@@ -297855,8 +297857,12 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Tue Oct  9 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20120926
+- obsolete chktex (#864211)
+- make config.ps a config file (#441171)
+
 * Sat Oct  6 2012 Jindrich Novy <jnovy at redhat.com> 2012-2-20120926
-- drop release subpackage (no more needed as TL is now in Fedora)
+- drop relase subpackage (no more needed as TL is now in Fedora)
 - fix -doc dependencies
 - remove (not-built) asymtote from source tarball
 - undefined catalogue version defaults to 0
@@ -297864,8 +297870,6 @@ fi
 - include also packages not part of any scheme
 - don't strip binaries so that we can generate debuginfo (#863635)
 - clean up depsolver
-- fixes texlive-texmf-bugs:
-  #437375 #441171 #490862 #809610 #814434 #829702 #861479
 
 * Wed Oct  3 2012 Jindrich Novy <jnovy at redhat.com> 2012-1-20120926
 - introduce TeX Live 2012 to Fedora (#488651)
diff --git a/texlive.spec.template b/texlive.spec.template
index 73114c4..440066a 100644
--- a/texlive.spec.template
+++ b/texlive.spec.template
@@ -1,6 +1,6 @@
 %global source_date 20120926_r27815
 %global tl_version 2012
-%global tl_release 2.%{source_date}
+%global tl_release 3.%{source_date}
 %global tl_noarch_release %{tl_release}
 %global source_name texlive-%{source_date}-source
 
@@ -300,6 +300,10 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Tue Oct  9 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20120926
+- obsolete chktex (#864211)
+- make config.ps a config file (#441171)
+
 * Sat Oct  6 2012 Jindrich Novy <jnovy at redhat.com> 2012-2-20120926
 - drop relase subpackage (no more needed as TL is now in Fedora)
 - fix -doc dependencies
diff --git a/tl2rpm.c b/tl2rpm.c
index d2acec5..9735e88 100644
--- a/tl2rpm.c
+++ b/tl2rpm.c
@@ -609,6 +609,7 @@ char *cnf_files[] = {
 	"texmf/web2c/texmf.cnf",
 	"texmf/web2c/context.cnf",
 	"texmf/web2c/mktex.cnf",
+	"texmf/dvips/config/config.ps",		/* rhbz#441171 */
 	NULL,
 };
 
@@ -1453,6 +1454,10 @@ void solve(char *name) {
 					fprintf(fpack, "Provides: latexmk = %%{tl_version}\n");
 					fprintf(fpack, "Obsoletes: latexmk < %%{tl_version}\n");
 				}
+				if ( !strcmp(name, "chktex") ) {	/* rhbz#864211 */
+					fprintf(fpack, "Provides: chktex = %%{tl_version}\n");
+					fprintf(fpack, "Obsoletes: chktex < %%{tl_version}\n");
+				}
 				/* description */
 #ifndef SRPMS
 				fprintf(fpack, "\n%%description %s\n", name);