Attachment 602237 Details for Bug 834603 – Spec patch versus latest (133.beta5) package release

[patch] Spec patch versus latest (133.beta5) package release

samba4-133-spec.patch (text/plain), 9.30 KB, created by Giuseppe Ragusa on 2012-08-04 09:57:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ragusa

Created: 2012-08-04 09:57:47 UTC

Size: 9.30 KB

patch

obsolete

>--- samba4.spec.orig	2012-08-04 11:42:04.652828186 +0200
>+++ samba4.spec	2012-08-04 11:48:03.586576161 +0200
>@@ -1,4 +1,4 @@
>-%define main_release 133
>+%define main_release 133.1
> 
> %define samba_version 4.0.0
> %define talloc_version 2.0.7
>@@ -20,15 +20,26 @@
> %global with_ntdb 1
> %global with_ldb 1
> 
>+%global with_iniparser 1
>+
> %global with_usrmove 0
> 
>+%global with_runmove 0
>+
>+%global with_tmpfiles 0
>+
> %global with_mitkrb5 1
>-%global with_dc 0
>+%global with_dc 1
>+
>+%if %with_dc
>+%global with_mitkrb5 0
>+%endif
> 
> %if 0%{?rhel} == 6
>-%global with_talloc 0
>-%global with_tevent 0
>-%global with_tdb 0
>+%global with_talloc 1
>+%global with_tevent 1
>+%global with_tdb 1
>+%global with_iniparser 1
> %endif
> 
> %if 0%{?fedora} > 15 || 0%{?rhel} > 6
>@@ -38,14 +49,29 @@
> %global with_ldb 0
> %endif
> 
>-%if 0%{?fedora} > 16
>+%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
> 
> %if %with_usrmove
> %global smb_lib %{_libdir}
>+%global real_bin %{_bindir}
>+%global real_sbin %{_sbindir}
> %else
> %global smb_lib %{_lib}
>+%global real_bin /bin
>+%global real_sbin /sbin
>+%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)")}
>@@ -86,6 +112,7 @@
> Source100: nmb.init
> Source101: smb.init
> Source102: winbind.init
>+Source103: samba.init
> 
> Source200: README.dc
> Source201: README.downgrade
>@@ -94,7 +121,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): systemd-units
> Requires(preun): systemd-units
>@@ -118,7 +145,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
>@@ -133,7 +162,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
>@@ -433,8 +464,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 \
>@@ -480,8 +511,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
> 
>@@ -521,8 +552,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
>@@ -537,17 +570,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
>@@ -566,7 +600,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}
>@@ -624,22 +658,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
>@@ -670,27 +743,27 @@
> exit 0
> 
> %post common
>-/sbin/ldconfig
>-%if 0%{?fedora} > 15 || 0%{?rhel} > 6
>+%{real_sbin}/ldconfig
>+%if %with_tmpfiles
> /usr/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
>@@ -859,6 +932,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.*
>@@ -872,7 +949,9 @@
> %files common
> %defattr(-,root,root)
> #%{_libdir}/samba/charset ???
>+%if %with_tmpfiles
> %{_sysconfdir}/tmpfiles.d/samba.conf
>+%endif
> %{_bindir}/net
> %{_bindir}/pdbedit
> %{_bindir}/profiles
>@@ -881,8 +960,13 @@
> %{_libdir}/libnetapi.so.*
> %{_libdir}/samba/libprinting_migrate.so
> %{_datadir}/samba/codepages
>-%ghost %dir /var/run/samba
>-%ghost %dir /var/run/winbindd
>+%if %{with_runmove}
>+%ghost %dir %{real_run}/samba
>+%ghost %dir %{real_run}/winbindd
>+%else
>+%dir %{real_run}/samba
>+%dir %{real_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
>@@ -906,6 +990,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
>@@ -1304,6 +1394,17 @@
> %endif # with_libwbclient
> 
> %changelog
>+* Sat Aug 04 2012 Giuseppe Ragusa <giuseppe.ragusa@hotmail.com>- 2:4.0.0-133.1.beta5
>+- Build with internal talloc, tdb and tevent on RHEL6 (too old versions).
>+- 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 optional building of full DC functionalities.
>+- Add initscript/unit and post/preun/postun for DC functionalities.
>+
> * Wed Aug 01 2012 - Andreas Schneider <asn@redhat.com> - 2:4.0.0-133.beta5
> - Update to Samba 4.0.0 beta5.
>

Actions: View | Diff

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