packages: samba/samba.spec renamed deps

glen glen at pld-linux.org
Thu Oct 20 20:49:43 CEST 2011


Author: glen                         Date: Thu Oct 20 18:49:43 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
 renamed deps

---- Files affected:
packages/samba:
   samba.spec (1.510 -> 1.511) 

---- Diffs:

================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.510 packages/samba/samba.spec:1.511
--- packages/samba/samba.spec:1.510	Wed Oct 19 10:23:58 2011
+++ packages/samba/samba.spec	Thu Oct 20 20:49:38 2011
@@ -36,7 +36,7 @@
 %endif
 
 %if %{with system_libtalloc}
-%define		libtalloc_ver	2:2.0.1
+%define		libtalloc_ver	2.0.1
 %else
 %define		libtalloc_ver	%{epoch}:%{version}-%{release}
 %endif
@@ -103,7 +103,6 @@
 BuildRequires:	keyutils-devel
 BuildRequires:	libmagic-devel
 BuildRequires:	libnscd-devel
-%{?with_system_libtalloc:BuildRequires:	libtalloc-devel >= %{libtalloc_ver}}
 BuildRequires:	libtool >= 2:1.4d
 BuildRequires:	make >= 3.81
 BuildRequires:	ncurses-devel >= 5.2
@@ -118,6 +117,7 @@
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	rpmbuild(macros) >= 1.304
 BuildRequires:	sed >= 4.0
+%{?with_system_libtalloc:BuildRequires:	talloc-devel >= %{libtalloc_ver}}
 %{?with_system_libtdb:BuildRequires:	tdb-devel >= %{libtdb_ver}}
 BuildRequires:	xfsprogs-devel
 Requires(post,preun):	/sbin/chkconfig
@@ -387,7 +387,7 @@
 Summary(ru.UTF-8):	Файлы, используемые как сервером, так и клиентом Samba
 Summary(uk.UTF-8):	Файли, що використовуються як сервером, так і клієнтом Samba
 Group:		Networking/Daemons
-Requires:	libtalloc >= %{libtalloc_ver}
+Requires:	talloc >= %{libtalloc_ver}
 Requires:	tdb >= %{libtdb_ver}
 
 %description common
@@ -1459,6 +1459,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.511  2011/10/20 18:49:38  glen
+ renamed deps
+
 Revision 1.510  2011/10/19 08:23:58  arekm
 - up to 3.6.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.510&r2=1.511&f=u



More information about the pld-cvs-commit mailing list