Another RPM build issue with version 1.1.1

[Sandworm]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello

There appears to be a conflict with the Makefiles in the doc
directories and the behaviour of RPM. With version 1.1.0, this was
OK as they were both consistent, but are not with version 1.1.1.

Now when the RPMs are built (on RHEL3 U6), the build bombs out
with:

RPM build errors:
    Installed (but unpackaged) file(s) found:
   /usr/share/doc/freeradius/Acct-Type
   /usr/share/doc/freeradius/Autz-Type
   /usr/share/doc/freeradius/CYGWIN
   /usr/share/doc/freeradius/ChangeLog
   /usr/share/doc/freeradius/DIFFS
   /usr/share/doc/freeradius/MACOSX
etc...

This is because the Makefiles in the doc directories have lines
like this:

$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius

whereas version 1.1.0 had lines like:

$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius-
$(RADIUSD_VERSION)

RPMs %doc macro, however (AFAIK), uses the version in the path, and
the documentation seems to say this too (from
http://www.rpm.org/max-rpm-snapshot/s1-rpm-inside-files-list-
directives.html, "When the package is installed, RPM creates a
directory in the documentation directory named the same as the
package (ie, <software>-<version>-<release>)").

This is what I am seeing during the RPM build - a relevant extract:

Processing files: freeradius-1.1.1-0
Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.18818
+ umask 022
+ cd /usr/src/redhat/BUILD
+ cd freeradius-1.1.1
+ DOCDIR=/var/tmp/freeradius-root/usr/share/doc/freeradius-1.1.1
+ export DOCDIR

Incidentally, apart from this, even if the Makefile/RPM conflict
were resolved, not all files get copied into the doc directory, I
think, and this was true with version 1.1.0 as well. The only files
seen there are:

ls /usr/share/doc/freeradius-1.1.0
ChangeLog  COPYRIGHT  INSTALL  README  todo

To get the other files there, it would unfortunately need a more
detailed list in the %files section of the SPEC file as shown
below:

%files
%defattr(-,root,root)
%doc doc/Acct-Type doc/Autz-Type doc/CYGWIN doc/ChangeLog doc/DIFFS
doc/MACOSX
%doc doc/OS2 doc/Post-Auth-Type doc/RADIUS-LDAP-eDirectory
doc/RADIUS-SQL.schema
%doc doc/README doc/Session-Type doc/Simultaneous-Use doc/aaa.txt
doc/ascend
%doc doc/bay doc/bugs doc/cisco doc/coding-methods.txt
doc/configurable_failover
%doc doc/duplicate-users doc/ldap_howto.txt doc/load-balance.txt
doc/misc-nas
%doc doc/module_interface doc/mssql doc/performance-testing
doc/processing_users_file
%doc doc/proxy doc/radrelay doc/release-method.txt doc/rfc/
doc/rlm* doc/supervise-radiusd.txt
%doc doc/tuning_guide doc/variables.txt todo/ COPYRIGHT INSTALL

Regards
SW
-----BEGIN PGP SIGNATURE-----
Note: This signature can be verified at https://www.hushtools.com/verify
Version: Hush 2.5

wkYEARECAAYFAkQp19gACgkQmw4BJyaatJ3xhgCgsjwbq8mP6XhQpsqSTLCBFena9fUA
nAvGkYPRHnlRzCnV+FMt5R6F5lOm
=jS3p
-----END PGP SIGNATURE-----