diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 8e37d65..8bf2a90 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a1541efd3c249747339cc4f5940cf6ebc77ca8bcceb0cd75bf2797a455029e5 -size 24596 +oid sha256:5c1780d44c4c8edcca409906998af221472d02de7d444603e1f7d29cf765619d +size 24611 diff --git a/samba.changes b/samba.changes index 54892fe..285e77f 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 3 17:30:08 UTC 2013 - lmuelle@suse.com + +- Define the source URL differently in the case of a release candidate. + ------------------------------------------------------------------- Sat Aug 31 22:47:49 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 7ade6b7..970b676 100644 --- a/samba.spec +++ b/samba.spec @@ -107,6 +107,11 @@ BuildRequires: libxslt-tools %endif %define samba_ver 4.1.0 %define samba_ver_suffix rc2 +%if "%{samba_ver_suffix}" == "" +%define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz +%else +%define samba_source_location http://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.gz +%endif %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 @@ -125,7 +130,7 @@ BuildRequires: libxslt-tools %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3074 +%define SOURCE_TIMESTAMP 3075 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -146,7 +151,7 @@ Recommends: cron Recommends: logrotate %endif Summary: A SMB/CIFS File, Print, and Authentication Server -Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.gz +Source: %{samba_source_location} Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source4: baselibs.conf diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index ebc9f34..1db9ba6 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:25fb121bd0fc43a6eb559d8f862edc45a49b6074187cce830bdf3b7a3afe7624 -size 53892 +oid sha256:64a74a7184bae9703ff51438f82e06b5a5745abd872dd95aa89e93f5c889d52d +size 53935