diff --git a/_service b/_service new file mode 100644 index 0000000..911fe1c --- /dev/null +++ b/_service @@ -0,0 +1,22 @@ + + + https://gitlab.suse.de/samba/suse-samba.git/ + git + factory + @PARENT_TAG@+git.@TAG_OFFSET@.%h + samba(.*) + \1 + samba + .git + + + + samba + samba.spec + + + + *.tar + bz2 + + diff --git a/patches.tar.bz2 b/patches.tar.bz2 deleted file mode 100644 index 724f3a8..0000000 --- a/patches.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a87b1860f8071112f560270a937d33a68c069aaf5ccaf8328809ebc7c2fb444 -size 41226 diff --git a/samba-4.6.2+git.19.c267455e57b.tar.bz2 b/samba-4.6.2+git.19.c267455e57b.tar.bz2 new file mode 100644 index 0000000..cd92ef7 --- /dev/null +++ b/samba-4.6.2+git.19.c267455e57b.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5692398d4e0efc3d7aef861ff3d945ab64020f7b7f53080472db56fff90e66b +size 25948940 diff --git a/samba-4.6.2.tar.asc b/samba-4.6.2.tar.asc deleted file mode 100644 index 8bb4fc9..0000000 --- a/samba-4.6.2.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iD8DBQBY3flHbzORW2Vot+oRAmTlAJ9sFlLebbYX3c7rOh1P9btozLmTPQCghScz -DQw3KuAbWCKIgkHcy1zZr2o= -=bIg5 ------END PGP SIGNATURE----- diff --git a/samba-4.6.2.tar.gz b/samba-4.6.2.tar.gz deleted file mode 100644 index 4c71678..0000000 --- a/samba-4.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:927afcc16e444718985e3952de92d34e7b776b9ca0238179d866da18a6441c35 -size 21097045 diff --git a/samba.changes b/samba.changes index 5f4f48b..f1a266b 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 18 13:38:11 UTC 2017 - ddiss@suse.com + +- Generate source tarball directly from Git using OBS tar_scm + + use version string derived from parent Git tag and commit hash + - remove obsolete vendor-files/tools/package-data version ID + + explicitly generate ctdb manpages, needed without "make dist" + ------------------------------------------------------------------- Mon Apr 10 13:52:40 UTC 2017 - ddiss@suse.com diff --git a/samba.keyring b/samba.keyring deleted file mode 100644 index 31ac4fe..0000000 --- a/samba.keyring +++ /dev/null @@ -1,85 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -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 -=IqTy ------END PGP PUBLIC KEY BLOCK----- diff --git a/samba.spec b/samba.spec index 6a6ae3c..6859548 100644 --- a/samba.spec +++ b/samba.spec @@ -130,16 +130,6 @@ BuildRequires: libpcp-devel BuildRequires: libcephfs-devel BuildRequires: librados-devel %endif -%define samba_ver 4.6.2 -%define samba_ver_suffix %nil -%if "%{samba_ver_suffix}" == "" -%define samba_source_location https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz -%define samba_source_signature_location https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.asc -%else -%define samba_source_location https://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.gz -%define samba_source_signature_location https://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.asc -%endif -%define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1031 %define libsmbclient_name libsmbclient %else @@ -156,7 +146,7 @@ BuildRequires: librados-devel %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -Version: 4.6.2 +Version: 4.6.2+git.19.c267455e57b Release: 0 Url: https://www.samba.org/ Obsoletes: samba-gplv3 < %{version} @@ -168,11 +158,8 @@ Recommends: logrotate Summary: A SMB/CIFS File, Print, and Authentication Server License: GPL-3.0+ Group: Productivity/Networking/Samba -Source: %{samba_source_location} -Source5: %{samba_source_signature_location} -Source6: samba.keyring +Source: samba-%{version}.tar.bz2 Source1: vendor-files.tar.bz2 -Source2: patches.tar.bz2 Source4: baselibs.conf Source100: samba-client-rpmlintrc Requires: /usr/bin/getent @@ -1052,21 +1039,11 @@ that RADOS locks can be used for CTDB split-brain avoidance. %prep -%setup -n samba-%{samba_ver_full} -q -# patches -%setup -T -D -a 2 -n samba-%{samba_ver_full} -q -for patch in $( patches/tools/guards %{guards_symbols} >${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file} + rm -f "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}" + touch "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}" + echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-${file} done install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/ # SUSEhelp files @@ -1392,14 +1374,14 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do case "${file#%{buildroot}}" in %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; esac - echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" + echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{version}/filelist-samba-doc" done for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do # if built we don't want vfs_ceph in the base package case "${file#%{buildroot}}" in %{_libdir}/samba/vfs/ceph.so) continue ;; esac - echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba + echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-samba done # only package Man pages for VFS modules that we ship for file in %{buildroot}%{_mandir}/man8/vfs_*; do @@ -1424,7 +1406,7 @@ for file in %{buildroot}%{_mandir}/man8/vfs_*; do ;; esac # wildcard suffix to account for subsequent gzip - echo "${file#%{buildroot}}*" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba + echo "${file#%{buildroot}}*" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-samba done # copy the schema install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema @@ -1433,7 +1415,7 @@ install -m 0644 examples/LDAP/samba-nds.schema %{buildroot}/%{_datadir}/samba/LD %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 && 0%{?suse_version} < 1120 while read file; do rm -r "%{buildroot}/${file#%* }" -done <"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" +done <"${RPM_BUILD_DIR}/samba-%{version}/filelist-samba-doc" for file in %{_datadir}/susehelp; do rm -r "%{buildroot}/${file}" done diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index ba0caab..cf276f4 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:c8d0b20f971c0cb6ff101a998fb2763c1fc77d81cb2c80cb3f057f3757b738e7 -size 55321 +oid sha256:ed1ba4bfee3f6a11175fa206152a1bc41a60e8d87d3f0d9ffff9314fbda20bb6 +size 55183