Attachment #609 for bug #5364

View | Details | Raw Unified | Return to bug 5364
Collapse All | Expand All

Lines 39-44 Link Here

(-)rpm-4_0-4.0.4-orig/autodeps/linux.prov.in (-1 / +30 lines)
39	FIND_PERL=	39	FIND_PERL=
40	FIND_PYTHON=	40	FIND_PYTHON=
41	FIND_SHELL=	41	FIND_SHELL=
		42	FIND_TCL=
42		43
43	ParseMethod()	44	ParseMethod()
44	{	45	{
Lines 82-87 Link Here
82	nosh\|noshell)	83	nosh\|noshell)
83	FIND_SHELL=	84	FIND_SHELL=
84	;;	85	;;
		86	tcl)
		87	FIND_TCL=1
		88	;;
		89	notcl)
		90	FIND_TCL=
		91	;;
85	all)	92	all)
86	FIND_LIBS=1	93	FIND_LIBS=1
87	FIND_PAM=1	94	FIND_PAM=1
Lines 101-107 Link Here
101	}	108	}
102	ParseMethod $RPM_FINDPROV_METHOD	109	ParseMethod $RPM_FINDPROV_METHOD
103		110
104	if [ -z "$FIND_LIBS" -a -z "$FIND_PAM" -a -z "$FIND_PERL" -a -z "$FIND_PYTHON" -a -z "$FIND_SHELL" ]; then	111	if [ -z "$FIND_LIBS" -a -z "$FIND_PAM" -a -z "$FIND_PERL" -a -z "$FIND_PYTHON" -a -z "$FIND_TCL" -a -z "$FIND_SHELL" ]; then
105	# Nothing to do	112	# Nothing to do
106	cat >/dev/null 2>&1	113	cat >/dev/null 2>&1
107	exit 0	114	exit 0
Lines 121-126 Link Here
121	FOUND_PROVS=	128	FOUND_PROVS=
122	LIST_PERL=	129	LIST_PERL=
123	LIST_PYTHON=	130	LIST_PYTHON=
		131	LIST_TCL=
124		132
125	ListScriptProvs()	133	ListScriptProvs()
126	{	134	{
Lines 169-174 Link Here
169	$f"	177	$f"
170	fi	178	fi
171	fi	179	fi
		180
		181	if [ "${f##*/}" = "pkgIndex.tcl" ]; then
		182	if [ -n "$FIND_TCL" ]; then
		183	[ -z "$LIST_TCL" ] && LIST_TCL="$f" \|\| LIST_TCL="$LIST_TCL
		184	$f"
		185	fi
		186	fi
172	}	187	}
173		188
174	FindPerlProvs()	189	FindPerlProvs()
Lines 191-196 Link Here
191	$r"	206	$r"
192	}	207	}
193		208
		209	FindTclProvs()
		210	{
		211	[ -n "$FIND_TCL" -a -n "$LIST_TCL" ] \|\| return 0
		212	[ -x "$RPM_TCLSH" ] \|\| return 0
		213
		214	local r
		215	r="$(printf %s\\n "$LIST_TCL" \|@RPMCONFIGDIR@/tcl.prov)" \|\| return 1
		216	[ -z "$FOUND_PROVS" ] && FOUND_PROVS="$r" \|\| FOUND_PROVS="$FOUND_PROVS
		217	$r"
		218	}
		219
194	DEF_RPM_FINDPROV_LIB_PATH='/lib:/usr/lib:/usr/X11R6/lib'	220	DEF_RPM_FINDPROV_LIB_PATH='/lib:/usr/lib:/usr/X11R6/lib'
195	: ${RPM_FINDPROV_LIB_PATH:=$DEF_RPM_FINDPROV_LIB_PATH}	221	: ${RPM_FINDPROV_LIB_PATH:=$DEF_RPM_FINDPROV_LIB_PATH}
196		222
Lines 313-317 Link Here
313	# Find provides in listed python scripts and shared libraries, if any	339	# Find provides in listed python scripts and shared libraries, if any
314	FindPythonProvs	340	FindPythonProvs
315		341
		342	# Find provides in listed tcl index files, if any
		343	FindTclProvs
		344
