From 1ba40bfdd6f7c684749a96092e4f8826e0019aacee1a6b32b0e4fe578c2516af Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 8 Feb 2009 02:31:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=34 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +-- samba-doc.spec | 7 +++-- samba.changes | 10 +++++++ samba.spec | 63 +++++++++++++++++++++++------------------- vendor-files.tar.bz2 | 4 +-- 6 files changed, 55 insertions(+), 35 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 7498744..b4ab4c9 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2049 +2052 Branch : 3.2.7 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 0e62a57..55acf82 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08fbcf087c6b3f99bc0b8258fa75bbd431d96ba1b846586ce736f44bdbb0ffee -size 62015 +oid sha256:8056701823e0f1989946c2b110cd026d733b8b51f919067e216b5a7c00e1c443 +size 62262 diff --git a/samba-doc.spec b/samba-doc.spec index 8ba2f0e..fd2237f 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -26,7 +26,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.7 -Release: 6 +Release: 10 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -42,6 +42,9 @@ Source3: build-source-timestamp ############################################ %define make_devel 0 %define use_ccache 0 +%if 0%{?use_ccache} > 0 +BuildRequires: ccache +%endif # 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 @@ -319,7 +322,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %changelog diff --git a/samba.changes b/samba.changes index fcfc855..27f0c70 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Feb 2 22:31:32 CET 2009 - lmuelle@suse.de + +- Replace cifs.upcall Makefile patches by the upstream version. + +------------------------------------------------------------------- +Wed Jan 28 22:17:33 CET 2009 - lmuelle@suse.de + +- Only add ccache to BuildRequires if it is used. + ------------------------------------------------------------------- Fri Jan 23 16:32:16 CET 2009 - anschneider@suse.de diff --git a/samba.spec b/samba.spec index dbef76a..00eec67 100644 --- a/samba.spec +++ b/samba.spec @@ -21,7 +21,7 @@ Name: samba BuildRequires: cups-devel e2fsprogs-devel libacl-devel pam-devel popt-devel python-devel readline-devel %if 0%{?suse_version} -BuildRequires: ccache cracklib-devel openldap2-devel +BuildRequires: cracklib-devel openldap2-devel %endif %if 0%{?suse_version} > 1030 BuildRequires: gdbm-devel pwdutils @@ -36,7 +36,7 @@ BuildRequires: dmapi-devel libnscd-devel libxml2-devel mysql-devel postgresql-d BuildRequires: heimdal-devel %endif %if 0%{?fedora_version} -BuildRequires: ccache cracklib-devel +BuildRequires: cracklib-devel %endif %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} BuildRequires: krb5-devel openldap-devel @@ -51,7 +51,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.2.7 -Release: 6 +Release: 10 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -71,6 +71,9 @@ Source11: http://www.hhrm.de/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 ############################################ %define make_devel 0 %define use_ccache 0 +%if 0%{?use_ccache} > 0 +BuildRequires: ccache +%endif # 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 @@ -131,7 +134,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %package client @@ -171,7 +174,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -195,7 +198,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %endif @@ -225,7 +228,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %endif @@ -252,7 +255,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %if %{make_utils} @@ -301,7 +304,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -339,7 +342,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %else @@ -353,7 +356,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %endif @@ -387,7 +390,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %package -n libnetapi0 @@ -406,7 +409,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %package -n libnetapi-devel @@ -426,7 +429,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -453,7 +456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %else @@ -467,7 +470,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %endif @@ -498,7 +501,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %if %{make_ldapsmb} @@ -519,7 +522,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %package -n libtalloc-devel @@ -539,7 +542,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %package -n libtdb1 @@ -558,7 +561,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %package -n libtdb-devel @@ -578,7 +581,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %package -n libwbclient0 @@ -597,7 +600,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %package -n libwbclient-devel @@ -617,7 +620,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %package -n ldapsmb @@ -626,7 +629,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 251 +Release: 255 Requires: perl-ldap %description -n ldapsmb @@ -639,7 +642,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %endif @@ -663,7 +666,7 @@ Authors: -------- Steve French -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %endif @@ -675,7 +678,7 @@ Summary: On-Access Virus Scanning with Samba Group: Productivity/Networking/Samba AutoReqProv: on Version: 0.3.6b -Release: 255 +Release: 259 Provides: samba3-vscan = 0.3.6b Obsoletes: samba3-vscan Requires: samba = %{samba_ver} @@ -693,7 +696,7 @@ Authors: -------- Rainer Link -Source Timestamp: 2049 +Source Timestamp: 2052 Branch : 3.2.7 %endif @@ -1690,6 +1693,10 @@ exit 0 %endif %changelog +* Mon Feb 02 2009 lmuelle@suse.de +- Replace cifs.upcall Makefile patches by the upstream version. +* Wed Jan 28 2009 lmuelle@suse.de +- Only add ccache to BuildRequires if it is used. * Fri Jan 23 2009 anschneider@suse.de - Replace all chkconfig calls with rc_active calls to improve performance during boot. diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 1c98e4f..66c67c8 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:f7fca8e386c96fc47c2705b79a9b066d1a5d3fbde0dcff87fd39d0a796f475df -size 23232 +oid sha256:215d3e51dabee403609a2c3286c915bb912131fbe4a8db64edfb6b5a9c3b7a19 +size 23256