rpms/tcl/devel .cvsignore, 1.20, 1.21 sources, 1.21, 1.22 tcl.spec, 1.64, 1.65

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/tcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19352

Modified Files:
	.cvsignore sources tcl.spec 
Log Message:
New release of tcl8.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	31 Jul 2007 09:54:53 -0000	1.20
+++ .cvsignore	2 Jan 2008 12:37:17 -0000	1.21
@@ -1,2 +1 @@
-tcl8.4.15-src.tar.gz
-tcl8.4.15-html.tar.gz
+tcl8.5.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	31 Jul 2007 09:54:53 -0000	1.21
+++ sources	2 Jan 2008 12:37:17 -0000	1.22
@@ -1,2 +1 @@
-5e1b71eef1f75a294072aa3218f62b66  tcl8.4.15-src.tar.gz
-0086ef1a2d057ac59c2446c4bc1756d6  tcl8.4.15-html.tar.gz
+d890c505465411b25050b6cd95971d2c  tcl8.5.0-src.tar.gz


Index: tcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- tcl.spec	16 Nov 2007 08:22:57 -0000	1.64
+++ tcl.spec	2 Jan 2008 12:37:17 -0000	1.65
@@ -1,22 +1,21 @@
-%define majorver 8.4
+%define majorver 8.5
 
 Summary: Tcl scripting language development environment
 Name: tcl
-Version: %{majorver}.15
-Release: 6%{?dist}
-Epoch: 1 
+Version: %{majorver}.0
+Release: 1%{?dist}.1
+Epoch: 1
 License: TCL
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
-Source0: http://puzzle.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-src.tar.gz
-Source1: http://superb-east.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-html.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/tcl/tcl%{version}-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires: autoconf
 Provides: tcl(abi) = %{majorver}
 ##Conflicts: tcldict
-Patch1: tcl-confi.patch
-Patch2: tcl-8.4.7-path.patch
-Patch3: tcl-8.4.15-regexp.patch
+Patch0: tcl-8.5.0-autopath.patch
+Patch1: tcl-8.5.0-conf.patch
+Patch2: tcl-8.5.0-make.patch
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -43,27 +42,16 @@
 
 The package contains the development files and man pages for tcl.
 
-%package html
-Summary: Tcl/Tk manual in html format
-Group: Development/Libraries
-URL: http://superb-east.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-html.tar.gz
-
-%description html
-Tcl/Tk is a powerful scripting language and GUI toolkit.
-
-This package contains the html manual.
-
 %prep
-%setup -T -D -c %{name}-%{version} -q -a 0 -a 1
-cd %{name}%{version}
+%setup -q -n %{name}%{version}
 chmod -x generic/tclThreadAlloc.c
 
-%patch1 -p1 -b .confi
-%patch2 -p1 -b .path
-%patch3 -p1 -b .regexp
+%patch0 -p1 -b .autopath
+%patch1 -p1 -b .conf
+%patch2 -p1 -b .make
 
 %build
-cd %{name}%{version}/unix
+pushd unix
 autoconf
 %configure --enable-threads
 make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
@@ -77,27 +65,16 @@
   make test
 %endif
 
-%pre
-# fix rpm can't replace dir with symlink
-if [ -d /usr/lib/tcl8.4 ]; then
-	rm -rf /usr/lib/tcl8.4;
-fi
-
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{name}%{version}
 make install -C unix INSTALL_ROOT=$RPM_BUILD_ROOT TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
-ln -s tclsh%{majorver} $RPM_BUILD_ROOT%{_bindir}/tclsh
+#ln -s tclsh%{majorver} $RPM_BUILD_ROOT%{_bindir}/tclsh
 
 # for linking with -lib%{name}
 ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
 
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/
-ln -s %{_datadir}/%{name}%{majorver} $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}
-
-#mkdir -p %{buildroot}%{_prefix}/lib
-#ln -s %{_datadir}/%{name}%{majorver} %{buildroot}%{_prefix}/lib/%{name}%{majorver}
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}
 
 mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic,unix}
 find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
@@ -123,13 +100,14 @@
 %defattr(-,root,root,-)
 %{_bindir}/tclsh*
 %{_datadir}/%{name}%{majorver}
+%{_datadir}/%{name}8/%{majorver}/*
 %{_libdir}/lib%{name}%{majorver}.so
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_mandir}/mann/*
-%{_libdir}/%{name}%{majorver}
-%doc %{name}%{version}/README %{name}%{version}/changes 
-%doc %{name}%{version}/license.terms
+%dir %{_libdir}/%{name}%{majorver}
+%doc README changes 
+%doc license.terms
 
 %files devel
 %defattr(-,root,root,-)
@@ -137,13 +115,12 @@
 %{_libdir}/lib%{name}stub%{majorver}.a
 %{_libdir}/lib%{name}.so
 %{_libdir}/%{name}Config.sh
-#%doc is in html
-
-%files html
-%defattr(-,root,root,-)
-%doc %{name}%{version}/html/*
 
 %changelog
+* Wed Jan  2 2008 Marcela Maslanova <mmaslano at redhat.com> - 1:8.5.0-1
+- upgrade on the new whole version 8.5.0
+- thank you for patches and clean spec to wart (at kobold)
+
 * Fri Nov 16 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-6
 - CVE-2007-4772 NFA optimization cause hang in loop. Back ported patch
 	from upstream development version.