Sandworm wrote:
On Wed, 23 Aug 2006 03:29:45 +1000 Peter Nixon wrote:
I changed the RedHat spec file to match the suse spec file with regards %doc
Actually, that gets a lot of unnecessary stuff in (including README.suse, etc), as well as Makefiles, as Nicolas pointed out.
I don't really understand why we should redo the doc installation again with rpmbuild, whereas the FreeRADIUS Makefile already sort the files correctly. Is it impossible to force rpmbuild to package the files installed by the Makefile in /usr/share/doc/... with a line the %files section ? %files ... %{_datadir}/doc/%{name}-%{version}/*/*
The following patch to the 1.1.3 CVS redhat directory file freeradius.spec simplifies this. I've tested it and appears to restore the doc install behaviour that FR used to have a few releases ago.
--- freeradius.spec.orig 2006-08-23 15:24:59.000000000 +1000 +++ freeradius.spec 2006-08-23 16:29:12.000000000 +1000 @@ -56,6 +56,9 @@ # remove unneeded stuff rm -f $RPM_BUILD_ROOT%{_mandir}/man8/builddbm.8 rm -f $RPM_BUILD_ROOT%{_prefix}/sbin/rc.radiusd +rm -rf doc/00-OLD doc/CVS doc/Makefile +rm -rf doc/examples/CVS doc/examples/Makefile +rm -rf doc/rfc/CVS doc/rfc/Makefile
I've seen something similar in suse/freeradius.spec, but I think this is a violation of the packaging rules: files in the *source* directory should not be deleted while building a package. -- Nicolas Baradakis