Patches for RedHat 8.0 rpms in SAMBA_2_2 (was: 2.2.6-1 src rpm)

[Axel Thimm]

Hello,

attached are small patches for makerpms.sh.tmpl and samba2.spec.tmpl which
allow compiling & installing samba rpms on RedHat 8 (hope this is the right
place to submit them).

o tarfile: allow samba-${VERSION} to be a symlink to another directory
  (e.g. plain samba)
o Use rpmbuild instead of rpm, as rpm under RedHat 8.0 does no more support
  building etc.
o Remove permission bits from examples and doc directories to fool the
  automatic dependency generator.

Regards, Axel.

On Sun, Oct 27, 2002 at 11:37:27AM +1100, Andrew Bartlett wrote:
> "Gerald (Jerry) Carter" wrote:
> > On Sat, 26 Oct 2002, Justin Georgeson wrote:
> > > Trying to install the built RPM (no errors in the build process) results
> > > in these unmet dependencies:
> > >
> > > # rpm -Uvh samba-2.2.6-1.i686.rpm
> > > error: Failed dependencies:
> > >          perl(fix_print_html.lib) is needed by samba-2.2.6-1
> > >          perl(Net::LDAP) is needed by samba-2.2.6-1
> > 
> > Same thing I hit.  Haven't figured out a way around it yet.
> > The Net::LDAP modules if from the examples/LDAP scripts
> > and the fix_print_html.lib must be from the docbook stuff.  Neither
> > which matter for a normal installation.  You can just install with the
> > - --nodeps option to rpm.
> 
> RedHat used an ugly hack to get around this:  They override their
> depenedncy generator with one that does a negitive grep on the Net::LDAP
> module.
> 
> > > These weren't listed in the spec file as dependencies, and I'm not sure
> > > how to meet them.
> > >
> > > Is there any ETA for RH 8 RPMs, source or binary? Any idea how to get
> > > past this?
> > 
> > Once I figure out how to get rpmbuild not to pickup these wrong
> > dependencies, i'll be releasing offical samba.org RedHat 8 RPMS.

-- 
Axel.Thimm at physik.fu-berlin.de
-------------- next part --------------
Index: makerpms.sh.tmpl
===================================================================
RCS file: /cvsroot/samba/packaging/RedHat/makerpms.sh.tmpl,v
retrieving revision 1.2.6.4
diff -u -d -r1.2.6.4 makerpms.sh.tmpl
--- makerpms.sh.tmpl	6 Jan 2002 06:58:17 -0000	1.2.6.4
+++ makerpms.sh.tmpl	29 Oct 2002 13:56:12 -0000
@@ -62,7 +62,7 @@
 	(cd ../../.. ; mv samba samba-${VERSION} )
 fi
 
-( cd ../../.. ; tar --exclude=CVS -czvf ${SRCDIR}/samba-${VERSION}.tar.gz samba-${VERSION} )
+( cd ../../.. ; tar --exclude=CVS -czvf ${SRCDIR}/samba-${VERSION}.tar.gz samba-${VERSION}/. )
 
 cp -av samba.spec ${SPECDIR}
 cp -av samba-devel.spec ${SPECDIR}
@@ -72,11 +72,11 @@
 	( cd ../../.. ; mv samba-${VERSION} samba )
 	echo Getting Ready to build Developmental Build
 	cd ${SPECDIR}
-	rpm -ba -v samba-devel.spec
+	rpmbuild -ba -v samba-devel.spec
 else
 	echo Getting Ready to build release package
 	cd ${SPECDIR}
-	rpm -ba -v --clean --rmsource samba.spec
+	rpmbuild -ba -v --clean --rmsource samba.spec
 fi
 
 echo Done.
Index: samba2.spec.tmpl
===================================================================
RCS file: /cvsroot/samba/packaging/RedHat/samba2.spec.tmpl,v
retrieving revision 1.18.6.54
diff -u -d -r1.18.6.54 samba2.spec.tmpl
--- samba2.spec.tmpl	17 Oct 2002 02:22:00 -0000	1.18.6.54
+++ samba2.spec.tmpl	29 Oct 2002 13:56:14 -0000
@@ -196,8 +196,10 @@
         --prefix=%{prefix} \
         --localstatedir=/var
 make
+cd ../..
 
-
+# Remove some permission bits to avoid to many dependencies
+find examples docs -type f | xargs -r chmod -x
 
 %install
 rm -rf $RPM_BUILD_ROOT