From 5f1ef52525257e78232883275048c72e2df56308c98c1884677440c2ebecea8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 28 Jun 2013 17:10:44 +0000 Subject: [PATCH 1/3] Remove ldapsmb from the main spec file. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=319 --- patches.tar.bz2 | 4 ++-- samba-doc.spec | 9 +-------- samba.changes | 5 +++++ samba.spec | 48 +------------------------------------------- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 11 insertions(+), 59 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index ee20608..abbd07c 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e822e6f9d6ddc1a8b0c3ea9ce851410d425d778bf7efb8c59a11883ef90981a6 -size 37801 +oid sha256:92de76e6d4e665c3983304ca2158577f72dfae275dbdd79b9505446615fa57b6 +size 37272 diff --git a/samba-doc.spec b/samba-doc.spec index ca4bec7..cc3c71b 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -129,11 +129,10 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3027 +%define SOURCE_TIMESTAMP 3028 %define BRANCH %{version} Version: 3.6.16 Release: 0 -%define ldapsmb_ver 1.34b Url: http://www.samba.org/ License: GPL-3.0+ Summary: Samba Documentation @@ -149,7 +148,6 @@ Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.t Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source4: baselibs.conf -Source11: http://www.samba.org/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 # Choose some features / extra packages here ############################################ %define make_devel 0 @@ -160,7 +158,6 @@ BuildRequires: ccache # requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent %define make_doc 0 %define make_utils 0 -%define make_ldapsmb 1 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs %else @@ -210,10 +207,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # samba-doc nowadays is part the main samba spec file %if 0%{?suse_version} && 0%{?suse_version} < 1111 %setup -n samba-%{samba_ver_full} -q -# ldapsmb -%if %{make_ldapsmb} -%setup -T -D -a 11 -n samba-%{samba_ver_full} -q -%endif # patches %setup -T -D -a 2 -n samba-%{samba_ver_full} -q for patch in $( patches/tools/guards %{guards_symbols} 1120 %define cifs_init_script cifs %else @@ -645,26 +642,6 @@ develop programs which make use of the tevent programming interface. Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -%endif - -%if %{make_ldapsmb} - -%package -n ldapsmb -Version: 1.34b -Release: 0 -License: GPL-2.0+ -Summary: Tool to administer Samba's LDAP backend -Group: Productivity/Networking/Samba -Requires: perl-ldap - -%description -n ldapsmb -This tool aims to simplify the administration of a Samba Domain -Controller that uses the ldapsam passdb backend. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - - %endif %prep @@ -680,10 +657,6 @@ grep "^VERSION = '%{libtdb_ver}'$" lib/tdb/wscript || \ grep "^VERSION = '%{libtevent_ver}'$" lib/tevent/wscript || \ exit 1 %endif -# ldapsmb -%if %{make_ldapsmb} -%setup -T -D -a 11 -n samba-%{samba_ver_full} -q -%endif # patches %setup -T -D -a 2 -n samba-%{samba_ver_full} -q for patch in $( patches/tools/guards %{guards_symbols} Date: Mon, 1 Jul 2013 15:34:24 +0000 Subject: [PATCH 2/3] Remove obsoleted ldapsmb-1.34b tar ball. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=320 --- ldapsmb-1.34b.tar.bz2 | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 ldapsmb-1.34b.tar.bz2 diff --git a/ldapsmb-1.34b.tar.bz2 b/ldapsmb-1.34b.tar.bz2 deleted file mode 100644 index 6ca8f6b..0000000 --- a/ldapsmb-1.34b.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7602f956f07f7d8f95352679bc0393f2d3a731be2d85334a1b703a7ff498cdb0 -size 44588 From 069fa9ce4bd0c1cb90e9d63c78d3a6e687eee7d04bc6fd8a11b426cde33e3cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 1 Jul 2013 18:00:56 +0000 Subject: [PATCH 3/3] Use SLE as product prefix for SUSE Linux Enterprise, oS for openSUSE, and OBS for any other operating system to define the vendor string while build. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=321 --- patches.tar.bz2 | 4 ++-- samba-doc.spec | 9 +++------ samba.changes | 6 ++++++ samba.spec | 9 +++------ vendor-files.tar.bz2 | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index abbd07c..5e30370 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92de76e6d4e665c3983304ca2158577f72dfae275dbdd79b9505446615fa57b6 -size 37272 +oid sha256:a63d4e18c45a619eb5590eb5a9c591ab21c9fce0adf9082b6f442daa2b382545 +size 37281 diff --git a/samba-doc.spec b/samba-doc.spec index cc3c71b..72ac8c2 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -129,7 +129,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3028 +%define SOURCE_TIMESTAMP 3030 %define BRANCH %{version} Version: 3.6.16 Release: 0 @@ -251,15 +251,12 @@ product_version="${major_version}.${minor_version}" product_suffix="" if test "%{VENDOR}" != "UL"; then if test 0%{?sles_version} -gt 0; then - product_suffix="-SLES%{sles_version}" + product_suffix="-SLE_%{sles_version}" elif test 0%{?suse_version} -gt 0; then - product_suffix="-SL${product_version}" + product_suffix="-oS${product_version}" else product_suffix="-OBS" fi - case "%{?suse_version}" in - 1010|1110) product_suffix="-CODE${major_version}" ;; - esac fi # Add the build architecture test "%{_build_arch}" != "" && \ diff --git a/samba.changes b/samba.changes index e05b887..a2f540b 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 1 17:34:32 UTC 2013 - lmuelle@suse.com + +- Use SLE as product prefix for SUSE Linux Enterprise, oS for openSUSE, and + OBS for any other operating system to define the vendor string while build. + ------------------------------------------------------------------- Fri Jun 28 16:49:31 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 81f96e5..64f8184 100644 --- a/samba.spec +++ b/samba.spec @@ -129,7 +129,7 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3028 +%define SOURCE_TIMESTAMP 3030 %define BRANCH %{version} Version: 3.6.16 Release: 0 @@ -701,15 +701,12 @@ product_version="${major_version}.${minor_version}" product_suffix="" if test "%{VENDOR}" != "UL"; then if test 0%{?sles_version} -gt 0; then - product_suffix="-SLES%{sles_version}" + product_suffix="-SLE_%{sles_version}" elif test 0%{?suse_version} -gt 0; then - product_suffix="-SL${product_version}" + product_suffix="-oS${product_version}" else product_suffix="-OBS" fi - case "%{?suse_version}" in - 1010|1110) product_suffix="-CODE${major_version}" ;; - esac fi # Add the build architecture test "%{_build_arch}" != "" && \ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 78dc84e..65cd042 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:7ec8ea0364a922a25d84ab4043e4bcd4c88b17657e78e86b94ce5db8c6890688 -size 53566 +oid sha256:8710e02e7058c37f8d49040c6d7e3a2c25a353fac11fbf85a35f0e6ab9772ee3 +size 53568