Author: arekm Date: Sun Mar 22 21:36:33 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 3; add avahi patch; stop using dnssd compat layer
---- Files affected: SPECS: samba.spec (1.439 -> 1.440) ---- Diffs: ================================================================ Index: SPECS/samba.spec diff -u SPECS/samba.spec:1.439 SPECS/samba.spec:1.440 --- SPECS/samba.spec:1.439 Sun Mar 22 21:10:23 2009 +++ SPECS/samba.spec Sun Mar 22 22:36:28 2009 @@ -21,7 +21,7 @@ %bcond_without cups # without CUPS support %bcond_without kerberos5 # without Kerberos V support %bcond_without ldap # without LDAP support -%bcond_with dnssd # switch back on after fixing https://bugzilla.samba.org/show_bug.cgi?id=6179 +%bcond_without avahi %bcond_with mks # with vfs-mks (mksd dependency not distributale) %bcond_with vscan @@ -48,7 +48,7 @@ Summary(zh_CN.UTF-8): Samba 客户端和服务器 Name: samba Version: 3.3.2 -Release: 2 +Release: 3 Epoch: 1 License: GPL v2 Group: Networking/Daemons @@ -70,11 +70,12 @@ Patch3: %{name}-nscd.patch Patch4: %{name}-lprng-no-dot-printers.patch Patch5: %{name}-link.patch +Patch6: %{name}-bug-6198.patch URL: http://www.samba.org/ BuildRequires: acl-devel BuildRequires: autoconf BuildRequires: automake -%{?with_dnssd:BuildRequires: avahi-compat-libdns_sd-devel} +%{?with_avahi:BuildRequires: avahi-devel} %{?with_cups:BuildRequires: cups-devel >= 1:1.2.0} BuildRequires: dmapi-devel BuildRequires: fam-devel @@ -957,6 +958,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html @@ -987,7 +989,8 @@ --with-syslog \ --with-utmp \ --with-fhs \ - %{!?with_dnssd:--disable-dnssd} \ + --enable-avahi \ + --disable-dnssd \ --with%{!?with_ldap:out}-ldap \ --with%{!?with_kerberos5:out}-krb5 @@ -1521,6 +1524,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.440 2009/03/22 21:36:28 arekm +- rel 3; add avahi patch; stop using dnssd compat layer + Revision 1.439 2009/03/22 20:10:23 arekm - rel 2; disable dnssd for now ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/samba.spec?r1=1.439&r2=1.440&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
