OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=14

build-source-timestamp

@@ -1,2 +1,2 @@
-1743
+1776
 Branch      : trunk

samba-doc.spec

@@ -19,7 +19,7 @@ BuildRequires:  ccache cracklib-devel cups-devel e2fsprogs-devel gdbm-devel krb5
 License:        GPL v3 or later
 Url:            http://www.samba.org/
 Version:        3.2.0
-Release:        10
+Release:        14
 Summary:        Samba Documentation
 Group:          Documentation/Other
 AutoReqProv:    on
@@ -40,12 +40,6 @@ Source3:        build-source-timestamp
 %define	make_utils 0
 %define	make_vscan 0
 %define	make_ldapsmb 1
-%if %{suse_version} < 1021
-# requires: libxml2 libxml2-devel mysql-devel mysql-shared
-%define	make_pdb 1
-%else
-%define	make_pdb 0
-%endif
 # Define some global directories
 ################################
 %define	DOCDIR %{_defaultdocdir}/samba
@@ -58,10 +52,10 @@ Source3:        build-source-timestamp
 %define	PIDDIR %{_localstatedir}/run/samba
 %define	idmap_modules idmap_ad,idmap_ldap,idmap_rid
 %define	vfs_modules vfs_cacheprime,vfs_readahead
-%if %ul_version >= 1
+%if 0%{?ul_version} >= 1
 %define	VENDOR UL
 %else
-%if "%{_vendor}" == "suse"
+%if "%{_vendor}" == "suse" || "%{_vendor}" == "redhat"
 %define	VENDOR SUSE
 %else
 %define	VENDOR %_vendor
@@ -98,18 +92,25 @@ vendor_tag=$( grep ^Release: ${RPM_SOURCE_DIR}/samba.spec | \
 	echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}"; \
 	test %{make_devel} -eq 1 && echo -n "devel-" || :)
 # Create product suffix
-major_version=$((%{suse_version}/100))
+test 0%{?centos_version} -gt 0 && product_version=%{?centos_version}
-minor_version=$((%{suse_version}/10))
+test 0%{?fedora_version} -gt 0 && product_version=%{?fedora_version}
+test 0%{?mandriva_version} -gt 0 && product_version=%{?mandriva_version}
+test 0%{?rhel_version} -gt 0 && product_version=%{?rhel_version}
+test 0%{?suse_version} -gt 0 && product_version=%{?suse_version}
+major_version=$((${product_version}/100))
+minor_version=$((${product_version}/10))
 minor_version="${minor_version#$major_version}"
 product_version="${major_version}.${minor_version}"
 product_suffix=""
 if test "%{VENDOR}" != "UL"; then
-	if test "%{sles_version}" -gt 0; then
+	if test 0%{?sles_version} -gt 0; then
 		product_suffix="-SLES%{sles_version}"
-	else
+	elif test 0%{?suse_version} -gt 0; then
 		product_suffix="-SL${product_version}"
+	else
+		product_suffix="-OBS"
 	fi
-	case "%{suse_version}" in
+	case "0%{?suse_version}" in
 		1010) product_suffix="-CODE${major_version}" ;;
 	esac
 fi
@@ -118,7 +119,7 @@ mv VERSION VERSION.orig
 sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/ VERSION.orig >VERSION
 
 %build samba-%{samba_ver_full}
-%if %{suse_version} < 911
+%if 0%{?suse_version} && 0%{?suse_version} < 911
 	OPTIMIZATION="-O"
 %else
 	# use the default optimization
@@ -298,7 +299,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 1743
+Source Timestamp: 1776
 Branch      : trunk
 
 %changelog

samba.changes

@@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+Fri May 16 16:10:14 CEST 2008 - lmuelle@suse.de
+
+- Remove obsoletes and provides <package>3 for all packages and systems.
+
+-------------------------------------------------------------------
+Fri May 16 14:55:02 CEST 2008 - lmuelle@suse.de
+
+- Cleanup the use of the suse_version macro to achieve consistent defaults.
+
+-------------------------------------------------------------------
+Fri May 16 13:28:53 CEST 2008 - lmuelle@suse.de
+
+- Set CODEPAGEDIR while make to fit the install location.
+
+-------------------------------------------------------------------
+Thu May 15 00:16:13 CEST 2008 - lmuelle@suse.de
+
+- Package man page files independent of the used compression method (gz,lzma).
+
+-------------------------------------------------------------------
+Wed May 14 18:08:26 CEST 2008 - lmuelle@suse.de
+
+- Rewrite spec file to build packages for Fedora, Redhat, CentOS, and Mandriva
+  in the OBS too.
+
+-------------------------------------------------------------------
+Wed May 14 17:27:52 CEST 2008 - anschneider@suse.de
+
+- Add a script to restart smbfs if NetworkMangaer gets an IP address;
+  [bnc#373075].
+
+-------------------------------------------------------------------
+Tue May 13 17:30:00 CEST 2008 - lmuelle@suse.de
+
+- Remove all references to the obsoleted samba-pdb package.
+
+-------------------------------------------------------------------
+Fri May  9 18:19:17 CEST 2008 - lmuelle@suse.de
+
+- Compose the BuildRequires in a more flexible way to fit the openSUSE build
+  service (OBS) requirements to support different operating system targets.
+
 -------------------------------------------------------------------
 Mon Apr 28 16:55:00 CEST 2008 - lmuelle@suse.de
 

vendor-files.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d200dbf2f2d7c5bf4d7633c22a6b963770de4b2152f76a906d3f97af72076cb1
+oid sha256:7c946a09edec7816defc845caed7145e6e12cbb6315f1a12eb3938f645cc9c4a
-size 21914
+size 22001