diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-05-09 21:35:08 +1000 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-05-16 03:12:09 +0200 |
| commit | 9fbe1b22671f1bc6a198d259733adbfebcd983fb (patch) | |
| tree | 5d41adec1819a67807b5e2a0fc054b4c723cddac | |
| parent | b1d6e885b1d37bf683ff0ba11ff81e4ea22e8c67 (diff) | |
| download | samba-9fbe1b22671f1bc6a198d259733adbfebcd983fb.tar.gz samba-9fbe1b22671f1bc6a198d259733adbfebcd983fb.tar.bz2 samba-9fbe1b22671f1bc6a198d259733adbfebcd983fb.zip | |
merge build changes from Mathias
(cherry picked from commit 2c08939f3db19eaaf31cb117e3d541d17a36da5e)
(This used to be commit fec017125ce7b4a3ec87c0fc2ba77c570cf57074)
| -rwxr-xr-x | packaging/RHEL-CTDB/makerpms.sh | 12 | ||||
| -rw-r--r-- | packaging/RHEL-CTDB/samba.spec | 24 |
2 files changed, 35 insertions, 1 deletions
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh index 671519453d..74ec97e25b 100755 --- a/packaging/RHEL-CTDB/makerpms.sh +++ b/packaging/RHEL-CTDB/makerpms.sh @@ -89,7 +89,17 @@ cp -p ${SPECFILE} ${SPECDIR} ## echo "$(basename $0): Getting Ready to build release package" cd ${SPECDIR} -${RPM} -ba --clean --rmsource $EXTRA_OPTIONS $SPECFILE +${RPM} -ba $EXTRA_OPTIONS $SPECFILE +[ `arch` = "x86_64" ] && { + echo "Building 32 bit winbind libs" + # hi ho, a hacking we will go ... + ln -sf /lib/libcom_err.so.2 /lib/libcom_err.so + ln -sf /lib/libuuid.so.1 /lib/libuuid.so + ${RPM} -ba --rebuild --target=i386 $SPECFILE +} + + + # restore original structure if docs were specified cd ../../ diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec index 35e11cbf60..871410d435 100644 --- a/packaging/RHEL-CTDB/samba.spec +++ b/packaging/RHEL-CTDB/samba.spec @@ -40,6 +40,13 @@ BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-deve %define _libarch %_lib %endif +# rpm screws up the arch lib dir when using --target on RHEL5 +%ifarch i386 i486 i586 i686 ppc s390 +%define _libarch lib +%else +%define _libarch %_lib +%endif + %description Samba is the protocol by which a lot of PC-related machines share @@ -99,6 +106,15 @@ Group: Applications/System Compatibility package for 32 bit apps on 64 bit architecures %endif +%ifarch i386 i486 i586 i686 ppc s390 +%package winbind-32bit +Summary: Samba winbind compatibility package for 32bit apps on 64bit archs +Group: Applications/System + +%description winbind-32bit +Compatibility package for 32 bit apps on 64 bit architecures +%endif + ####################################################################### %package doc @@ -535,6 +551,14 @@ fi %endif +%ifarch i386 i486 i586 i686 ppc s390 +%files winbind-32bit +%attr(755,root,root) /%{_libarch}/libnss_winbind.so* +%attr(755,root,root) /%{_libarch}/libnss_wins.so* +%attr(755,root,root) /%{_libarch}/security/pam_winbind.so +%endif + + %changelog * Fri Jan 16 2004 Gerald (Jerry) Carter <jerry@samba,org> - Removed ChangeLog entries since they are kept in CVS |