[samba4] Update to Samba 4.0.0 beta4.
asn
asn at fedoraproject.org
Tue Jul 17 14:30:11 UTC 2012
commit 250a60683e10aa087de0a7817b38bccf3217d7bc
Author: Andreas Schneider <asn at cryptomilk.org>
Date: Tue Jul 17 16:29:44 2012 +0200
Update to Samba 4.0.0 beta4.
.gitignore | 1 +
samba4.spec | 23 ++++++++++++++---------
sources | 2 +-
3 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb84a39..544afea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ samba-4.0.0alpha11.tar.gz
/samba-4.0.0beta1.tar.bz2
/samba-4.0.0beta2.tar.bz2
/samba-4.0.0beta3.tar.bz2
+/samba-4.0.0beta4.tar.bz2
diff --git a/samba4.spec b/samba4.spec
index 3854aa3..03a55ce 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,4 +1,4 @@
-%define main_release 127
+%define main_release 128
%define samba_version 4.0.0
%define talloc_version 2.0.7
@@ -6,7 +6,7 @@
%define tdb_version 1.2.10
%define tevent_version 0.9.15
%define ldb_version 1.1.8
-%define pre_release beta3
+%define pre_release beta4
%define samba_release %{main_release}%{?dist}.%{pre_release}
@@ -85,8 +85,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(pre): /usr/sbin/groupadd
%if 0%{?fedora} > 15 || 0%{?rhel} > 6
-Requires(post): /bin/systemctl
-Requires(preun): /bin/systemctl
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
%else
Requires(post): /sbin/chkconfig, /sbin/service
Requires(preun): /sbin/chkconfig, /sbin/service
@@ -510,14 +511,14 @@ install -m644 %{SOURCE7} %{buildroot}%{_sysconfdir}/tmpfiles.d/samba.conf
install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
install -m 0644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba
-%if ! %with_dc
install -d -m 0755 %{buildroot}%{_defaultdocdir}/%{name}
+install -m 0644 %{SOURCE201} %{buildroot}%{_defaultdocdir}/%{name}/README.downgrade
+
+%if ! %with_dc
install -m 0644 %{SOURCE200} %{buildroot}%{_defaultdocdir}/%{name}/README.dc
install -m 0644 %{SOURCE200} %{buildroot}%{_defaultdocdir}/%{name}/README.dc-libs
%endif
-install -m 0644 %{SOURCE201} %{buildroot}%{_defaultdocdir}/%{name}/README.downgrade
-
%if 0%{?fedora} > 15 || 0%{?rhel} > 6
install -d -m 0755 %{buildroot}%{_unitdir}
for i in nmb smb winbind ; do
@@ -1281,10 +1282,14 @@ rm -rf %{buildroot}
%endif # with_libwbclient
%changelog
-* Mon Jul 16 2012 Alexander Bokovoy <abokovoy at redhat.com> - 2:4.0.0-127.beta2
+* Tue Jul 17 2012 Andreas Schneider <asn at redhat.com> 2:4.0.0-128.beta4
+- Update to Samba 4.0.0 beta4.
+- Update systemd Requires.
+
+* Mon Jul 16 2012 Alexander Bokovoy <abokovoy at redhat.com> - 2:4.0.0-127.beta3
- Add README.downgrade to samba4 package
-* Thu Jul 12 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-126.beta2
+* Thu Jul 12 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-126.beta3
- Update to Samba 4.0.0 beta3.
- Add requirement for samba4-python in samba4-dc.
- resolves: #839247
diff --git a/sources b/sources
index b97664b..190253a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12ee5141cb80e8da81054dea6861cd7e samba-4.0.0beta3.tar.bz2
+e541b544814081f876c1fc776f3898a6 samba-4.0.0beta4.tar.bz2
More information about the scm-commits
mailing list