316	# Finally sort and print them.	345	# Finally sort and print them.
317	printf %s "$FOUND_PROVS" \|LC_COLLATE=C sort -u	346	printf %s "$FOUND_PROVS" \|LC_COLLATE=C sort -u

Lines 48-53 Link Here

(-)rpm-4_0-4.0.4-orig/autodeps/linux.req.in (-1 / +30 lines)
48	FIND_PYTHON=	48	FIND_PYTHON=
49	FIND_LIBPERL=	49	FIND_LIBPERL=
50	FIND_SHELL=	50	FIND_SHELL=
		51	FIND_TCL=
51	libperl_so=	52	libperl_so=
52		53
53	ParseMethod()	54	ParseMethod()
Lines 63-68 Link Here
63	FIND_PYTHON=	64	FIND_PYTHON=
64	FIND_LIBPERL=	65	FIND_LIBPERL=
65	FIND_SHELL=	66	FIND_SHELL=
		67	FIND_TCL=
66	;;	68	;;
67	lib\|library)	69	lib\|library)
68	FIND_LIBS=1	70	FIND_LIBS=1
Lines 108-113 Link Here
108	nosh\|noshell)	110	nosh\|noshell)
109	FIND_SHELL=	111	FIND_SHELL=
110	;;	112	;;
		113	tcl)
		114	FIND_TCL=1
		115	;;
		116	notcl)
		117	FIND_TCL=
		118	;;
111	all)	119	all)
112	FIND_FILES=1	120	FIND_FILES=1
113	FIND_LIBS=1	121	FIND_LIBS=1
Lines 116-121 Link Here
116	FIND_PERL=1	124	FIND_PERL=1
117	FIND_LIBPERL=1	125	FIND_LIBPERL=1
118	FIND_SHELL=1	126	FIND_SHELL=1
		127	FIND_TCL=1
119	;;	128	;;
120	default\|yes\|true)	129	default\|yes\|true)
121	ParseMethod $RPM_FINDREQ_DEFAULT_METHOD	130	ParseMethod $RPM_FINDREQ_DEFAULT_METHOD
Lines 130-136 Link Here
130	ParseMethod $RPM_FINDREQ_METHOD	139	ParseMethod $RPM_FINDREQ_METHOD
131		140
132	FIND_SCRIPT=	141	FIND_SCRIPT=
133	if [ -n "$FIND_SHELL" -o -n "$FIND_PERL" -o -n "$FIND_PAM" ]; then	142	if [ -n "$FIND_SHELL" -o -n "$FIND_PERL" -o -n "$FIND_PAM" -o -n "$FIND_TCL" ]; then
134	FIND_SCRIPT=1	143	FIND_SCRIPT=1
135	fi	144	fi
136		145
Lines 160-165 Link Here
160	FOUND_REQS=	169	FOUND_REQS=
161	LIST_PERL=	170	LIST_PERL=
162	LIST_PYTHON=	171	LIST_PYTHON=
		172	LIST_TCL=
163		173
164	ListScriptReqs()	174	ListScriptReqs()
165	{	175	{
Lines 198-203 Link Here
198	[ -z "$LIST_PYTHON" ] && LIST_PYTHON="$f" \|\| LIST_PYTHON="$LIST_PYTHON	208	[ -z "$LIST_PYTHON" ] && LIST_PYTHON="$f" \|\| LIST_PYTHON="$LIST_PYTHON
199	$f"	209	$f"
200	fi	210	fi
		211	elif [ -z "${f%%*.tcl}" ]; then
		212	if [ -n "$FIND_TCL" ]; then
		213	[ -z "$LIST_TCL" ] && LIST_TCL="$f" \|\| LIST_TCL="$LIST_TCL
		214	$f"
		215	fi
201	fi	216	fi
202	}	217	}
203		218
Lines 222-227 Link Here
222	$r"	237	$r"
223	}	238	}
224		239
		240	FindTclReqs()
		241	{
		242	[ -n "$LIST_TCL" ] \|\| return 0
		243	[ -x "$RPM_TCLSH" ] \|\| return 0
		244
		245	local r
		246	r="$(printf %s\\n "$LIST_TCL" \|@RPMCONFIGDIR@/tcl.req)" \|\| return 1
		247	[ -z "$FOUND_REQS" ] && FOUND_REQS="$r" \|\| FOUND_REQS="$FOUND_REQS
		248	$r"
		249	}
		250
