forked from pool/samba
Accepting request 202797 from network:samba:STABLE
Please forward to openSUSE 13.1 too. - Unify the defattr lines in the pidl, python, test and test-devel files section by removing the optional directory mode. - Verify source tar ball gpg signature. OBS-URL: https://build.opensuse.org/request/show/202797 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=142
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
commit
6861557bf4
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f7f63f8b7ba2cc240d4e4a38b82d20f5a48dfea5c4ec8bb6265cc4e34929b8af
|
||||
size 25569
|
||||
oid sha256:92220c3a3d308548319048428b4ff9dc97fbdc72be7585728138cfb52fb85942
|
||||
size 25667
|
||||
|
||||
7
samba-4.1.0rc4.tar.asc
Normal file
7
samba-4.1.0rc4.tar.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
iD8DBQBSRWG8bzORW2Vot+oRAuc7AJ93F1UEv0v+nroqHbAU69hNjJ+j9QCgrbe9
|
||||
rxoBJ0qt8nHd3vfuK36SEuY=
|
||||
=izxR
|
||||
-----END PGP SIGNATURE-----
|
||||
42
samba-pubkey.asc
Normal file
42
samba-pubkey.asc
Normal file
@ -0,0 +1,42 @@
|
||||
pub 1024D/6568B7EA 2007-02-04 [expires: 2014-02-25]
|
||||
uid Samba Distribution Verification Key <samba-bugs@samba.org>
|
||||
sub 2048g/DA6DFB44 2007-02-04 [expires: 2014-02-25]
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
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
|
||||
=49fm
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 9 20:41:52 UTC 2013 - lmuelle@suse.com
|
||||
|
||||
- Unify the defattr lines in the pidl, python, test and test-devel files
|
||||
section by removing the optional directory mode.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 9 15:30:31 UTC 2013 - lmuelle@suse.com
|
||||
|
||||
- Verify source tar ball gpg signature.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 27 12:30:24 UTC 2013 - lmuelle@suse.com
|
||||
|
||||
|
||||
22
samba.spec
22
samba.spec
@ -105,12 +105,17 @@ BuildRequires: libxslt1
|
||||
%if 0%{?suse_version} > 1210
|
||||
BuildRequires: libxslt-tools
|
||||
%endif
|
||||
%if %suse_version > 1220
|
||||
BuildRequires: gpg-offline
|
||||
%endif
|
||||
%define samba_ver 4.1.0
|
||||
%define samba_ver_suffix rc4
|
||||
%if "%{samba_ver_suffix}" == ""
|
||||
%define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
|
||||
%define samba_source_signature_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.asc
|
||||
%else
|
||||
%define samba_source_location http://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.gz
|
||||
%define samba_source_signature_location http://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} < 1111
|
||||
@ -130,7 +135,7 @@ BuildRequires: libxslt-tools
|
||||
%else
|
||||
%define build_make_smp_mflags %{?jobs:-j%jobs}
|
||||
%endif
|
||||
%define SOURCE_TIMESTAMP 3083
|
||||
%define SOURCE_TIMESTAMP 3086
|
||||
%define BRANCH %{version}
|
||||
%global with_mitkrb5 1
|
||||
%global with_dc 0
|
||||
@ -152,6 +157,8 @@ Recommends: logrotate
|
||||
%endif
|
||||
Summary: A SMB/CIFS File, Print, and Authentication Server
|
||||
Source: %{samba_source_location}
|
||||
Source5: %{samba_source_signature_location}
|
||||
Source6: http://www.samba.org/samba/ftp/samba-pubkey.asc
|
||||
Source1: vendor-files.tar.bz2
|
||||
Source2: patches.tar.bz2
|
||||
Source4: baselibs.conf
|
||||
@ -1119,6 +1126,11 @@ Branch: %{BRANCH}
|
||||
|
||||
|
||||
%prep
|
||||
%if %suse_version > 1220
|
||||
gzip -dc %{SOURCE0} >${RPM_SOURCE_DIR}/%{name}-%{samba_ver_full}.tar
|
||||
%{?gpg_verify: %gpg_verify --keyring %{SOURCE6} %{SOURCE5}}
|
||||
rm ${RPM_SOURCE_DIR}/%{name}-%{samba_ver_full}.tar
|
||||
%endif
|
||||
%setup -n samba-%{samba_ver_full} -q
|
||||
# patches
|
||||
%setup -T -D -a 2 -n samba-%{samba_ver_full} -q
|
||||
@ -2038,7 +2050,7 @@ fi
|
||||
%{_libdir}/samba/pdb/wbc_sam.so
|
||||
|
||||
%files pidl
|
||||
%defattr(-,root,root,-)
|
||||
%defattr(-,root,root)
|
||||
%dir %{perl_vendorlib}/Parse
|
||||
%{perl_vendorlib}/Parse/Pidl*
|
||||
%{_mandir}/man1/pidl*
|
||||
@ -2046,11 +2058,11 @@ fi
|
||||
%attr(755,root,root) %{_bindir}/pidl
|
||||
|
||||
%files python
|
||||
%defattr(-,root,root,-)
|
||||
%defattr(-,root,root)
|
||||
%{python_sitearch}/*
|
||||
|
||||
%files test
|
||||
%defattr(-,root,root,-)
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/gentest
|
||||
%{_bindir}/locktest
|
||||
%{_bindir}/masktest
|
||||
@ -2065,7 +2077,7 @@ fi
|
||||
%doc %{_mandir}/man1/vfstest.1.*
|
||||
|
||||
%files test-devel
|
||||
%defattr(-,root,root,-)
|
||||
%defattr(-,root,root)
|
||||
%dir %_includedir/samba-4.0/
|
||||
%{_includedir}/samba-4.0/torture.h
|
||||
%{_libdir}/libtorture.so
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7584271f3efa9f30d2c036ba0d3460bdccd225a78f39608e639ca24e807ce23f
|
||||
size 53821
|
||||
oid sha256:7b6ec9e5b400328aef66592cedafd6ebb653ff6e4d3fd2bc19cce0a4fcf7b6aa
|
||||
size 54152
|
||||
|
||||
Loading…
Reference in New Issue
Block a user