pool/samba
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Disable SWAT during configure and don't package it any longer.

Browse Source 
- Remove dangling references to Heimdal from the spec file.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=285
This commit is contained in:
Lars Müller 2013-01-21 11:39:03 +00:00 committed by Git OBS Bridge
parent e8d8409982
commit 622a44dace
6 changed files with 19 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-source-timestamp
View File

@ -1 +1 @@
SOURCE_TIMESTAMP="2908" SOURCE_TIMESTAMP="2911"

4
patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:8d295dbe07ea5943e4634e22a6fc09e3a2e322c577c8744d5fc8554d6c550e05 oid sha256:99dc29441eea09151f7064b1986d978258c6df503420cd99f72cd9e37696d9fb
size 32058 size 31234

44
samba-doc.spec
View File

@ -126,7 +126,7 @@ BuildRequires: libtevent-devel
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 2908 %define SOURCE_TIMESTAMP 2911
%define BRANCH %{version} %define BRANCH %{version}
Version: 4.0.1 Version: 4.0.1
Release: 0 Release: 0
@ -182,7 +182,6 @@ BuildRequires: ccache
################################ ################################
%define DOCDIR %{_defaultdocdir}/samba %define DOCDIR %{_defaultdocdir}/samba
%define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook %define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook
%define SWATDIR %{_datadir}/samba/swat
%define LOGDIR %{_localstatedir}/log/samba %define LOGDIR %{_localstatedir}/log/samba
%define LOCKDIR %{_localstatedir}/lib/samba %define LOCKDIR %{_localstatedir}/lib/samba
%define CONFIGDIR %{_sysconfdir}/samba %define CONFIGDIR %{_sysconfdir}/samba
@ -336,11 +335,8 @@ CONFIGURE_OPTIONS="\
--with-utmp \ --with-utmp \
--with-winbind \ --with-winbind \
--with-shared-modules=%{vfs_modules},%{idmap_modules} \ --with-shared-modules=%{vfs_modules},%{idmap_modules} \
--disable-swat \
" "
# make sure we have a chance to find krb5-config
for dir in /usr/lib/mit/bin /usr/lib/heimdal; do
test -d "${dir}" && export PATH="${PATH}:${dir}"
done
./configure ${CONFIGURE_OPTIONS} ./configure ${CONFIGURE_OPTIONS}
./script/mkversion.sh ./script/mkversion.sh
%endif %endif
@ -351,7 +347,6 @@ done
mkdir -p \ mkdir -p \
%{buildroot}/%{DOCDIR} \ %{buildroot}/%{DOCDIR} \
%{buildroot}/%{DOCBOOKDIR} \ %{buildroot}/%{DOCBOOKDIR} \
%{buildroot}/%{SWATDIR}/help \
%{buildroot}/%{_datadir}/susehelp/meta/Administration/System %{buildroot}/%{_datadir}/susehelp/meta/Administration/System
# utility scripts # utility scripts
scripts="creategroup mksmbpasswd.sh" scripts="creategroup mksmbpasswd.sh"
@ -389,28 +384,6 @@ cp -a docs/* %{buildroot}/%{DOCDIR}
rm -rf "%{buildroot}/%{DOCBOOKDIR}" rm -rf "%{buildroot}/%{DOCBOOKDIR}"
rm -f examples/VFS/*~ rm -f examples/VFS/*~
cp -a examples/ %{buildroot}/%{DOCDIR} cp -a examples/ %{buildroot}/%{DOCDIR}
#test -e "%{buildroot}/%{SWATDIR}/help/manpages" || \
# ln -s "%{DOCDIR}/htmldocs/manpages" "%{buildroot}/%{SWATDIR}/help"
# Install HTML pages only in the samba-doc package
pushd %{buildroot}/%{SWATDIR}/help
for file in $( find -mindepth 1 -maxdepth 1); do
file="${file#./}"
case "${file}" in
welcome-no-samba-doc.html)
case "%{name}" in
samba*-doc) rm "${file}" ;;
esac
continue
;;
welcome.html) ;;
*)
rm -r "${file}"
ln -s "%{DOCDIR}/htmldocs/${file}" .
;;
esac
echo "%doc %{SWATDIR}/help/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc
done
popd
# finally build filelist-samba-doc # finally build filelist-samba-doc
for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do
# exclude %{DOCDIR}, README, and docbook # exclude %{DOCDIR}, README, and docbook
@ -428,17 +401,6 @@ rm -f \
%endif %endif
%pre %pre
# Remove all directories and files from usr/share/samba/swat/help expect welcome-*.html
if [ -d usr/share/samba/swat/help ]; then
find usr/share/samba/swat/help -mindepth 1 -maxdepth 1 -type d -print0 | \
xargs -0 rm -rf
for file in $( find usr/share/samba/swat/help -maxdepth 1 -type f); do
case "${file}" in
usr/share/samba/swat/help/welcome*.html) continue ;;
*) rm -f "${file}" ;;
esac
done
fi
%clean %clean
[ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" [ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}"
@ -449,8 +411,6 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%dir %{DOCDIR} %dir %{DOCDIR}
%dir %{_datadir}/samba %dir %{_datadir}/samba
%dir %{SWATDIR}
%dir %{SWATDIR}/help
%doc %{_datadir}/susehelp %doc %{_datadir}/susehelp
%endif %endif

10
samba.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jan 21 11:02:35 UTC 2013 - lmuelle@suse.com
- Disable SWAT during configure and don't package it any longer.
-------------------------------------------------------------------
Fri Jan 18 17:34:55 UTC 2013 - lmuelle@suse.com
- Remove dangling references to Heimdal from the spec file.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 17 18:07:11 UTC 2013 - lmuelle@suse.com Thu Jan 17 18:07:11 UTC 2013 - lmuelle@suse.com

58
samba.spec
View File

@ -126,7 +126,7 @@ BuildRequires: libtevent-devel
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 2908 %define SOURCE_TIMESTAMP 2911
%define BRANCH %{version} %define BRANCH %{version}
Version: 4.0.1 Version: 4.0.1
Release: 0 Release: 0
@ -189,7 +189,6 @@ BuildRequires: ccache
################################ ################################
%define DOCDIR %{_defaultdocdir}/samba %define DOCDIR %{_defaultdocdir}/samba
%define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook %define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook
%define SWATDIR %{_datadir}/samba/swat
%define LOGDIR %{_localstatedir}/log/samba %define LOGDIR %{_localstatedir}/log/samba
%define LOCKDIR %{_localstatedir}/lib/samba %define LOCKDIR %{_localstatedir}/lib/samba
%define CONFIGDIR %{_sysconfdir}/samba %define CONFIGDIR %{_sysconfdir}/samba
@ -803,11 +802,8 @@ CONFIGURE_OPTIONS="\
--with-utmp \ --with-utmp \
--with-winbind \ --with-winbind \
--with-shared-modules=%{vfs_modules},%{idmap_modules} \ --with-shared-modules=%{vfs_modules},%{idmap_modules} \
--disable-swat \
" "
# make sure we have a chance to find krb5-config
for dir in /usr/lib/mit/bin /usr/lib/heimdal; do
test -d "${dir}" && export PATH="${PATH}:${dir}"
done
./configure ${CONFIGURE_OPTIONS} ./configure ${CONFIGURE_OPTIONS}
./script/mkversion.sh ./script/mkversion.sh
make samba3-idl make samba3-idl
@ -907,7 +903,6 @@ install -d -m 0755 -p \
%{buildroot}/%{_var}/run \ %{buildroot}/%{_var}/run \
%{buildroot}/%{DOCDIR} \ %{buildroot}/%{DOCDIR} \
%{buildroot}/%{DOCBOOKDIR} \ %{buildroot}/%{DOCBOOKDIR} \
%{buildroot}/%{SWATDIR}/help \
%{buildroot}/%{_datadir}/susehelp/meta/Administration/System %{buildroot}/%{_datadir}/susehelp/meta/Administration/System
%if 0%{?suse_version} && 0%{?suse_version} < 1211 %if 0%{?suse_version} && 0%{?suse_version} < 1211
@ -1011,7 +1006,6 @@ install -m 0755 tools/update-apparmor-samba-profile \
# PDF generator # PDF generator
install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf
touch %{buildroot}/var/run/%{cifs_init_script} touch %{buildroot}/var/run/%{cifs_init_script}
install -m 0644 config/swat.xinetd %{buildroot}/%{_sysconfdir}/xinetd.d/swat
install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg
install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba
install -m 0644 config/dhcp.conf %{buildroot}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf install -m 0644 config/dhcp.conf %{buildroot}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf
@ -1105,28 +1099,6 @@ cp -a docs/* %{buildroot}/%{DOCDIR}
rm -rf "%{buildroot}/%{DOCBOOKDIR}" rm -rf "%{buildroot}/%{DOCBOOKDIR}"
rm -f examples/VFS/*~ rm -f examples/VFS/*~
cp -a examples/ %{buildroot}/%{DOCDIR} cp -a examples/ %{buildroot}/%{DOCDIR}
#test -e "%{buildroot}/%{SWATDIR}/help/manpages" || \
# ln -s "%{DOCDIR}/htmldocs/manpages" "%{buildroot}/%{SWATDIR}/help"
# Install HTML pages only in the samba-doc package
pushd %{buildroot}/%{SWATDIR}/help
for file in $( find -mindepth 1 -maxdepth 1); do
file="${file#./}"
case "${file}" in
welcome-no-samba-doc.html)
case "%{name}" in
samba*-doc) rm "${file}" ;;
esac
continue
;;
welcome.html) ;;
*)
rm -r "${file}"
ln -s "%{DOCDIR}/htmldocs/${file}" .
;;
esac
echo "%doc %{SWATDIR}/help/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc
done
popd
# finally build filelist-samba-doc # finally build filelist-samba-doc
for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do
# exclude %{DOCDIR}, README, and docbook # exclude %{DOCDIR}, README, and docbook
@ -1263,22 +1235,6 @@ fi
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
%pre doc
# Remove all directories and files from usr/share/samba/swat/help expect welcome-*.html
if [ -d usr/share/samba/swat/help ]; then
find usr/share/samba/swat/help -mindepth 1 -maxdepth 1 -type d -print0 | \
xargs -0 rm -rf
for file in $( find usr/share/samba/swat/help -maxdepth 1 -type f); do
case "${file}" in
usr/share/samba/swat/help/welcome*.html) continue ;;
*) rm -f "${file}" ;;
esac
done
fi
%endif
%post krb-printing %post krb-printing
if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then
ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb
@ -1362,7 +1318,6 @@ fi
%config(noreplace) %{CONFIGDIR}/smbusers %config(noreplace) %{CONFIGDIR}/smbusers
%config %{_sysconfdir}/pam.d/samba %config %{_sysconfdir}/pam.d/samba
%{_sysconfdir}/slp.reg.d %{_sysconfdir}/slp.reg.d
%config(noreplace) %{_sysconfdir}/xinetd.d/swat
%if 0%{?suse_version} && 0%{?suse_version} > 1020 %if 0%{?suse_version} && 0%{?suse_version} > 1020
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/netbios-server %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/netbios-server
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-server %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-server
@ -1376,18 +1331,11 @@ fi
%attr(0775,root,ntadmin) %{LOCKDIR}/drivers %attr(0775,root,ntadmin) %{LOCKDIR}/drivers
%{LOCKDIR}/netlogon %{LOCKDIR}/netlogon
%attr(0770,root,users) %dir %{LOCKDIR}/profiles %attr(0770,root,users) %dir %{LOCKDIR}/profiles
%dir %{SWATDIR}
%dir %{SWATDIR}/help
%{SWATDIR}/help/welcome-no-samba-doc.html
%{SWATDIR}/images
%{SWATDIR}/include
%{SWATDIR}/lang
%{_bindir}/smbstatus %{_bindir}/smbstatus
%{_sbindir}/nmbd %{_sbindir}/nmbd
%{_sbindir}/rcnmb %{_sbindir}/rcnmb
%{_sbindir}/rcsmb %{_sbindir}/rcsmb
%{_sbindir}/smbd %{_sbindir}/smbd
%{_sbindir}/swat
%{_bindir}/smbta-util %{_bindir}/smbta-util
%if 0%{?suse_version} && 0%{?suse_version} < 1100 %if 0%{?suse_version} && 0%{?suse_version} < 1100
%dir %{_datadir}/omc %dir %{_datadir}/omc
@ -1531,8 +1479,6 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%dir %{DOCDIR} %dir %{DOCDIR}
%dir %{_datadir}/samba %dir %{_datadir}/samba
%dir %{SWATDIR}
%dir %{SWATDIR}/help
%doc %{_datadir}/susehelp %doc %{_datadir}/susehelp
%endif %endif

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:32280058c8be3c6095d1fbd7f54d8e2289891837651d56ec6627c5babd9afb20 oid sha256:eb75fc50d0d75995967776180cb40620cafecc543d23083f54ce2707e4bdc4c5
size 53808 size 53830