Attachment 151207 Details for Bug 226387 – Some of proposed changes for .spec file

[patch] Some of proposed changes for .spec file

samba.spec.diff (text/plain), 9.13 KB, created by Dmitry Butskoy on 2007-03-29 15:48:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Butskoy

Created: 2007-03-29 15:48:48 UTC

Size: 9.13 KB

patch

obsolete

>--- samba.spec	2007-03-28 20:25:58.000000000 +0400
>+++ samba.spec.OK	2007-03-29 19:36:32.000000000 +0400
>@@ -1,17 +1,14 @@
>-%define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
> 
>-Summary: The Samba SMB server.
>+Summary: The Samba SMB server
> Name: samba
>+Epoch: 0
> Version: 3.0.24
> Release: 8%{?dist}
>-Epoch: 0
>-License: GNU GPL Version 2
>+License: GPL
> Group: System Environment/Daemons
> URL: http://www.samba.org/
> 
>-#TAG: change for non-pre
>-#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc3.tar.gz
>-Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz
>+Source: ftp://us4.samba.org/pub/samba/%{name}-%{version}.tar.gz
> 
> # Red Hat specific replacement-files
> Source1: samba.log
>@@ -52,18 +49,18 @@
> Patch117: samba-3.0.24-pam_winbind-fixes.patch
> Patch118: samba-3.0.24-tar_options.patch
> 
>-Requires(pre): samba-common = %{epoch}:%{version}-%{release}
>-Requires: pam >= 0:0.64 %{auth} 
>-Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 
>-BuildRoot: %{_tmppath}/%{name}-%{version}-root
>-Requires(post): /sbin/chkconfig
>-Requires(preun): /sbin/chkconfig
>-BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel gnutls-devel
>-BuildRequires: autoconf, libtool
>+Requires: samba-common = %{epoch}:%{version}-%{release}
>+Requires: logrotate >= 0:3.4 
>+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
>+Requires(post): /sbin/chkconfig, /sbin/service
>+Requires(preun): /sbin/chkconfig, /sbin/service
>+BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel openldap-devel openssl-devel cups-devel
>+BuildRequires: libtool
> 
> # Working around perl dependency problem from docs
> %define __perl_requires %{SOURCE999}
> 
>+
> %description
> 
> Samba is the suite of programs by which a lot of PC-related machines
>@@ -76,8 +73,9 @@
> Samba uses NetBIOS over TCP/IP (NetBT) protocols and does NOT
> need the NetBEUI (Microsoft Raw NetBIOS frame) protocol.
> 
>+
> %package client
>-Summary: Samba client programs.
>+Summary: Samba client programs
> Group: Applications/System
> Requires: samba-common = %{epoch}:%{version}-%{release}
> Obsoletes: smbfs
>@@ -87,27 +85,31 @@
> the built-in SMB/CIFS filesystem in Linux. These clients allow access
> of SMB/CIFS shares and printing to SMB/CIFS printers.
> 
>+
> %package common
>-Summary: Files used by both Samba servers and clients.
>+Summary: Files used by both Samba servers and clients
> Group: Applications/System
> Requires(pre): /usr/sbin/groupadd
>-Requires(post): /sbin/chkconfig, /sbin/ldconfig, coreutils
>-Requires(preun): /sbin/chkconfig
>+Requires(post): /sbin/chkconfig, /sbin/service, coreutils
>+Requires(preun): /sbin/chkconfig, /sbin/service
> 
> %description common
> Samba-common provides files necessary for both the server and client
> packages of Samba.
> 
>+
> %package swat
>-Summary: The Samba SMB server configuration program.
>+Summary: The Samba SMB server configuration program
> Group: Applications/System
> Requires: samba = %{epoch}:%{version}-%{release} xinetd
>+Requires: samba-doc = %{epoch}:%{version}-%{release}
> 
> %description swat
> The samba-swat package includes the new SWAT (Samba Web Administration
> Tool), for remotely managing Samba's smb.conf file using your favorite
> Web browser.
> 
>+
> %package doc
> Summary: Documentation for the Samba suite
> Group: Documentation
>@@ -117,6 +119,7 @@
> The samba-doc package includes all the non-manpage documentation for the
> Samba suite.
> 
>+
> %package -n libsmbclient
> Summary: The SMB client library
> Group: Applications/System
>@@ -124,6 +127,7 @@
> %description -n libsmbclient
> The libsmbclient contains the SMB client library from the Samba suite.
> 
>+
> %package -n libsmbclient-devel
> Summary: Developer tools for the SMB client library
> Group: Development
>@@ -133,6 +137,7 @@
> The libsmbclient-devel package contains the header files and libraries needed to
> develop programs that link against the SMB client library in the Samba suite.
> 
>+
> %package -n libsmbclient-devel-static
> Summary: Static version of the libsmbclient library
> Group: Development
>@@ -142,6 +147,7 @@
> The samba-devel-static package contains the statically linked version of the
> SMB client library included in the libsmbclient-devel package.
> 
>+
> %prep
> # TAG: change for non-pre
> # % setup -q -n samba-3.0.23rc3
>@@ -186,6 +192,7 @@
> script/mkversion.sh
> cd ..
> 
>+
> %build
> cd source
> sh autogen.sh
>@@ -276,14 +283,14 @@
> # Install other stuff
> install -m644 packaging/Fedora/smb.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
> install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
>-install -m644 packaging/Fedora/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers
>+install -m644 packaging/Fedora/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
> install -m755 packaging/Fedora/smbprint $RPM_BUILD_ROOT%{_bindir}
> install -m755 packaging/Fedora/smb.init $RPM_BUILD_ROOT%{_initrddir}/smb
> install -m755 packaging/Fedora/nmb.init $RPM_BUILD_ROOT%{_initrddir}/nmb
> install -m755 packaging/Fedora/winbind.init $RPM_BUILD_ROOT%{_initrddir}/winbind
> #ln -s ../..%{_initrddir}/smb  $RPM_BUILD_ROOT%{_sbindir}/samba
>-install -m644 packaging/Fedora/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
>-install -m644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/samba
>+install -m644 packaging/Fedora/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
>+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/samba
> echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
> mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema
> install -m644 examples/LDAP/samba.schema $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/samba.schema
>@@ -341,33 +348,30 @@
> rm -f $RPM_BUILD_ROOT%{_libdir}/samba/security/pam_{smbpass,winbind}.so
> rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
> 
>+
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>-#%pre
>+
> %post
> /sbin/chkconfig --add smb
> /sbin/chkconfig --add nmb
> if [ "$1" -ge "1" ]; then
>-	%{_initrddir}/smb condrestart >/dev/null 2>&1
>-	%{_initrddir}/nmb condrestart >/dev/null 2>&1
>+	/sbin/service smb condrestart >/dev/null 2>&1 || :
>+	/sbin/service nmb condrestart >/dev/null 2>&1 || :
> fi
>-exit 0
> 
> %preun
> if [ $1 = 0 ] ; then
>-    #rm -rf /var/log/samba/* /var/lib/samba/*
>-    %{_initrddir}/smb stop >/dev/null 2>&1
>-    %{_initrddir}/nmb stop >/dev/null 2>&1
>+    /sbin/service smb stop >/dev/null 2>&1 || :
>+    /sbin/service nmb stop >/dev/null 2>&1 || :
>     /sbin/chkconfig --del smb
>     /sbin/chkconfig --del nmb
> fi
>-exit 0
> 
>-#%postun
> 
> %pre common
>-/usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || true
>+/usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || :
> 
> %post common
> /sbin/chkconfig --add winbind
>@@ -397,13 +401,13 @@
> 
> 	#this is what condrestart checks as well
> 	if [ -f /var/lock/subsys/winbindd ]; then
>-		%{_initrddir}/winbind stop >/dev/null 2>&1
>+		/sbin/service winbind stop >/dev/null 2>&1
> 		# Use a dirty trick to fool condrestart later
> 		touch /var/lock/subsys/winbindd
> 	fi
> 
> 	if [ -f /var/lock/subsys/smb ]; then
>-		%{_initrddir}/smb stop >/dev/null 2>&1
>+		/sbin/service smb stop >/dev/null 2>&1
> 		# We need to stop smbd here as we are moving also smbd owned files
> 		# but we can't restart it until the new server is installed.
> 		# Use a dirty trick to fool condrestart later
>@@ -411,7 +415,7 @@
> 	fi
> 
> 	if [ -f /var/lock/subsys/nmb ]; then
>-		%{_initrddir}/nmb stop >/dev/null 2>&1
>+		/sbin/service nmb stop >/dev/null 2>&1
> 		# We need to stop smbd here as we are moving also smbd owned files
> 		# but we can't restart it until the new server is installed.
> 		# Use a dirty trick to fool condrestart later
>@@ -468,24 +472,27 @@
> fi
> 
> if [ "$1" -ge "1" ]; then
>-	%{_initrddir}/winbind condrestart >/dev/null 2>&1
>+	/sbin/service winbind condrestart >/dev/null 2>&1 || :
> fi
> 
> %preun common
> if [ $1 = 0 ] ; then
>-    %{_initrddir}/winbind stop >/dev/null 2>&1
>+    /sbin/service winbind stop >/dev/null 2>&1 || :
>     /sbin/chkconfig --del winbind
>-    rm -rf /var/log/samba/* /var/lib/samba/*
> fi
> exit 0
> 
> %postun common
>-# moved in post
>-#if [ "$1" -ge "1" ]; then
>-#	%{_initrddir}/winbind condrestart >/dev/null 2>&1
>-#fi
> /sbin/ldconfig
> 
>+
>+%post -n libsmbclient
>+/sbin/ldconfig
>+
>+%postun -n libsmbclient
>+/sbin/ldconfig
>+
>+
> %files
> %defattr(-,root,root)
> %{_sbindir}/smbd
>@@ -494,8 +501,8 @@
> %{_bindir}/smbstatus
> %{_bindir}/eventlogadm
> %config(noreplace) %{_sysconfdir}/samba/smbusers
>-%attr(755,root,root) %config %{_initrddir}/smb
>-%attr(755,root,root) %config %{_initrddir}/nmb
>+%attr(755,root,root) %{_initrddir}/smb
>+%attr(755,root,root) %{_initrddir}/nmb
> %config(noreplace) %{_sysconfdir}/logrotate.d/samba
> %config(noreplace) %{_sysconfdir}/pam.d/samba
> %{_mandir}/man7/samba.7*
>@@ -623,6 +630,7 @@
> %files -n libsmbclient-devel-static
> %{_libdir}/libsmbclient.a
> 
>+
> %changelog
> * Wed Mar 28 2007 Simo Sorce <ssorce@redhat.com> 3.0.24-8.fc7
> - fix for bug #176649
>@@ -665,7 +673,7 @@
> * Thu Mar 15 2007 Simo Sorce <ssorce@redhat.com> 3.0.24-3.fc7
> - Directories reorg, tdb files must go to /var/lib, not
>   to /var/cache, add migration script in %post common
>-- Split out ilibsmbclient, devel and doc packages
>+- Split out libsmbclient, devel and doc packages
> - Remove libmsrpc.[h|so] for now as they are not really usable
> - Remove kill -HUP from rotate, samba use -HUP for other things
>   noit to reopen logs

Actions: View | Diff

Attachments on bug 226387: 151207 | 152814 | 152907 | 153413 | 154749 | 158345