Author: arekm Date: Sun Aug 17 21:36:29 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - start playing with 3.2.1
---- Files affected: SPECS: samba.spec (1.408 -> 1.409) ---- Diffs: ================================================================ Index: SPECS/samba.spec diff -u SPECS/samba.spec:1.408 SPECS/samba.spec:1.409 --- SPECS/samba.spec:1.408 Fri May 30 11:25:02 2008 +++ SPECS/samba.spec Sun Aug 17 23:36:23 2008 @@ -16,7 +16,6 @@ %bcond_without cups # without CUPS support %bcond_without kerberos5 # without Kerberos V support %bcond_without ldap # without LDAP support -%bcond_without python # without python libs/utils %bcond_with mks # with vfs-mks (mksd dependency not distributale) # ADS requires kerberos5 and LDAP @@ -41,13 +40,13 @@ Summary(uk.UTF-8): SMB клієнт та сервер Summary(zh_CN.UTF-8): Samba 客户端和服务器 Name: samba -Version: 3.0.30 -Release: 2 +Version: 3.2.1 +Release: 0.1 Epoch: 1 License: GPL v2 Group: Networking/Daemons Source0: http://www.samba.org/samba/ftp/%{name}-%{version}.tar.gz -# Source0-md5: d647ec1f34414fa8691f74536dcccfb5 +# Source0-md5: ed2b790b035e508177aa2d1547af383d Source1: smb.init Source2: %{name}.pamd Source3: swat.inetd @@ -62,7 +61,7 @@ Patch1: %{name}-smbwrapper.patch Patch2: %{name}-c++-nofail.patch Patch3: %{name}-pthread.patch -Patch4: %{name}-libsmbclient-libnscd_link.patch +Patch4: %{name}-nscd.patch Patch5: %{name}-doc.patch Patch6: %{name}-libs-needed.patch Patch7: %{name}-lprng-no-dot-printers.patch @@ -87,10 +86,6 @@ BuildRequires: pam-devel >= 0.99.8.1 BuildRequires: popt-devel %{?with_pgsql:BuildRequires: postgresql-devel} -%if %{with python} -BuildRequires: python-devel -BuildRequires: rpm-pythonprov -%endif BuildRequires: readline-devel >= 4.2 BuildRequires: rpmbuild(macros) >= 1.304 BuildRequires: sed >= 4.0 @@ -512,18 +507,6 @@ %description -n cups-backend-smb -l pl.UTF-8 Backend CUPS-a drukujący na drukarkach SMB. -%package -n python-samba -Summary: Samba python tools and libraries -Summary(pl.UTF-8): Narzędzia i biblioteki pythona do samby -Group: Applications/Networking -%pyrequires_eq python-libs - -%description -n python-samba -Samba python tools and libraries. - -%description -n python-samba -l pl.UTF-8 -Narzędzia i biblioteki pythona do samby. - %package vfs-audit Summary: VFS module to audit file access Summary(pl.UTF-8): Moduł VFS do monitorowania operacji na plikach @@ -947,18 +930,21 @@ %prep %setup -q %if "%{_lib}" == "lib64" -%patch0 -p1 +#%patch0 -p1 %endif %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 +#%patch5 -p1 +#%patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +# OBSOLETE +#%patch8 -p1 +#? +#%patch9 -p1 +#? +#%patch10 -p1 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html cd examples/VFS @@ -969,8 +955,7 @@ %build cd source %{__libtoolize} -%{__autoconf} -I lib/replace -cp -f /usr/share/automake/config.sub . +%{__autoconf} -Im4 -Ilib/replace %configure \ --with-rootsbindir=/sbin \ --with-pammodulesdir=/%{_lib}/security \ @@ -984,12 +969,10 @@ --with-privatedir=%{_sysconfdir}/samba \ --with-quotas \ --with-readline \ - --with-smbmount \ --with-swatdir=%{_datadir}/swat \ --with-syslog \ --with-utmp \ --with-fhs \ - %{?with_python:--with-python} \ --with%{!?with_ldap:out}-ldap \ --with%{!?with_kerberos5:out}-krb5 @@ -1083,12 +1066,6 @@ # we have this utility in tdb package rm -f $RPM_BUILD_ROOT{%{_bindir}/tdbdump,%{_mandir}/man8/tdbdump.8*} -# python stuff -%if %{with python} -install -d $RPM_BUILD_ROOT%{py_sitedir} -cp -R source/build/lib.*/samba $RPM_BUILD_ROOT%{py_sitedir} -%endif - mv $RPM_BUILD_ROOT%{_bindir}/tdbtool $RPM_BUILD_ROOT%{_bindir}/tdbtool_samba %if %{with ldap} @@ -1310,16 +1287,6 @@ %lang(tr) %{_libdir}/%{name}/tr.msg %{_mandir}/man8/swat.8* -%if %{with python} -%files -n python-samba -%defattr(644,root,root,755) -%dir %{py_sitedir}/samba -%attr(755,root,root) %{py_sitedir}/samba/*.so -%{py_sitedir}/samba/*.py -%doc source/python/{README,gprinterdata,gtdbtool,gtkdictbrowser.py} -%doc source/python/examples -%endif - %files -n pam-pam_smbpass %defattr(644,root,root,755) %doc source/pam_smbpass/{CHAN*,README,TODO} source/pam_smbpass/samples @@ -1509,6 +1476,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.409 2008/08/17 21:36:23 arekm +- start playing with 3.2.1 + Revision 1.408 2008/05/30 09:25:02 hawk - added ugly hack to allow building with autoconf 2.62 - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/samba.spec?r1=1.408&r2=1.409&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
