Hi For years, we patch our rpm in order to support for /etc/rpm/macros.d (very old compat with rpm-4.4). Upstream refused to merge it as "/etc/rpm/ is a "macros.d" style directory already, except in name".
I would like to drop that patch from rpm (one less to maintain). That means basically renaming files: /etc/rpm/macros.d/foobar.macros => /etc/rpm/macros/macros.foobar So I suggest we: - fix the packages that needs it - drop the patch from rpm. There's not that many packages to fix: $ urpmf /etc/rpm/macros.d | sort -u apache-devel:/etc/rpm/macros.d/httpd.macros cmake:/etc/rpm/macros.d/cmake.macros fdupes:/etc/rpm/macros.d/fdupes.macros firefox-devel:/etc/rpm/macros.d/firefox.macros haskell-macros:/etc/rpm/macros.d/haskell-macros.macros ibus-devel:/etc/rpm/macros.d/ibus.macros java-1.5.0-gcj-devel:/etc/rpm/macros.d/java-1.5.0-gcj.macros kde4-macros:/etc/rpm/macros.d/kde4.macros lib64qt4-devel:/etc/rpm/macros.d/qt4.macros lib64scim-devel:/etc/rpm/macros.d/scim.macros lib64tcl-devel:/etc/rpm/macros.d/tcl.macros lib64uClibc-devel:/etc/rpm/macros.d/uclibc.macros lib64xulrunner-devel:/etc/rpm/macros.d/xulrunner.macros mageia-release-Default:/etc/rpm/macros.d/Default.macros mingw32-filesystem:/etc/rpm/macros.d/mingw32.macros multiarch-utils:/etc/rpm/macros.d/multiarch.macros postgresql8.4:/etc/rpm/macros.d/postgresql8.4.macros postgresql9.0:/etc/rpm/macros.d/postgresql9.0.macros postgresql9.1:/etc/rpm/macros.d/postgresql9.1.macros prelink:/etc/rpm/macros.d/prelink.macros python3:/etc/rpm/macros.d/python3.macros python-sip:/etc/rpm/macros.d/sip.macros rpm:/etc/rpm/macros.d rpm-helper:/etc/rpm/macros.d/rpm-helper.macros rpm-mageia-setup-build:/etc/rpm/macros.d/20build.macros rpm-mageia-setup-build:/etc/rpm/macros.d/dwz.macros rpm-mageia-setup:/etc/rpm/macros.d rpm-mageia-setup:/etc/rpm/macros.d/20common.macros ruby:/etc/rpm/macros.d/ruby.macros scons:/etc/rpm/macros.d/scons.macros spec-helper:/etc/rpm/macros.d/spec-helper.macros vdr-devel:/etc/rpm/macros.d/vdr.macros waf:/etc/rpm/macros.d/waf.macros waf-python3:/etc/rpm/macros.d/waf-python3.macros WDYT?
