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

(-)libdb4.3.spec.orig (-3 / +10 lines)
Lines 310-316 Link Here
310
		%{subst_enable test} \
310
		%{subst_enable test} \
311
		%{subst_enable uimutexes} \
311
		%{subst_enable uimutexes} \
312
		%{subst_enable umrw} \
312
		%{subst_enable umrw} \
313
		--with-tcl=%_libdir \
313
		%{?_enable_tcl:--with-tcl=%_libdir} \
314
		#
314
		#
315
	# Remove libtool predep_objects and postdep_objects wonkiness
315
	# Remove libtool predep_objects and postdep_objects wonkiness
316
	%__subst -p 's/-shared -nostdlib/-shared/' libtool
316
	%__subst -p 's/-shared -nostdlib/-shared/' libtool
Lines 322-328 Link Here
322
rm -f examples_*/tags
322
rm -f examples_*/tags
323
323
324
%install
324
%install
325
mkdir -p %buildroot{/%_lib,%_libdir,%_tcllibdir,%_tcldatadir/Db_tcl,%_includedir/db4}
325
mkdir -p %buildroot{/%_lib,%_libdir,%_includedir/db4}
326
%if_enabled tcl
327
mkdir -p %buildroot{%_tcllibdir,%_tcldatadir/Db_tcl}
328
%endif
326
329
327
%define docdir %_docdir/%srcname
330
%define docdir %_docdir/%srcname
328
%makeinstall -C build_unix docdir=%buildroot%docdir
331
%makeinstall -C build_unix docdir=%buildroot%docdir
Lines 349-356 Link Here
349
	popd
352
	popd
350
	rm .%_libdir/libdb_int-*.a
353
	rm .%_libdir/libdb_int-*.a
351
354
355
%if_enabled tcl
352
	mv .%_libdir/libdb_tcl* .%_tcllibdir/
356
	mv .%_libdir/libdb_tcl* .%_tcllibdir/
353
	rm .%_tcllibdir/*.la
357
	rm .%_tcllibdir/*.la
358
%endif
354
359
355
	mv .%_includedir/*.h .%_includedir/db4/
360
	mv .%_includedir/*.h .%_includedir/db4/
356
	%__ln_s db4/db.h db4/db_185.h .%_includedir/
361
	%__ln_s db4/db.h db4/db_185.h .%_includedir/
Lines 359-365 Link Here
359
	#done
364
	#done
360
popd
365
popd
361
366
367
%if_enabled tcl
362
%tea_makeindex -f libdb_tcl-%_sover.so -C %buildroot%_tcldatadir/Db_tcl
368
%tea_makeindex -f libdb_tcl-%_sover.so -C %buildroot%_tcldatadir/Db_tcl
369
%endif
363
370
364
%if_enabled java
371
%if_enabled java
365
# Move java jar file to the correct place.
372
# Move java jar file to the correct place.
Lines 371-377 Link Here
371
for n in db%_sover-utils \
378
for n in db%_sover-utils \
372
	 %name{,-devel{,-static}} \
379
	 %name{,-devel{,-static}} \
373
	 %{name}_cxx{,-devel{,-static}} \
380
	 %{name}_cxx{,-devel{,-static}} \
374
	 %{name}_tcl{,-devel{,-static}} \
381
	 %{?_enable_tcl:%{name}_tcl{,-devel{,-static}}} \
375
	 %{name}_java{,-devel{,-static}}; do
382
	 %{name}_java{,-devel{,-static}}; do
376
	echo "${n/%_sover/4}" >"%buildroot%_sysconfdir/buildreqs/packages/substitute.d/$n"
383
	echo "${n/%_sover/4}" >"%buildroot%_sysconfdir/buildreqs/packages/substitute.d/$n"
377
done
384
done

Return to bug 8626