From 622a44dace82d75d456f9c4cec9fe0fa6670f726f2797227c2f34ecf5af15c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 21 Jan 2013 11:39:03 +0000 Subject: [PATCH] - Disable SWAT during configure and don't package it any longer. - 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 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +-- samba-doc.spec | 44 ++------------------------------ samba.changes | 10 ++++++++ samba.spec | 58 ++---------------------------------------- vendor-files.tar.bz2 | 4 +-- 6 files changed, 19 insertions(+), 103 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index f7355ca..f650516 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2908" +SOURCE_TIMESTAMP="2911" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index ab705a4..e705dae 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d295dbe07ea5943e4634e22a6fc09e3a2e322c577c8744d5fc8554d6c550e05 -size 32058 +oid sha256:99dc29441eea09151f7064b1986d978258c6df503420cd99f72cd9e37696d9fb +size 31234 diff --git a/samba-doc.spec b/samba-doc.spec index 07781ba..2e9595b 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2908 +%define SOURCE_TIMESTAMP 2911 %define BRANCH %{version} Version: 4.0.1 Release: 0 @@ -182,7 +182,6 @@ BuildRequires: ccache ################################ %define DOCDIR %{_defaultdocdir}/samba %define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook -%define SWATDIR %{_datadir}/samba/swat %define LOGDIR %{_localstatedir}/log/samba %define LOCKDIR %{_localstatedir}/lib/samba %define CONFIGDIR %{_sysconfdir}/samba @@ -336,11 +335,8 @@ CONFIGURE_OPTIONS="\ --with-utmp \ --with-winbind \ --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} ./script/mkversion.sh %endif @@ -351,7 +347,6 @@ done mkdir -p \ %{buildroot}/%{DOCDIR} \ %{buildroot}/%{DOCBOOKDIR} \ - %{buildroot}/%{SWATDIR}/help \ %{buildroot}/%{_datadir}/susehelp/meta/Administration/System # utility scripts scripts="creategroup mksmbpasswd.sh" @@ -389,28 +384,6 @@ cp -a docs/* %{buildroot}/%{DOCDIR} rm -rf "%{buildroot}/%{DOCBOOKDIR}" rm -f examples/VFS/*~ 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 for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do # exclude %{DOCDIR}, README, and docbook @@ -428,17 +401,6 @@ rm -f \ %endif %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 [ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" @@ -449,8 +411,6 @@ fi %defattr(-,root,root) %dir %{DOCDIR} %dir %{_datadir}/samba -%dir %{SWATDIR} -%dir %{SWATDIR}/help %doc %{_datadir}/susehelp %endif diff --git a/samba.changes b/samba.changes index f13a04d..ce32040 100644 --- a/samba.changes +++ b/samba.changes @@ -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 diff --git a/samba.spec b/samba.spec index 5b68e66..de5aaf7 100644 --- a/samba.spec +++ b/samba.spec @@ -126,7 +126,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2908 +%define SOURCE_TIMESTAMP 2911 %define BRANCH %{version} Version: 4.0.1 Release: 0 @@ -189,7 +189,6 @@ BuildRequires: ccache ################################ %define DOCDIR %{_defaultdocdir}/samba %define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook -%define SWATDIR %{_datadir}/samba/swat %define LOGDIR %{_localstatedir}/log/samba %define LOCKDIR %{_localstatedir}/lib/samba %define CONFIGDIR %{_sysconfdir}/samba @@ -803,11 +802,8 @@ CONFIGURE_OPTIONS="\ --with-utmp \ --with-winbind \ --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} ./script/mkversion.sh make samba3-idl @@ -907,7 +903,6 @@ install -d -m 0755 -p \ %{buildroot}/%{_var}/run \ %{buildroot}/%{DOCDIR} \ %{buildroot}/%{DOCBOOKDIR} \ - %{buildroot}/%{SWATDIR}/help \ %{buildroot}/%{_datadir}/susehelp/meta/Administration/System %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -1011,7 +1006,6 @@ install -m 0755 tools/update-apparmor-samba-profile \ # PDF generator install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf 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.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba 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 -f examples/VFS/*~ 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 for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do # exclude %{DOCDIR}, README, and docbook @@ -1263,22 +1235,6 @@ fi %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 if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb @@ -1362,7 +1318,6 @@ fi %config(noreplace) %{CONFIGDIR}/smbusers %config %{_sysconfdir}/pam.d/samba %{_sysconfdir}/slp.reg.d -%config(noreplace) %{_sysconfdir}/xinetd.d/swat %if 0%{?suse_version} && 0%{?suse_version} > 1020 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/netbios-server %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-server @@ -1376,18 +1331,11 @@ fi %attr(0775,root,ntadmin) %{LOCKDIR}/drivers %{LOCKDIR}/netlogon %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 %{_sbindir}/nmbd %{_sbindir}/rcnmb %{_sbindir}/rcsmb %{_sbindir}/smbd -%{_sbindir}/swat %{_bindir}/smbta-util %if 0%{?suse_version} && 0%{?suse_version} < 1100 %dir %{_datadir}/omc @@ -1531,8 +1479,6 @@ fi %defattr(-,root,root) %dir %{DOCDIR} %dir %{_datadir}/samba -%dir %{SWATDIR} -%dir %{SWATDIR}/help %doc %{_datadir}/susehelp %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 4ab6661..de296d9 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32280058c8be3c6095d1fbd7f54d8e2289891837651d56ec6627c5babd9afb20 -size 53808 +oid sha256:eb75fc50d0d75995967776180cb40620cafecc543d23083f54ce2707e4bdc4c5 +size 53830