From 5779f606d31a71f116a755fee8cbe000d0b6f7f8731101319b9ab0a708809e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 14 Sep 2011 15:12:29 +0000 Subject: [PATCH] Remove the extra Version and Release define from the doc package as we inherit it from the main samba.spec file. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=189 --- build-source-timestamp | 2 +- samba-doc.spec | 4 +--- samba.spec | 52 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 30 insertions(+), 32 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 2b82c9c..cc9ee49 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2630 +2631 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 94e28e5..d62a961 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -101,8 +101,6 @@ BuildRequires: pkgconfig Version: 3.6.0 Release: 4 Url: http://www.samba.org/ -Version: 3.6.0 -Release: 4 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -434,7 +432,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %changelog diff --git a/samba.spec b/samba.spec index 1d25c7d..ac180c8 100644 --- a/samba.spec +++ b/samba.spec @@ -205,7 +205,7 @@ Authors: The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package client @@ -249,7 +249,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -275,7 +275,7 @@ Authors: The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %endif @@ -305,7 +305,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %endif @@ -332,7 +332,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %if %{make_utils} @@ -353,7 +353,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %endif @@ -388,7 +388,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -414,14 +414,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %endif @@ -469,7 +469,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libnetapi0 @@ -487,7 +487,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libnetapi-devel @@ -511,7 +511,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -532,14 +532,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %endif @@ -575,7 +575,7 @@ Authors: The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libwbclient0 @@ -593,7 +593,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libwbclient-devel @@ -617,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libtalloc2 @@ -637,7 +637,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libtalloc-devel @@ -663,7 +663,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libtdb1 @@ -683,7 +683,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libtdb-devel @@ -705,7 +705,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libtevent0 @@ -725,7 +725,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libtevent-devel @@ -753,7 +753,7 @@ Authors: The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libldb1 @@ -775,7 +775,7 @@ Authors: The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %package -n libldb-devel @@ -802,7 +802,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %if %{make_ldapsmb} @@ -825,7 +825,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2630 +Source Timestamp: 2631 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index f50ade9..dfb2a64 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:a2cac10a5cdb2924330646d5b3e166b466b035916bcc90cfc095ef5b16e5ab83 -size 51417 +oid sha256:1064f624762892c5d58156b0eebfdd68ed8c4728bab634e4b1e387b341251e3b +size 51450