packages: tcl/tcl.spec - mv tclAppInit.c to -devel - -autopath.patch, -hidd...

Mon May 11 20:48:45 CEST 2009

Author: glen                         Date: Mon May 11 18:48:44 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mv tclAppInit.c to -devel
- -autopath.patch, -hidden.patch, -conf.patch patches from fc
- modules are searched also from %{_datadir}/tcl%{ver}

---- Files affected:
packages/tcl:
   tcl.spec (1.139 -> 1.140) 

---- Diffs:

================================================================
Index: packages/tcl/tcl.spec
diff -u packages/tcl/tcl.spec:1.139 packages/tcl/tcl.spec:1.140

--- packages/tcl/tcl.spec:1.139	Thu Apr 23 08:27:38 2009
+++ packages/tcl/tcl.spec	Mon May 11 20:48:39 2009
@@ -5,6 +5,8 @@
 # Conditional build:
 %bcond_without	tests	# don't perform "make test"
 #
+%define		major	8.5
+%define		minor	7
 Summary:	Tool Command Language embeddable scripting language, with shared libraries
 Summary(fr.UTF-8):	Tool Command Language, langage de script avec bibliothèques partagées
 Summary(pl.UTF-8):	Tool Command Language - język skryptowy z bibliotekami dynamicznymi
@@ -12,10 +14,8 @@
 Summary(tr.UTF-8):	Tcl ile kullanılabilen betik dili
 Summary(uk.UTF-8):	Tool Command Language - вбудовувана мова скриптів
 Name:		tcl
-%define	major 8.5
-%define minor 7
 Version:	%{major}.%{minor}
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Languages/Tcl
 Source0:	http://dl.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
@@ -29,6 +29,9 @@
 Patch4:		%{name}-soname_fix.patch
 Patch5:		%{name}-norpath.patch
 Patch6:		%{name}-multilib.patch
+Patch7:		%{name}-autopath.patch
+Patch8:		%{name}-hidden.patch
+Patch9:		%{name}-conf.patch
 URL:		http://www.tcl.tk/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	ncurses-devel >= 5.2
@@ -117,13 +120,16 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 # Make sure we have /proc mounted - otherwise pthread_getattr_np will fail
 # https://sourceforge.net/tracker/index.php?func=detail&aid=1815573&group_id=10894&atid=110894
 if [ ! -r /proc/self/maps ]; then
-        echo "You need to have /proc mounted in order to build this package!"
-        exit 1
+		echo "You need to have /proc mounted in order to build this package!"
+		exit 1
 fi
 
 cd unix
@@ -136,13 +142,12 @@
 	--enable-threads \
 	--enable-64bit \
 	--without-tzdata
-%{__make} \
-	TCL_PACKAGE_PATH="%{_libdir} %{_libdir}/tcl%{major} %{_ulibdir} %{_ulibdir}/tcl%{major}"
+%{__make}
 
 cp -a tclConfig.sh tclConfig.sh-orig
 sed -i -e "s#%{_builddir}/%{name}%{version}/unix#%{_libdir}#; \
 	s#%{_builddir}/%{name}%{version}#%{_includedir}/tcl-private#" tclConfig.sh
-if (cmp -s tclConfig.sh tclConfig.sh-orig); then
+if cmp -s tclConfig.sh tclConfig.sh-orig; then
 	echo "tclConfig.sh fix rule didn't change anything. Please verify it."
 fi
 
@@ -162,15 +167,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_prefix},%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT{%{_datadir}/tcl%{major},%{_prefix},%{_mandir}/man1}
 
 %{__make} -C unix install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT \
-	TCL_PACKAGE_PATH="%{_libdir} %{_libdir}/tcl%{major} %{_ulibdir} %{_ulibdir}/tcl%{major}" \
 	MAN_INSTALL_DIR=$RPM_BUILD_ROOT%{_mandir}
 
 install -d $RPM_BUILD_ROOT%{_includedir}/%{name}-private/{generic,unix}
