Attachment 609614 Details for Bug 834603 – Spec patch versus latest (137.beta7) package release

[patch] Spec patch versus latest (137.beta7) package release

samba4-137.patch (text/plain), 5.98 KB, created by Giuseppe Ragusa on 2012-09-04 10:06:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ragusa

Created: 2012-09-04 10:06:35 UTC

Size: 5.98 KB

patch

obsolete

>--- samba4.spec.orig	2012-09-04 11:31:13.486532787 +0200
>+++ samba4.spec	2012-09-04 12:03:36.510576996 +0200
>@@ -1,4 +1,4 @@
>-%define main_release 137
>+%define main_release 137.1
> 
> %define samba_version 4.0.0
> %define talloc_version 2.0.7
>@@ -22,9 +22,17 @@
> 
> %global with_usrmove 0
> 
>+%global with_runmove 0
>+
>+%global with_tmpfiles 0
>+
> %global with_mitkrb5 1
> %global with_dc 0
> 
>+%if %with_dc
>+%global with_mitkrb5 0
>+%endif
>+
> %if 0%{?rhel} == 6
> %global with_talloc 0
> %global with_tevent 0
>@@ -38,6 +46,11 @@
> %global with_ldb 0
> %endif
> 
>+%if 0%{?fedora} > 14 || 0%{?rhel} > 6
>+%global with_tmpfiles 1
>+%global with_runmove 1
>+%endif
>+
> %if 0%{?fedora} > 16 || 0%{?rhel} > 6
> %global with_usrmove 1
> %endif
>@@ -48,6 +61,12 @@
> %global smb_lib %{_lib}
> %endif
> 
>+%if %with_runmove
>+%global real_run /run
>+%else
>+%global real_run /var/run
>+%endif
>+
> %{!?python_libdir: %define python_libdir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,1)")}
> %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
> 
>@@ -88,6 +107,7 @@
> Source100: nmb.init
> Source101: smb.init
> Source102: winbind.init
>+Source103: samba.init
> 
> Source200: README.dc
> Source201: README.downgrade
>@@ -437,8 +457,8 @@
> 
> %configure \
>         --enable-fhs \
>-        --with-piddir=/run \
>-        --with-sockets-dir=/run/samba \
>+        --with-piddir=%{real_run} \
>+        --with-sockets-dir=%{real_run}/samba \
>         --with-modulesdir=%{_libdir}/samba \
>         --with-pammodulesdir=/%{smb_lib}/security \
>         --with-lockdir=/var/lib/samba \
>@@ -484,8 +504,8 @@
> install -d -m 0755 %{buildroot}/var/log/samba/old
> install -d -m 0755 %{buildroot}/var/spool/samba
> install -d -m 0755 %{buildroot}/%{_datadir}/swat/using_samba
>-install -d -m 0755 %{buildroot}/var/run/samba
>-install -d -m 0755 %{buildroot}/var/run/winbindd
>+install -d -m 0755 %{buildroot}%{real_run}/samba
>+install -d -m 0755 %{buildroot}%{real_run}/winbindd
> install -d -m 0755 %{buildroot}/%{_libdir}/samba
> install -d -m 0755 %{buildroot}/%{_libdir}/pkgconfig
> 
>@@ -525,8 +545,10 @@
> install -d -m 0755 %{buildroot}%{_sysconfdir}/xinetd.d
> install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/swat
> 
>+%if %with_tmpfiles
> install -d -m 0755 %{buildroot}%{_sysconfdir}/tmpfiles.d/
> install -m644 %{SOURCE7} %{buildroot}%{_sysconfdir}/tmpfiles.d/samba.conf
>+%endif
> 
> install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
> install -m 0644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba
>@@ -541,17 +563,18 @@
> 
> %if 0%{?fedora} > 15 || 0%{?rhel} > 6
> install -d -m 0755 %{buildroot}%{_unitdir}
>-for i in nmb smb winbind ; do
>-    cat packaging/systemd/$i.service | sed -e 's@Type=forking@Type=forking\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' >tmp$i.service
>+for i in nmb smb winbind samba ; do
>+    cat packaging/systemd/$i.service | sed -e 's@Type=forking@Type=forking\nEnvironment=KRB5CCNAME=%{real_run}/samba/krb5cc_samba@g' >tmp$i.service
>     install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service
> done
> %endif
> 
> %if 0%{?rhel} == 6
> install -d -m 0755 %{buildroot}%{_initrddir}
>-install -m 0644 %{SOURCE100} %{buildroot}%{_initrddir}/nmb
>-install -m 0644 %{SOURCE101} %{buildroot}%{_initrddir}/smb
>-install -m 0644 %{SOURCE102} %{buildroot}%{_initrddir}/winbind
>+install -m 0755 %{SOURCE100} %{buildroot}%{_initrddir}/nmb
>+install -m 0755 %{SOURCE101} %{buildroot}%{_initrddir}/smb
>+install -m 0755 %{SOURCE102} %{buildroot}%{_initrddir}/winbind
>+install -m 0755 %{SOURCE103} %{buildroot}%{_initrddir}/samba
> %endif
> 
> # winbind krb5 locator
>@@ -658,6 +681,45 @@
> %post dc-libs -p /sbin/ldconfig
> 
> %postun dc-libs -p /sbin/ldconfig
>+
>+%post dc
>+%if 0%{?rhel} == 6
>+/sbin/chkconfig --add samba
>+if [ "$1" -ge "1" ]; then
>+    /sbin/service samba condrestart >/dev/null 2>&1 || :
>+fi
>+exit 0
>+%endif
>+
>+if [ $1 -eq 1 ] ; then
>+    # Initial installation
>+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+fi
>+
>+%preun dc
>+%if 0%{?rhel} == 6
>+if [ $1 = 0 ] ; then
>+    /sbin/service samba stop >/dev/null 2>&1 || :
>+    /sbin/chkconfig --del samba
>+fi
>+exit 0
>+%endif
>+
>+if [ $1 -eq 0 ] ; then
>+    # Package removal, not upgrade
>+    /bin/systemctl --no-reload disable samba.service > /dev/null 2>&1 || :
>+    /bin/systemctl stop samba.service > /dev/null 2>&1 || :
>+fi
>+
>+%postun dc
>+%if 0%{?fedora} > 15 || 0%{?rhel} > 6
>+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+if [ $1 -ge 1 ] ; then
>+    # Package upgrade, not uninstall
>+    /bin/systemctl try-restart samba.service >/dev/null 2>&1 || :
>+fi
>+%endif
>+
> %endif # with_dc
> 
> %post test -p /sbin/ldconfig
>@@ -928,7 +990,9 @@
> %files common
> %defattr(-,root,root)
> #%{_libdir}/samba/charset ???
>+%if %with_tmpfiles
> %{_sysconfdir}/tmpfiles.d/samba.conf
>+%endif
> %{_bindir}/net
> %{_bindir}/pdbedit
> %{_bindir}/profiles
>@@ -937,8 +1001,13 @@
> %{_libdir}/libnetapi.so.*
> %{_libdir}/samba/libprinting_migrate.so
> %{_datadir}/samba/codepages
>+%if %{with_runmove}
> %ghost %dir /var/run/samba
> %ghost %dir /var/run/winbindd
>+%else
>+%dir /var/run/samba
>+%dir /var/run/winbindd
>+%endif
> %attr(700,root,root) %dir /var/lib/samba/private
> %attr(755,root,root) %dir %{_sysconfdir}/samba
> %config(noreplace) %{_sysconfdir}/samba/smb.conf
>@@ -962,6 +1031,12 @@
> %{_libdir}/samba/libdsdb-module.so
> 
> %if %with_dc
>+%if 0%{?fedora} > 15 || 0%{?rhel} > 6
>+%{_unitdir}/samba.service
>+%endif
>+%if 0%{?rhel} == 6
>+%{_initrddir}/samba
>+%endif
> %{_bindir}/samba-tool
> %{_bindir}/samba_kcc
> %{_sbindir}/provision
>@@ -1359,6 +1434,13 @@
> %endif # with_libwbclient
> 
> %changelog
>+* Tue Sep 04 2012 Giuseppe Ragusa <giuseppe.ragusa@hotmail.com>- 2:4.0.0-137.1.beta7
>+- Make tmpfiles.d support conditional.
>+- Fix runmove paths.
>+- Fix permissions of SysVinit control scripts
>+- Allow optional building of full DC functionalities.
>+- Add initscript/unit and post/preun/postun for DC functionalities.
>+
> * Wed Aug 29 2012 - Andreas Schneider <asn@redhat.com> - 2:4.0.0-137.beta7
> - Update to Samba 4.0.0 beta7.
> - Fix building with MIT Kerberos.

Actions: View | Diff

Attachments on bug 834603: 593770 | 593771 | 594194 | 595555 | 602237 | 602245 | 609612 | 609614 | 611674 | 613981 | 616403 | 620199 | 622289 | 945120 | 945127