- pdb-xml is gone with 3.0.23 release

Changed files:
    samba.spec -> 1.329

diff --git a/samba.spec b/samba.spec
index 5eb3a0860ec1caf4c66b57579c3a6c3e6e1f0570..0216084c0839704df029831ef0df0b2015af6125 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -1,6 +1,5 @@
 # TODO:
 # - look into other distro specs for valid %descriptions for samba 3
-# - check where's pdb-xml
 #
 # Conditional build:
 %bcond_without ads             # without ActiveDirectory support
@@ -32,7 +31,7 @@ Summary(uk):  SMB 
 Summary(zh_CN):        Samba ¿Í»§¶ËºÍ·þÎñÆ÷
 Name:          samba
 Version:       3.0.23a
-Release:       0.4
+Release:       0.6
 Epoch:         1
 License:       GPL v2
 Group:         Networking/Daemons
@@ -62,7 +61,7 @@ BuildRequires:        automake
 BuildRequires: iconv
 BuildRequires: libmagic-devel
 BuildRequires: libtool >= 2:1.4d
-BuildRequires: libxml2-devel
+#BuildRequires:        libxml2-devel
 BuildRequires: ncurses-devel >= 5.2
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 BuildRequires: openssl-devel >= 0.9.7d
@@ -82,6 +81,7 @@ Requires:     logrotate
 Requires:      pam >= 0.66
 Requires:      rc-scripts
 Requires:      setup >= 2.4.6-7
+Obsoletes:     samba-pdb-xml
 Obsoletes:     samba-vfs-block
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -284,18 +284,6 @@ SWAT - ferramentada Web de configura
 ÄÌÑ ÄÉÓÔÁÎæÊÎÏÇÏ ÁÄͦΦÓÔÒÕ×ÁÎÎÑ ÆÁÊÌÕ smb.conf ÚÁ ÄÏÐÏÍÏÇÏÀ ×ÁÛÏÇÏ
 ÕÌÀÂÌÅÎÏÇÏ Web-ÂÒÁÕÚÅÒÕ.
 
-%package pdb-xml
-Summary:       Samba XML password database plugin
-Summary(pl):   Wtyczka Samby do przechowywania hase³ w bazie XML
-Group:         Networking/Daemons
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description pdb-xml
-Samba XML password database plugin.
-
-%description pdb-xml -l pl
-Wtyczka Samby do przechowywania hase³ w bazie XML.
-
 %package client
 Summary:       Samba client programs
 Summary(es):   Cliente SMB de Samba
@@ -961,7 +949,6 @@ cd source
 #      --with-vfs \
 #      --with-tdbsam \
 #      %{?with_ipv6:--with-ipv6} \
-#      --with-expsam=xml%{?with_mysql:,mysql}%{?with_pgsql:,pgsql} \
 
 %configure \
        --with-rootsbindir=/sbin \
@@ -1180,10 +1167,6 @@ fi
 %doc examples/LDAP
 %endif
 
-%files pdb-xml
-%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/%{name}/pdb/xml.so
-
 %files winbind
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/winbindd