Attachment 152814 Details for Bug 226387 – some of proposed changes to the .spec file

[patch] some of proposed changes to the .spec file

samba.spec.diff-1 (text/plain), 6.17 KB, created by Dmitry Butskoy on 2007-04-17 15:06:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Butskoy

Created: 2007-04-17 15:06:13 UTC

Size: 6.17 KB

patch

obsolete

>--- samba.spec	2007-04-17 18:54:04.000000000 +0400
>+++ samba.spec.OK	2007-04-17 19:03:56.000000000 +0400
>@@ -1,5 +1,3 @@
>-%define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
>-
> Summary: The Samba Suite of programs
> Name: samba
> Epoch: 0
>@@ -53,7 +51,8 @@
> 
> 
> Requires(pre): samba-common = %{epoch}:%{version}-%{release}
>-Requires: pam >= 0:0.64 %{auth} 
>+Requires: samba-common = %{epoch}:%{version}-%{release}
>+Requires: pam >= 0:0.64 
> Requires: logrotate >= 0:3.4
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
> Requires(post): /sbin/chkconfig, /sbin/service
>@@ -515,6 +514,7 @@
> 
> %doc examples/autofs examples/LDAP examples/libsmbclient examples/misc examples/printer-accounting
> %doc examples/printing
>+%doc docs/registry
> 
> %files swat
> %defattr(-,root,root)
>@@ -623,7 +623,6 @@
> %doc docs/REVISION docs/Samba3-Developers-Guide.pdf docs/Samba3-ByExample.pdf
> %doc docs/Samba3-HOWTO.pdf docs/THANKS docs/history
> %doc docs/htmldocs
>-%doc docs/registry
> 
> %files -n libsmbclient
> %{_libdir}/libsmbclient.so.0
>@@ -697,7 +696,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
>+  to /var/cache, add migration script in %%post common
> - 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
>@@ -908,7 +907,7 @@
>   This moved many files from /usr/share/doc/samba-3.0.7/docs/* to
>   /usr/share/doc/samba-3.0.7/*
> - Modify spec file as suggested by Rex Dieter (rdieter@math.unl.edu)
>-  to correctly create libsmbclient.so.0 and to use %_initrddir instead
>+  to correctly create libsmbclient.so.0 and to use %%_initrddir instead
>   of rolling our own.  This closes #132642
> - Add patch to default "use sendfile" to no, since sendfile appears to
>   be broken
>@@ -959,12 +958,12 @@
> 
> * Fri Jul 2 2004 Jay Fenlason <fenlason@redhat.com> 3.0.5.0pre1.0
> - New upstream version
>-- use % { SOURCE1 } instead of a hardcoded path
>+- use %% { SOURCE1 } instead of a hardcoded path
> - include -winbind patch from Gerald (Jerry) Carter (jerry@samba.org)
>   https://bugzilla.samba.org/show_bug.cgi?id=1315
>   to make winbindd work against Windows versions that do not have
>   128 bit encryption enabled.
>-- Moved %{_bindir}/net to the -common package, so that folks who just
>+- Moved %%{_bindir}/net to the -common package, so that folks who just
>   want to use winbind, etc don't have to install -client in order to
>   "net join" their domain.
> - New upstream version obsoletes the patches added in 3.0.3-5
>@@ -1014,7 +1013,7 @@
> 
> * Fri Feb 13 2004 Jay Fenlason <fenlason@redhat.com>
> - Change all requires lines to list an explicit epoch.  Closes #102715
>-- Add an explicit Epoch so that %{epoch} is defined.
>+- Add an explicit Epoch so that %%{epoch} is defined.
> 
> * Mon Feb 9 2004 Jay Fenlason <fenlason@redhat.com> 3.0.2-5
> - New upstream version: 3.0.2 final includes security fix for #114995
>@@ -1023,7 +1022,7 @@
>   appropriate.  Fixes bugzilla #114051.
> 
> * Mon Feb 2 2004 Jay Fenlason <fenlason@redhat.com> 3.0.2-3rc2
>-- add %dir entries for %{_libdir}/samba and %{_libdir}/samba/charset
>+- add %%dir entries for %%{_libdir}/samba and %%{_libdir}/samba/charset
> - Upgrade to new upstream version
> - build mount.cifs for the new cifs filesystem in the 2.6 kernel.
> 
>@@ -1098,7 +1097,7 @@
> - remove swat.desktop file
> 
> * Thu Feb 20 2003 Nalin Dahyabhai <nalin@redhat.com> 2.2.7a-4
>-- relink libnss_wins.so with SHLD="%{__cc} -lnsl" to force libnss_wins.so to
>+- relink libnss_wins.so with SHLD="%%{__cc} -lnsl" to force libnss_wins.so to
>   link with libnsl, avoiding unresolved symbol errors on functions in libnsl
> 
> * Mon Feb 10 2003 Jay Fenlason <fenlason@redhat.com> 2.2.7a-3
>@@ -1297,9 +1296,9 @@
> 
> * Mon May 21 2001 Helge Deller <hdeller@redhat.de> 
> - updated to samba 2.2.0
>-- moved codepages to %{_datadir}/samba/codepages
>+- moved codepages to %%{_datadir}/samba/codepages
> - use all available CPUs for building rpm packages
>-- use %{_xxx} defines at most places in spec-file
>+- use %%{_xxx} defines at most places in spec-file
> - "License:" replaces "Copyright:"
> - dropped excludearch sparc
> - de-activated japanese patches 100 and 200 for now 
>@@ -1492,7 +1491,7 @@
> - update to 2.0.6
> 
> * Fri Oct 29 1999 Bill Nottingham <notting@redhat.com>
>-- add a %defattr for -common
>+- add a %%defattr for -common
> 
> * Tue Oct  5 1999 Bill Nottingham <notting@redhat.com>
> - shift some files into -client
>@@ -1520,7 +1519,7 @@
> - fix typo in mount.smb
> 
> * Fri Aug 20 1999 Bill Nottingham <notting@redhat.com>
>-- add a %trigger to work around (sort of) broken scripts in
>+- add a %%trigger to work around (sort of) broken scripts in
>   previous releases
> 
> * Mon Aug 16 1999 Bill Nottingham <notting@redhat.com>
>@@ -1533,7 +1532,7 @@
> - add a -common package, shuffle files around.
> 
> * Fri Jul 23 1999 Bill Nottingham <notting@redhat.com>
>-- add a chmod in %postun so /etc/services & inetd.conf don't become unreadable
>+- add a chmod in %%postun so /etc/services & inetd.conf don't become unreadable
> 
> * Wed Jul 21 1999 Bill Nottingham <notting@redhat.com>
> - update to 2.0.5
>@@ -1602,19 +1601,19 @@
> 
> * Thu Sep 17 1998 Jeff Johnson <jbj@redhat.com>
> - update to 1.9.18p10.
>-- fix %triggerpostun.
>+- fix %%triggerpostun.
> 
> * Tue Jul 07 1998 Erik Troan <ewt@redhat.com>
> - updated postun triggerscript to check $0
>-- clear /etc/codepages from %preun instead of %postun
>+- clear /etc/codepages from %%preun instead of %%postun
> 
> * Mon Jun 08 1998 Erik Troan <ewt@redhat.com>
>-- made the %postun script a tad less agressive; no reason to remove
>+- made the %%postun script a tad less agressive; no reason to remove
>   the logs or lock file (after all, if the lock file is still there,
>   samba is still running)
>-- the %postun and %preun should only exectute if this is the final
>+- the %%postun and %%preun should only exectute if this is the final
>   removal
>-- migrated %triggerpostun from Red Hat's samba package to work around
>+- migrated %%triggerpostun from Red Hat's samba package to work around
>   packaging problems in some Red Hat samba releases
> 
> * Sun Apr 26 1998 John H Terpstra <jht@samba.anu.edu.au>

Actions: View | Diff

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