The epel-rpm-macros-5-1 package for EPEL5 should now be in stable but I have not yet requested that it be added to the buildroot. This adds a number of things which I've mentioned earlier (Group:, BuildRoot: and %clean not needed; buildroot automatically cleaned in %install) and allows packagers to remove those bits from their specs if they want.

This really needs to be tested. I've done local changes and done several mass builds and only found a couple of packages I need to investigate. Still, I don't know what might be out there and don't want to break anyone's non-EPEL stuff. Please set up mock and try it out. (See below.)

Similarly, epel-macros-6-4 is currently in testing. When doing the EP5 macros I found a far simpler and cleaner way to define %license. I also added a guard to disable it if the SCL macros are present.

How to test: You need mock installed locally. For EL6, just make sure that the testing repo is enabled and that epel-rpm-macros-6-4 gets into your buildroots. For EL5, add epel-rpm-macros to config_opts['chroot_setup_cmd']. Then build as normally, and also try to remove the bits you should no longer need.

For EL5, double check the description of the built packages. (I just do rpmdiff -i T against the version built without the macros.) Due to the way %clean is added, if an existing %clean section appears immediately after %description, a couple of lines can be tacked onto the resulting package description. It's very weird for anything besides %prep or a %package stanza to follow %description, though, and it doesn't break the package in any case.

- J<