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

Accepting request 40245 from network:samba:STABLE

Browse Source 
Copy from network:samba:STABLE/samba based on submit request 40245 from user lmuelle

OBS-URL: https://build.opensuse.org/request/show/40245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=66
This commit is contained in:
OBS User autobuild 2010-05-25 10:57:29 +00:00 committed by Git OBS Bridge
parent 2fba4a38a8
commit ba20519881
5 changed files with 82 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-source-timestamp
View File

@ -1,2 +1,2 @@
2355 2360
Branch : trunk Branch : trunk

27
samba-doc.spec
View File

@ -41,16 +41,19 @@ BuildRequires: cracklib-devel
%if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version}
BuildRequires: krb5-devel openldap-devel BuildRequires: krb5-devel openldap-devel
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 %if 0%{?suse_version} > 1000
BuildRequires: keyutils-devel BuildRequires: keyutils-devel
%endif %endif
%if 0%{?fedora_version} || 0%{?rhel_version} > 500
BuildRequires: keyutils-libs-devel
%endif
%if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} %if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version}
BuildRequires: ctdb-devel BuildRequires: ctdb-devel
%endif %endif
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
BuildRequires: fdupes BuildRequires: fdupes
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} > 1020
BuildRequires: pkg-config BuildRequires: pkg-config
%else %else
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -63,7 +66,7 @@ BuildRequires: pkgconfig
%endif %endif
Url: http://www.samba.org/ Url: http://www.samba.org/
Version: 3.5.2 Version: 3.5.2
Release: 2 Release: 3
License: GPLv3+ License: GPLv3+
Summary: Samba Documentation Summary: Samba Documentation
Group: Documentation/Other Group: Documentation/Other
@ -119,7 +122,7 @@ BuildRequires: ccache
%else %else
%define NET_CFGDIR network-scripts %define NET_CFGDIR network-scripts
%endif %endif
%define idmap_modules idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_rid %define idmap_modules idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_rid,idmap_tdb2
%define vfs_modules vfs_cacheprime,vfs_readahead %define vfs_modules vfs_cacheprime,vfs_readahead
%if 0%{?ul_version} >= 1 %if 0%{?ul_version} >= 1
%define VENDOR UL %define VENDOR UL
@ -158,11 +161,15 @@ done
test -f vendor-files/tools/package-data && \ test -f vendor-files/tools/package-data && \
. vendor-files/tools/package-data . vendor-files/tools/package-data
pushd source3 pushd source3
vendor_tag=$( grep ^Release: ${RPM_SOURCE_DIR}/samba.spec | \ if test "%{_project}" != "openSUSE:Factory"; then
head -n 1 | \ vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \
while read tag release; do \ while read tag release; do \
echo -n "${release:+${release}-}"; \ echo -n "${release:+${release}-}"; \
done; \ done)
else
vendor_tag_release=""
fi
vendor_tag=$( echo -n "${vendor_tag_release}"; \
echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}"; \ echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}"; \
test %{make_devel} -eq 1 && echo -n "devel-" || :) test %{make_devel} -eq 1 && echo -n "devel-" || :)
# Create product suffix # Create product suffix
@ -384,7 +391,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%changelog %changelog

