ALT Linux Bugzilla
– Attachment 575 Details for
Bug 4885
support for x86_64
New bug
|
Search
|
[?]
|
Help
Register
|
Log In
[x]
|
Forgot Password
Login:
[x]
|
EN
|
RU
[patch]
final patch for multilib support
libdb4.2-2-x86_64.patch (text/plain), 2.29 KB, created by
Kachalov Anton
on 2004-08-30 20:11:01 MSD
(
hide
)
Description:
final patch for multilib support
Filename:
MIME Type:
Creator:
Kachalov Anton
Created:
2004-08-30 20:11:01 MSD
Size:
2.29 KB
patch
obsolete
>--- libdb4.2.spec.orig 2004-05-26 14:57:54 +0400 >+++ libdb4.2.spec 2004-08-30 00:43:17 +0400 >@@ -1,7 +1,7 @@ > %define _sover 4.2 > Name: libdb%_sover > Version: %_sover.52 >-Release: alt4 >+Release: alt5 > %define srcname db-%version > > Summary: Berkeley database library >@@ -39,8 +39,14 @@ > %def_disable umrw > > BuildConflicts: %name-devel, libdb4.0-devel, libdb4.1-devel, libdb4-devel >-BuildPreReq: gcc-c++ jdkgcj libdb1-devel >-BuildPreReq: rpm-build >= 4.0.4-alt1, tcl-devel >= 8.4.0-alt1 >+BuildPreReq: gcc-c++ libdb1-devel >+BuildPreReq: rpm-build >= 4.0.4-alt1 >+%if_enabled java >+BuildPreReq: jdkgcj >+%endif >+%if_enabled tcl >+BuildPreReq: tcl-devel >= 8.4.0-alt1 >+%endif > > %package -n db%_sover-utils > Summary: Command line tools for managing Berkeley DB databases >@@ -291,6 +297,10 @@ > %{subst_enable uimutexes} \ > %{subst_enable umrw} \ > --with-tcl=%_libdir >+ # Remove libtool predep_objects and postdep_objects wonkiness >+ perl -pi -e 's/^predep_objects=".*$/predep_objects=""/' libtool >+ perl -pi -e 's/^postdep_objects=".*$/postdep_objects=""/' libtool >+ perl -pi -e 's/-shared -nostdlib/-shared/' libtool > # SMP-incompatible build. > make > popd >@@ -298,7 +308,7 @@ > %__rm -f examples_*/tags > > %install >-%__mkdir_p $RPM_BUILD_ROOT{/lib,%_libdir,%_tcllibdir,%_tcldatadir/Db_tcl,%_includedir/db4} >+%__mkdir_p $RPM_BUILD_ROOT{/%_lib,%_libdir,%_tcllibdir,%_tcldatadir/Db_tcl,%_includedir/db4} > > %define docdir %_docdir/%srcname > %makeinstall -C build_unix docdir=$RPM_BUILD_ROOT%docdir >@@ -310,10 +320,10 @@ > %define _libdb_so libdb-%_sover.so > > pushd $RPM_BUILD_ROOT >- # Relocate main shared library from %_libdir/ to /lib/. >- %__mv .%_libdir/%_libdb_so ./lib/ >+ # Relocate main shared library from %_libdir/ to /%_lib/. >+ %__mv .%_libdir/%_libdb_so ./%_lib/ > for f in .%_libdir/libdb{,-*}.so; do >- %__ln_s -nf ../../lib/%_libdb_so "$f" >+ %__ln_s -nf ../../%_lib/%_libdb_so "$f" > %__rm -f .%_libdir/%_libdb_so > done > >@@ -352,7 +362,7 @@ > %postun -n %{name}_java -p %postun_ldconfig > > %files >-/lib/*.so >+/%_lib/*.so > %dir %docdir > %doc %docdir/[A-Z]* > >@@ -416,6 +426,9 @@ > %_libdir/libdb-[0-9]*.a > > %changelog >+* Fri Jul 23 2004 Kachalov Anton <mouse@altlinux.org> 4.2.52-alt5 >+- Change /lib to /%_lib >+ > * Wed May 26 2004 Dmitry V. Levin <ldv@altlinux.org> 4.2.52-alt4 > - %name-devel: removed %_libdir/%_libdb_so symlink. >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 4885
:
512
| 575