Attachment 594194 Details for Bug 834603 – Spec patch versus latest (58beta2) package release

[patch] Spec patch versus latest (58beta2) package release

samba4-spec.patch (text/plain), 9.38 KB, created by Giuseppe Ragusa on 2012-06-25 14:02:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ragusa

Created: 2012-06-25 14:02:46 UTC

Size: 9.38 KB

patch

obsolete

>--- samba4.spec.orig	2012-06-22 16:11:20.000000000 +0200
>+++ samba4.spec	2012-06-25 15:53:29.759576886 +0200
>@@ -1,10 +1,10 @@
>-%define main_release 58
>+%define main_release 58.b.
> 
> %define samba_version 4.0.0
> %define talloc_version 2.0.7
> %define ntdb_version 0.9
> %define tdb_version 1.2.10
>-%define tevent_version 0.9.15
>+%define tevent_version 0.9.16
> %define ldb_version 1.1.6
> %define pre_release beta2
> 
>@@ -20,26 +20,53 @@
> %define with_ntdb 1
> %define with_ldb 1
> 
>+%define with_iniparser 1
>+
> %define with_usrmove 0
> 
>+%define with_runmove 0
>+
>+%define with_tmpfiles 0
>+
> %define with_mitkrb5 1
>-%define with_dc 0
>+
>+%bcond_with dc
>+
>+%if %with_dc
>+%define with_mitkrb5 0
>+%endif
> 
> %if 0%{?fedora} > 15 || 0%{?rhel} > 6
> %define with_talloc 0
> %define with_tevent 0
> %define with_tdb 0
> %define with_ldb 0
>+%define with_iniparser 0
> %endif
> 
>-%if 0%{?fedora} > 16
>+%if 0%{?fedora} > 14 || 0%{?rhel} > 6
>+%define with_tmpfiles 1
>+%define with_runmove 1
>+%endif
>+
>+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
> %define with_usrmove 1
> %endif
> 
> %if %with_usrmove
> %define smb_lib %{_libdir}
>+%define real_bin %{_bindir}
>+%define real_sbin %{_sbindir}
> %else
> %define smb_lib %{_lib}
>+%define real_bin /bin
>+%define real_sbin /sbin
>+%endif
>+
>+%if %with_runmove
>+%define real_run /run
>+%else
>+%define 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)")}
>@@ -75,6 +102,7 @@
> Source100: nmb.init
> Source101: smb.init
> Source102: winbind.init
>+Source103: samba.init
> 
> Source200: README.dc
> 
>@@ -82,7 +110,7 @@
> 
> BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> 
>-Requires(pre): /usr/sbin/groupadd
>+Requires(pre): %{real_sbin}/groupadd
> %if 0%{?fedora} > 15 || 0%{?rhel} > 6
> Requires(post): /bin/systemctl
> Requires(preun): /bin/systemctl
>@@ -105,7 +133,9 @@
> BuildRequires: docbook-style-xsl
> BuildRequires: e2fsprogs-devel
> BuildRequires: gawk
>+%if ! %with_iniparser
> BuildRequires: iniparser-devel
>+%endif
> BuildRequires: krb5-devel
> BuildRequires: libacl-devel
> BuildRequires: libaio-devel
>@@ -120,7 +150,9 @@
> BuildRequires: perl(Parse::Yapp)
> BuildRequires: popt-devel
> BuildRequires: python-devel
>+%if ! %with_tevent
> BuildRequires: python-tevent
>+%endif
> BuildRequires: quota-devel
> BuildRequires: readline-devel
> BuildRequires: sed
>@@ -226,7 +258,9 @@
> Summary: Files used by both Samba servers and clients
> Group: Applications/System
> Requires: %{name}-libs = %{samba_depver}
>+%if 0%{?fedora} > 15 || 0%{?rhel} > 6
> Requires(post): systemd
>+%endif
> 
> Conflicts: samba-common < 2:3.9.9
> Provides: samba-common = %{samba_depver}
>@@ -416,8 +450,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 \
>@@ -462,7 +496,7 @@
> 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/winbindd
>+install -d -m 0755 %{buildroot}%{real_run}/winbindd
> install -d -m 0755 %{buildroot}/%{_libdir}/samba
> install -d -m 0755 %{buildroot}/%{_libdir}/pkgconfig
> 
>@@ -502,8 +536,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
>@@ -516,17 +552,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
>@@ -545,7 +582,7 @@
> 
> # This makes the right links, as rpmlint requires that
> # the ldconfig-created links be recorded in the RPM.
>-/sbin/ldconfig -N -n %{buildroot}%{_libdir}
>+%{real_sbin}/ldconfig -N -n %{buildroot}%{_libdir}
> 
> # Fix up permission on perl install.
> %{_fixperms} %{buildroot}%{perl_vendorlib}
>@@ -603,22 +640,61 @@
> fi
> %endif
> 
>-%post libs -p /sbin/ldconfig
>+%post libs -p %{real_sbin}/ldconfig
> 
>-%postun libs -p /sbin/ldconfig
>+%postun libs -p %{real_sbin}/ldconfig
> 
> %if %with_dc
>-%post dc-libs -p /sbin/ldconfig
>+%post dc-libs -p %{real_sbin}/ldconfig
>+
>+%postun dc-libs -p %{real_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
> 
>-%postun dc-libs -p /sbin/ldconfig
> %endif # with_dc
> 
>-%post test -p /sbin/ldconfig
>+%post test -p %{real_sbin}/ldconfig
> 
>-%postun test -p /sbin/ldconfig
>+%postun test -p %{real_sbin}/ldconfig
> 
> %pre winbind
>-/usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || :
>+%{real_sbin}/groupadd -g 88 wbpriv >/dev/null 2>&1 || :
> 
> %post winbind
> %if 0%{?rhel} == 6
>@@ -649,25 +725,27 @@
> exit 0
> 
> %post common
>-/sbin/ldconfig
>-/usr/bin/systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/samba.conf
>+%{real_sbin}/ldconfig
>+%if %with_tmpfiles
>+%{real_bin}/systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/samba.conf
>+%endif
> 
>-%postun common -p /sbin/ldconfig
>+%postun common -p %{real_sbin}/ldconfig
> 
>-%post winbind-clients -p /sbin/ldconfig
>+%post winbind-clients -p %{real_sbin}/ldconfig
> 
>-%postun winbind-clients -p /sbin/ldconfig
>+%postun winbind-clients -p %{real_sbin}/ldconfig
> 
> %if %with_libsmbclient
>-%post -n libsmbclient -p /sbin/ldconfig
>+%post -n libsmbclient -p %{real_sbin}/ldconfig
> 
>-%postun -n libsmbclient -p /sbin/ldconfig
>+%postun -n libsmbclient -p %{real_sbin}/ldconfig
> %endif # with_libsmbclient
> 
> %if %with_libwbclient
>-%post -n libwbclient -p /sbin/ldconfig
>+%post -n libwbclient -p %{real_sbin}/ldconfig
> 
>-%postun -n libwbclient -p /sbin/ldconfig
>+%postun -n libwbclient -p %{real_sbin}/ldconfig
> %endif # with_libwbclient
> 
> %clean
>@@ -830,6 +908,10 @@
> %{_libdir}/samba/libntdb.so.%{ntdb_version}
> %endif
> 
>+%if %{with_iniparser}
>+%{_libdir}/samba/libiniparser.so
>+%endif
>+
> %if ! %with_libsmbclient
> %{_libdir}/samba/libsmbclient.so.*
> %{_libdir}/samba/libsmbsharemodes.so.*
>@@ -843,7 +925,9 @@
> %files common
> %defattr(-,root,root)
> #%{_libdir}/samba/charset ???
>+%if %with_tmpfiles
> %{_sysconfdir}/tmpfiles.d/samba.conf
>+%endif
> %{_bindir}/net
> %{_bindir}/pdbedit
> %{_bindir}/profiles
>@@ -876,6 +960,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
>@@ -922,7 +1012,7 @@
> %{_libdir}/samba/libnss_info.so
> %{_libdir}/samba/libidmap.so
> %{_sbindir}/winbindd
>-%ghost %dir /var/run/winbindd
>+%ghost %dir %{real_run}/winbindd
> %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
> %config(noreplace) %{_sysconfdir}/security/pam_winbind.conf
> %if 0%{?fedora} > 15 || 0%{?rhel} > 6
>@@ -1272,6 +1362,17 @@
> %endif # with_libwbclient
> 
> %changelog
>+* Mon Jun 25 2012 Giuseppe Ragusa <giuseppe.ragusa@fastmail.fm>- 2:4.0.0-58.b.beta2
>+- Fix bundled tevent lib version
>+- Make build requirement of pyhton-tevent and iniparser conditional.
>+- Make tmpfiles.d support conditional.
>+- Make usrmove fixed paths conditional.
>+- Fix runmove paths.
>+- Fix conditional logic for current/future RHEL and Fedora.
>+- Fix permissions of SysVinit control scripts
>+- Allow building of DC functionalities.
>+- Add initscript/unit and post/preun/postun for DC functionalities.
>+
> * Fri Jun 22 2012 Andreas Schneider <asn@redhat.com> - 2:4.0.0-58.beta2
> - Add missing BuildRequires for python bindings.
>

Actions: View | Diff

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