sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

merge build changes from Mathias

Browse Source 
(cherry picked from commit 2c08939f3db19eaaf31cb117e3d541d17a36da5e)
(This used to be commit fec017125ce7b4a3ec87c0fc2ba77c570cf57074)
This commit is contained in:
Andrew Tridgell 2008-05-09 21:35:08 +10:00 committed by Michael Adam
parent b1d6e885b1
commit 9fbe1b2267
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packaging/RHEL-CTDB/makerpms.sh
View File

@ -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 ../../

24
packaging/RHEL-CTDB/samba.spec
View File

@ -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