Author: baggins Date: Mon Jan 11 16:45:41 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 0.1
- doesn't build, source looks badly git-mismerged
---- Files affected:
packages/samba:
samba.spec (1.474 -> 1.475)
---- Diffs:
================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.474 packages/samba/samba.spec:1.475
--- packages/samba/samba.spec:1.474 Mon Jan 11 16:25:34 2010
+++ packages/samba/samba.spec Mon Jan 11 17:45:36 2010
@@ -53,7 +53,7 @@
Summary(zh_CN.UTF-8): Samba 客户端和服务器
Name: samba
Version: 3.4.4
-Release: 1
+Release: 0.1
Epoch: 1
License: GPL v3
Group: Networking/Daemons
@@ -76,7 +76,6 @@
Patch3: %{name}-nscd.patch
Patch4: %{name}-lprng-no-dot-printers.patch
Patch5: %{name}-python.patch
-Patch6: %{name}-spoolss-mismerge.patch
URL: http://www.samba.org/
BuildRequires: acl-devel
BuildRequires: autoconf
@@ -982,7 +981,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html
@@ -1618,6 +1616,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.475 2010/01/11 16:45:36 baggins
+- rel 0.1
+- doesn't build, source looks badly git-mismerged
+
Revision 1.474 2010/01/11 15:25:34 baggins
- fix spoolss.c mismerge
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.474&r2=1.475&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
