From a51ed5418dae9aa2f72ce50b680d11d4dd3aed1b4e279d5984b9e10fa4eff404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 8 Aug 2011 16:19:05 +0000 Subject: [PATCH] - Remove no longer required vscan patches. - (Re)add installed files from %{_libdir}/samba/vfs/ to the filelist. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=175 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +-- samba-doc.spec | 2 +- samba.spec | 55 ++++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 076d05a..d9080cb 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2583 +2584 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 3b174fe..7d4293d 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61a29677dc4007d7cca6842b7b7c7a45d825ce1cc47f7a60ce7ce35455ebe318 -size 62528 +oid sha256:b74f3213dcca8ce7f6fb6f8c44b6edac782e7942a9aa2ea91957a42e415381cb +size 34822 diff --git a/samba-doc.spec b/samba-doc.spec index 149a5c1..86265c9 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -414,7 +414,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %changelog diff --git a/samba.spec b/samba.spec index e51a12c..8d30148 100644 --- a/samba.spec +++ b/samba.spec @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package client @@ -224,7 +224,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -251,7 +251,7 @@ Authors: The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -281,7 +281,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -308,7 +308,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %if %{make_utils} @@ -330,7 +330,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -388,14 +388,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -441,7 +441,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libnetapi0 @@ -460,7 +460,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libnetapi-devel @@ -485,7 +485,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -507,14 +507,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -551,7 +551,7 @@ Authors: The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libwbclient0 @@ -570,7 +570,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libwbclient-devel @@ -595,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtalloc2 @@ -616,7 +616,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtalloc-devel @@ -643,7 +643,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtdb1 @@ -664,7 +664,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtdb-devel @@ -687,7 +687,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtevent0 @@ -708,7 +708,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtevent-devel @@ -736,7 +736,7 @@ Authors: The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libldb1 @@ -759,7 +759,7 @@ Authors: The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libldb-devel @@ -786,7 +786,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %if %{make_ldapsmb} @@ -810,7 +810,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -1287,6 +1287,9 @@ rm -f \ %find_lang pam_winbind cat pam_winbind.lang >> ${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-winbind %find_lang net +for file in $( find ${RPM_BUILD_ROOT}%{_libdir}/samba/vfs/ -mindepth 1 ); do + echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba +done # copy the schema %__install -m 0644 examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema %__install -m 0644 examples/LDAP/samba-nds.schema ${RPM_BUILD_ROOT}/%{_datadir}/samba/LDAP/samba-nds.schema diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 7cec4e3..e1fcb2f 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e82e3795b9ebf485ababf332b34d3e589879eceeb47a0793950b4d2c20b37749 -size 51454 +oid sha256:09c1019ac1ab2f16d1df56fb8145c2d72a75778f9fdf72435b49f073cd51bf17 +size 51440