From 83398d05b0654c21999cc4cd451a3084642be1a2 Mon Sep 17 00:00:00 2001 From: Guenther Deschner Date: Thu, 17 Dec 2009 17:28:15 +0000 Subject: [PATCH] talloc 2.0.1 is in rawhide now, so use it. no need for the build patch anymore. Guenther --- samba-3.5.0pre2-build.patch | 11 ----------- samba.spec | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 samba-3.5.0pre2-build.patch diff --git a/samba-3.5.0pre2-build.patch b/samba-3.5.0pre2-build.patch deleted file mode 100644 index 6ac0592..0000000 --- a/samba-3.5.0pre2-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source3/configure.in.orig 2009-12-15 14:36:46.000000000 +0100 -+++ source3/configure.in 2009-12-15 14:36:52.000000000 +0100 -@@ -1885,7 +1885,7 @@ - - if test "x$enable_external_libtalloc" != xno - then -- PKG_CHECK_MODULES(LIBTALLOC, talloc >= 2.0.1, -+ PKG_CHECK_MODULES(LIBTALLOC, talloc >= 2.0.0, - [ enable_external_libtalloc=yes ], - [if test x$enable_external_libtalloc = xyes; then - AC_MSG_ERROR([Unable to find libtalloc]) diff --git a/samba.spec b/samba.spec index 896c3f4..1f1d8b5 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ %define main_release 50 %define samba_version 3.5.0 %define tdb_version 1.1.7 -%define talloc_version 2.0.0 +%define talloc_version 2.0.1 #%define pre_release %nil %define pre_release pre2 @@ -45,7 +45,6 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch # The passwd part has been applied, but not the group part Patch107: samba-3.2.0pre1-grouppwd.patch Patch200: samba-3.2.5-inotify.patch -Patch201: samba-3.5.0pre2-build.patch Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release} Requires: pam >= 0:0.64 @@ -203,7 +202,6 @@ cp %{SOURCE11} packaging/Fedora/ #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply %patch107 -p1 -b .grouppwd %patch200 -p0 -b .inotify -%patch201 -p0 -b .build mv %samba_source/VERSION %samba_source/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION