rpms/tclcompiler/devel tclcompiler-1.5-version.patch, NONE, 1.1 tclcompiler.spec, 1.4, 1.5

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/tclcompiler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19182

Modified Files:
	tclcompiler.spec 
Added Files:
	tclcompiler-1.5-version.patch 
Log Message:
Downgrade package version number as it appears to tcl to match tbcload and prevent errors when running 'package require ...'



tclcompiler-1.5-version.patch:

--- NEW FILE tclcompiler-1.5-version.patch ---
--- tclcompiler-20061030cvs/configure.orig	2008-01-05 15:56:50.000000000 -0800
+++ tclcompiler-20061030cvs/configure	2008-01-05 15:57:19.000000000 -0800
@@ -267,8 +267,8 @@
 # Identity of this package.
 PACKAGE_NAME='tclcompiler'
 PACKAGE_TARNAME='tclcompiler'
-PACKAGE_VERSION='1.5'
-PACKAGE_STRING='tclcompiler 1.5'
+PACKAGE_VERSION='1.4'
+PACKAGE_STRING='tclcompiler 1.4'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.


Index: tclcompiler.spec
===================================================================
RCS file: /cvs/extras/rpms/tclcompiler/devel/tclcompiler.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tclcompiler.spec	5 Jan 2008 22:23:08 -0000	1.4
+++ tclcompiler.spec	6 Jan 2008 00:11:39 -0000	1.5
@@ -5,7 +5,7 @@
 Summary: Tcl bytecode compiler
 Name: tclcompiler
 Version: 1.5
-Release: 5.%{cvsdate}cvs%{?dist}
+Release: 6.%{cvsdate}cvs%{?dist}
 License: TCL
 Group: Development/Libraries
 # cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclcompiler-20061030cvs tclcompiler
@@ -13,6 +13,7 @@
 Source0: tclcompiler-%{cvsdate}cvs.tgz
 Patch0:  tclcompiler-1.5-configure.patch
 Patch1:  tclcompiler-1.5-pkgpath.patch
+Patch2:  tclcompiler-1.5-version.patch
 URL: http://tclpro.sourceforge.net/
 Requires: tcl(abi) = 8.5
 BuildRequires: tbcload-devel
@@ -26,6 +27,7 @@
 %setup -q -n %{name}-%{cvsdate}cvs
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
 
 %build
 %configure
@@ -45,9 +47,16 @@
 %files
 %doc ChangeLog license.terms
 %defattr(-,root,root)
-%{tcl_sitearch}/%{name}%{version}
+# The version for the tclcompiler package and tbcload must appear
+# the same to tclsh, so we force a downgrade of tclcompiler to match
+# tbcload.
+%{tcl_sitearch}/%{name}1.4
 
 %changelog
+* Sat Jan 5 2008 Wart <wart at kobold.org> 1.5-6.20061030cvs
+- Downgrade package version number to match tbcload and prevent
+  errors when running 'package require ...'
+
 * Sat Jan 5 2008 Wart <wart at kobold.org> 1.5-5.20061030cvs
 - Fix package path for Tcl 8.5