225	# Note this works for both a.out and ELF executables.	251	# Note this works for both a.out and ELF executables.
226	# It also auto-generates requirements for scripts.	252	# It also auto-generates requirements for scripts.
227		253
Lines 312-316 Link Here
312	# Find requires in listed python scripts, if any	338	# Find requires in listed python scripts, if any
313	FindPythonReqs	339	FindPythonReqs
314		340
		341	# Find requires in listed tcl scripts, if any
		342	FindTclReqs
		343
315	# Finally sort and print them.	344	# Finally sort and print them.
316	printf %s "$FOUND_REQS" \|LC_COLLATE=C sort -u	345	printf %s "$FOUND_REQS" \|LC_COLLATE=C sort -u

Lines 233-243 Link Here

(-)rpm-4_0-4.0.4-orig/platform.in (-2 / +12 lines)
233	@alt@ %{?_python_compile_deep:export RPM_PYTHON_COMPILE_DEEP=\"%_python_compile_deep\"}\	233	@alt@ %{?_python_compile_deep:export RPM_PYTHON_COMPILE_DEEP=\"%_python_compile_deep\"}\
234	@alt@ %{?_python_compile_skip_x:export RPM_PYTHON_COMPILE_SKIP_X=\"%_python_compile_skip_x\"}\	234	@alt@ %{?_python_compile_skip_x:export RPM_PYTHON_COMPILE_SKIP_X=\"%_python_compile_skip_x\"}\
235	@alt@ %{?_python_compile_clean:export RPM_PYTHON_COMPILE_CLEAN=\"%_python_compile_clean\"}\	235	@alt@ %{?_python_compile_clean:export RPM_PYTHON_COMPILE_CLEAN=\"%_python_compile_clean\"}\
		236	@alt@ %{?_tcl_lib_path:export RPM_TCL_LIB_PATH=\"%_tcl_lib_path\"}\
		237	@alt@ %{?_tcl_req_method:export RPM_TCL_REQ_METHOD=\"%_tcl_req_method\"}\
		238	@alt@ %{?_tcl_req_skip:export RPM_TCL_REQ_SKIP=\"%_tcl_req_skip\"}\
236	@alt@ %{?_pkg_contents_index_all:export RPM_PKG_CONTENTS_INDEX_ALL=\"%_pkg_contents_index_all\"}\	239	@alt@ %{?_pkg_contents_index_all:export RPM_PKG_CONTENTS_INDEX_ALL=\"%_pkg_contents_index_all\"}\
237	@alt@ %{?_pkg_contents_index_bin:export RPM_PKG_CONTENTS_INDEX_BIN=\"%_pkg_contents_index_bin\"}\	240	@alt@ %{?_pkg_contents_index_bin:export RPM_PKG_CONTENTS_INDEX_BIN=\"%_pkg_contents_index_bin\"}\
238	@alt@ %{?_scripts_debug:export RPM_SCRIPTS_DEBUG=\"%_scripts_debug\"}\	241	@alt@ %{?_scripts_debug:export RPM_SCRIPTS_DEBUG=\"%_scripts_debug\"}\
239	@alt@ %{?_keep_libtool_files:export RPM_KEEP_LIBTOOL_FILES=\"%_keep_libtool_files\"}\	242	@alt@ %{?_keep_libtool_files:export RPM_KEEP_LIBTOOL_FILES=\"%_keep_libtool_files\"}\
240	@alt@ %{?__python:export RPM_PYTHON=\"%__python\"}\	243	@alt@ %{?__python:export RPM_PYTHON=\"%__python\"}\
		244	@alt@ %{?__tclsh:export RPM_TCLSH=\"%__tclsh\"}\
241	@alt@ \	245	@alt@ \
242	@alt@ unset LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL \|\|:\	246	@alt@ unset LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL \|\|:\
243	@alt@ %{?_build_lang:export LANG=\"%_build_lang\"\	247	@alt@ %{?_build_lang:export LANG=\"%_build_lang\"\
Lines 413-422 Link Here
413	@alt@%_python_compile_deep 20	417	@alt@%_python_compile_deep 20
414	@alt@%_python_compile_skip_x 1	418	@alt@%_python_compile_skip_x 1
415	@alt@%_python_compile_clean 1	419	@alt@%_python_compile_clean 1
		420	@alt@%_tcl_lib_path ""
		421	@alt@%_tcl_req_method normal
		422	@alt@%_tcl_req_skip ""
416	@alt@%_fixup_method binconfig pkgconfig libtool	423	@alt@%_fixup_method binconfig pkgconfig libtool
417	@alt@%_strip_method %{?_enable_debug:none}%{!?_enable_debug:executable shared}	424	@alt@%_strip_method %{?_enable_debug:none}%{!?_enable_debug:executable shared}
418	@alt@%_findreq_default_method files lib pam perl python shell	425	@alt@%_findreq_default_method files lib pam perl python tcl shell
419	@alt@%_findprov_default_method lib pam perl python shell	426	@alt@%_findprov_default_method lib pam perl python tcl shell
420	@alt@	427	@alt@
421	@alt@%_cleanup_topdir %nil	428	@alt@%_cleanup_topdir %nil
422	@alt@%_compress_topdir %_usr	429	@alt@%_compress_topdir %_usr
Lines 444-449 Link Here
444	@alt@%set_perl_req_method() %global _perl_req_method %*	451	@alt@%set_perl_req_method() %global _perl_req_method %*
445	@alt@%set_python_req_method() %global _python_req_method %1	452	@alt@%set_python_req_method() %global _python_req_method %1
446	@alt@%set_python_compile_method() %global _python_compile_method %1	453	@alt@%set_python_compile_method() %global _python_compile_method %1
		454	@alt@%set_tcl_req_method() %global _tcl_req_method %1
447	@alt@	455	@alt@
448	@alt@%set_cleanup_topdir() %global _cleanup_topdir %*	456	@alt@%set_cleanup_topdir() %global _cleanup_topdir %*
449	@alt@%set_compress_topdir() %global _compress_topdir %*	457	@alt@%set_compress_topdir() %global _compress_topdir %*
Lines 475-480 Link Here
475	@alt@%add_python_lib_path() %global _python_lib_path %_python_lib_path %*	483	@alt@%add_python_lib_path() %global _python_lib_path %_python_lib_path %*
476	@alt@%add_python_compile_exclude() %global _python_compile_exclude %_python_compile_exclude %*	484	@alt@%add_python_compile_exclude() %global _python_compile_exclude %_python_compile_exclude %*
477	@alt@%add_python_compile_include() %global _python_compile_include %_python_compile_include %*	485	@alt@%add_python_compile_include() %global _python_compile_include %_python_compile_include %*
		486	@alt@%add_tcl_req_skip() %global _tcl_req_skip %_tcl_req_skip %*
		487	@alt@%add_tcl_lib_path() %global _tcl_lib_path %_tcl_lib_path %*
478	@alt@	488	@alt@
479	@alt@%add_findprov_lib_path() %global _findprov_lib_path %_findprov_lib_path %*	489	@alt@%add_findprov_lib_path() %global _findprov_lib_path %_findprov_lib_path %*
480	@alt@	490	@alt@

Return to bug 5364