21
samba.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Tue May 18 09:54:15 UTC 2010 - lmuelle@suse.de
- Exclude the RPM release from the vendor tag for openSUSE Factory;
(bnc#604049).
-------------------------------------------------------------------
Thu Apr 29 10:24:54 UTC 2010 - lmuelle@suse.de
- Enable the build of the idmap tdb2 module; (bnc#600822).
-------------------------------------------------------------------
Sun Apr 25 19:14:03 UTC 2010 - lars@samba.org
- BuildRequire keyutils-libs-devel for Fedora and post-RHEL4.
-------------------------------------------------------------------
Sun Apr 25 19:00:56 UTC 2010 - lars@samba.org
- BuildRequire pkg-config for post-10.2 systems and else pkgconfig.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 21 11:11:23 UTC 2010 - jmcdonough@suse.de Wed Apr 21 11:11:23 UTC 2010 - jmcdonough@suse.de

75
samba.spec
View File

@ -41,16 +41,19 @@ BuildRequires: cracklib-devel
%if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version}
BuildRequires: krb5-devel openldap-devel BuildRequires: krb5-devel openldap-devel
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 %if 0%{?suse_version} > 1000
BuildRequires: keyutils-devel BuildRequires: keyutils-devel
%endif %endif
%if 0%{?fedora_version} || 0%{?rhel_version} > 500
BuildRequires: keyutils-libs-devel
%endif
%if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} %if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version}
BuildRequires: ctdb-devel BuildRequires: ctdb-devel
%endif %endif
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
BuildRequires: fdupes BuildRequires: fdupes
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} > 1020
BuildRequires: pkg-config BuildRequires: pkg-config
%else %else
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -68,7 +71,7 @@ Group: Productivity/Networking/Samba
Url: http://www.samba.org/ Url: http://www.samba.org/
AutoReqProv: on AutoReqProv: on
Version: 3.5.2 Version: 3.5.2
Release: 2 Release: 3
%ifarch ppc64 %ifarch ppc64
Obsoletes: samba-64bit Obsoletes: samba-64bit
%endif %endif
@ -127,7 +130,7 @@ BuildRequires: ccache
%else %else
%define NET_CFGDIR network-scripts %define NET_CFGDIR network-scripts
%endif %endif
%define idmap_modules idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_rid %define idmap_modules idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_rid,idmap_tdb2
%define vfs_modules vfs_cacheprime,vfs_readahead %define vfs_modules vfs_cacheprime,vfs_readahead
%if 0%{?ul_version} >= 1 %if 0%{?ul_version} >= 1
%define VENDOR UL %define VENDOR UL
@ -168,7 +171,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package client %package client
@ -212,7 +215,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@ -237,7 +240,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%endif %endif
@ -265,7 +268,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%endif %endif
@ -292,7 +295,7 @@ Authors:
-------- --------
Jeremy Allison <jra at samba dot org> Jeremy Allison <jra at samba dot org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%if %{make_utils} %if %{make_utils}
@ -342,7 +345,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -367,7 +370,7 @@ PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbclient %description -n libsmbclient
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%else %else
@ -412,7 +415,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libnetapi0 %package -n libnetapi0
@ -431,7 +434,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libnetapi-devel %package -n libnetapi-devel
@ -451,7 +454,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -471,7 +474,7 @@ PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbsharemodes %description -n libsmbsharemodes
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%else %else
@ -506,7 +509,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%if %{make_ldapsmb} %if %{make_ldapsmb}
@ -527,7 +530,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libtalloc-devel %package -n libtalloc-devel
@ -547,7 +550,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libtdb1 %package -n libtdb1
@ -566,7 +569,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libtdb-devel %package -n libtdb-devel
@ -586,7 +589,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libwbclient0 %package -n libwbclient0
@ -605,7 +608,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libwbclient-devel %package -n libwbclient-devel
@ -625,7 +628,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libtevent0 %package -n libtevent0
@ -644,7 +647,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libtevent-devel %package -n libtevent-devel
@ -665,7 +668,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libldb0 %package -n libldb0
@ -685,7 +688,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n libldb-devel %package -n libldb-devel
@ -706,7 +709,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%package -n ldapsmb %package -n ldapsmb
@ -715,7 +718,7 @@ Summary: Tool to administer Samba's LDAP backend
Group: Productivity/Networking/Samba Group: Productivity/Networking/Samba
AutoReqProv: on AutoReqProv: on
Version: 1.34b Version: 1.34b
Release: 286 Release: 287
Requires: perl-ldap Requires: perl-ldap
%description -n ldapsmb %description -n ldapsmb
@ -728,7 +731,7 @@ Authors:
-------- --------
Guenther Deschner <guenther at deschner dot de> Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%endif %endif
@ -751,7 +754,7 @@ Authors:
-------- --------
Steve French <sfrench at Samba dot org> Steve French <sfrench at Samba dot org>
Source Timestamp: 2355 Source Timestamp: 2360
Branch : trunk Branch : trunk
%endif %endif
@ -820,11 +823,15 @@ done
test -f vendor-files/tools/package-data && \ test -f vendor-files/tools/package-data && \
. vendor-files/tools/package-data . vendor-files/tools/package-data
pushd source3 pushd source3
vendor_tag=$( grep ^Release: ${RPM_SOURCE_DIR}/samba.spec | \ if test "%{_project}" != "openSUSE:Factory"; then
head -n 1 | \ vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \
while read tag release; do \ while read tag release; do \
echo -n "${release:+${release}-}"; \ echo -n "${release:+${release}-}"; \
done; \ done)
else
vendor_tag_release=""
fi
vendor_tag=$( echo -n "${vendor_tag_release}"; \
echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}"; \ echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}"; \
test %{make_devel} -eq 1 && echo -n "devel-" || :) test %{make_devel} -eq 1 && echo -n "devel-" || :)
# Create product suffix # Create product suffix

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:be920dbaefbb3962bfd48228f37b98af3c17dcdf819f0ea1bb3a0f2feaa479c2 oid sha256:3f8691d644ef181c4f8600d13b447a876f8ef7bb476ba967d13850c9bc4c93a6
size 24548 size 24567