-find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT%{_includedir}/%{name}-private/'{}' ';'
+find generic unix -name '*.h' -exec cp -p '{}' $RPM_BUILD_ROOT%{_includedir}/%{name}-private/'{}' ';'
 for h in $RPM_BUILD_ROOT%{_includedir}/*.h; do
 	rh=$(basename "$h")
 	if [ -f "$RPM_BUILD_ROOT%{_includedir}/%{name}-private/generic/$rh" ]; then
@@ -201,11 +205,15 @@
 %attr(755,root,root) %{_libdir}/libtcl%{major}.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libtcl%{major}.so.0
 %{?have_ulibdir:%dir %{_libdir}/tcl%{major}}
+%dir %{_datadir}/tcl%{major}
 %{_ulibdir}/tcl[0-9]
 %dir %{_ulibdir}/tcl%{major}
 %{_ulibdir}/tcl%{major}/*.tcl
 %{_ulibdir}/tcl%{major}/encoding
 %{_ulibdir}/tcl%{major}/http1.0
+%{_ulibdir}/tcl%{major}/opt0.4
+%{_ulibdir}/tcl%{major}/tclIndex
+
 %dir %{_ulibdir}/tcl%{major}/msgs
 %lang(af) %{_ulibdir}/tcl%{major}/msgs/af.msg
 %lang(af_ZA) %{_ulibdir}/tcl%{major}/msgs/af_za.msg
@@ -334,15 +342,14 @@
 %lang(zh_HK) %{_ulibdir}/tcl%{major}/msgs/zh_hk.msg
 %lang(zh_SG) %{_ulibdir}/tcl%{major}/msgs/zh_sg.msg
 %lang(zh_TW) %{_ulibdir}/tcl%{major}/msgs/zh_tw.msg
-%{_ulibdir}/tcl%{major}/opt0.4
-%{_ulibdir}/tcl%{major}/tclAppInit.c
-%{_ulibdir}/tcl%{major}/tclIndex
+
 %{_mandir}/man1/tclsh.1*
 %lang(pl) %{_mandir}/pl/man1/tclsh.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_ulibdir}/tclConfig.sh
+%{_ulibdir}/tcl%{major}/tclAppInit.c
 %attr(755,root,root) %{_libdir}/libtcl%{major}.so
 %attr(755,root,root) %{_libdir}/libtcl.so
 %{_libdir}/libtclstub%{major}.a
@@ -361,6 +368,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.140  2009/05/11 18:48:39  glen
+- mv tclAppInit.c to -devel
+- -autopath.patch, -hidden.patch, -conf.patch patches from fc
+- modules are searched also from %{_datadir}/tcl%{ver}
+
 Revision 1.139  2009/04/23 06:27:38  arekm
 - up to 8.5.7
 
@@ -527,7 +539,7 @@
 - Simplified
 
 Revision 1.86  2004/01/04 16:26:20  adgor
-- Finally fixed (i hope) %%{_ulibdir} problem - tx qboosh
+- Finally fixed (i hope) %{_ulibdir} problem - tx qboosh
 
 Revision 1.85  2004/01/03 10:18:53  jajcus
 - move files from _libdir to _ulibdir only if that are different directories
@@ -581,7 +593,7 @@
 - release 10
 
 Revision 1.69  2003/05/26 18:23:36  agaran
-Source[01]-md5
+- Source[01]-md5
 
 Revision 1.68  2003/05/25 06:27:12  misi3k
 - massive attack s/pld.org.pl/pld-linux.org/
@@ -623,9 +635,9 @@
 - release 4: merge translations from KONDRA and KSI.
 
 Revision 1.57  2002/05/21 23:14:48  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.56  2002/02/23 04:49:03  kloczek
 - adapterized.
@@ -635,7 +647,7 @@
   Group field using gettext).
 
 Revision 1.54  2002/01/18 02:15:09  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.53  2001/11/25 20:04:51  ankry
 - add more pl man pages
@@ -661,7 +673,7 @@
 - release 52: rebuild against readline 4.2.
 
 Revision 1.47  2001/04/05 23:38:33  misiek
-release 51; threads and 64bit enabled
+- release 51; threads and 64bit enabled
 
 Revision 1.46  2000/12/14 16:36:18  baggins
 - release 50
@@ -676,7 +688,7 @@
 - modyfications for using neew rpm automation.
 
 Revision 1.43  2000/10/10 16:21:09  wiget
-more header in devel
+- more header in devel
 
 Revision 1.42  2000/10/07 07:26:03  pascalek
 - updated to 8.3.2
@@ -694,10 +706,10 @@
 - added autoconf fix
 
 Revision 1.38  2000/06/09 07:55:12  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.37  2000/06/09 07:24:00  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.36  2000/04/01 11:15:41  zagrodzki
 - changed all BuildRoot definitons
@@ -725,7 +737,7 @@
 
 Revision 1.30  1999/09/05 22:58:53  kloczek
 - release 31,
-- added using %%configure macro,
+- added using %configure macro,
 - additional header files to install (headers_fix patch),
 - --strip-unneeded on stripping shared libraries.
 
@@ -743,14 +755,3 @@
 
 Revision 1.25  1999/07/12 23:06:15  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Sun May 30 1999 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
-  [8.0.5-2]
-- based on RH spec,
-- added patches:
--- tcl-glibc21.patch - fiix problems on glibc 2.1 (RH 6.0),
--- tcl-tmpfix.patch - fix tmp race (from Debian),
--- tcl-manlnk.patch - make some ,man pages as *roff include,
--- tcl-64bit.patch - fix problems on 64-bit architectures,
--- tcl-readline.patch -- add ability to use readline in tclsh,
-- spec rewrited by PLD team.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tcl/tcl.spec?r1=1.139&r2=1.140&f=u

