Hello community,
here is the log from the commit of package samba for openSUSE:Factory checked in at 2013-07-02 07:45:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
and /work/SRC/openSUSE:Factory/.samba.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba"
Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes 2013-06-26 20:28:29.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2013-07-02 07:45:09.000000000 +0200
@@ -1,0 +2,11 @@
+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
+
+- Remove ldapsmb from the main spec file.
+
+-------------------------------------------------------------------
Old:
----
ldapsmb-1.34b.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.NgS2xe/_old 2013-07-02 07:45:11.000000000 +0200
+++ /var/tmp/diff_new_pack.NgS2xe/_new 2013-07-02 07:45:11.000000000 +0200
@@ -129,11 +129,10 @@
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
-%define SOURCE_TIMESTAMP 3027
+%define SOURCE_TIMESTAMP 3030
%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 @@
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 @@
# 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 @@
# 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} http://www.samba.org/
Group: Productivity/Networking/Samba
@@ -152,7 +151,6 @@
Source1: vendor-files.tar.bz2
Source2: patches.tar.bz2
Source4: baselibs.conf
-Source11: http://www.samba.org/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2
PreReq: /usr/bin/getent
PreReq: /usr/sbin/groupadd
PreReq: coreutils
@@ -167,7 +165,6 @@
# 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
@@ -647,26 +644,6 @@
%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
%setup -n samba-%{samba_ver_full} -q
# check if our library versions from the spec are still current
@@ -680,10 +657,6 @@
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} .
- Define a workstation. Requires B<-add>, B<-delete>, B<-list>, B<-join> or
- B<-remove>.
-
-+=back
-+
- =head1 GLOBAL OPTIONS
-
-+=over 8
-+
- =item B<--debug n>
-
- Use an debuglevel. You can choose between 3 (default), 5 and 10 (full
-@@ -184,8 +188,12 @@ Prints additional information if possibl
-
- Prints the version and exits.
-
-+=back
-+
- =head1 MISC OPTIONS
-
-+=over 8
-+
- =item B<--comment|-c> C<comment>
-
- Set a comment for a given user while adding or modifying a user.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/ldapsmb-VERSION.diff new/patches/suse/ldapsmb-VERSION.diff
--- old/patches/suse/ldapsmb-VERSION.diff 2013-04-04 19:32:48.000000000 +0200
+++ new/patches/suse/ldapsmb-VERSION.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-Author: Lars Mueller <lmuelle at suse dot de>
-Subject: ldapsmb builds fail on Fedora 15 and 16
-Bugzilla: https://bugzilla.samba.org/show_bug.cgi?id=8783
-
-Index: ldapsmb-1.34b/configure.in
-===================================================================
---- ldapsmb-1.34b/configure.in.orig
-+++ ldapsmb-1.34b/configure.in
-@@ -148,7 +148,7 @@ AC_ARG_WITH(nscdinitscript,
-
-
- # source version
--. VERSION
-+. ./VERSION
-
- AC_SUBST(VERSION)
- AC_SUBST(LOGFILEBASE)
++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2013-06-26 17:43:16.000000000 +0200
+++ new/vendor-files/tools/package-data 2013-07-01 19:59:14.000000000 +0200
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="3027"
+SAMBA_PACKAGE_SVN_VERSION="3030"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org