- added systemd directories macros

[packages/rpm-build-tools.git] / adapter.awk

diff --git a/adapter.awk b/adapter.awk
index fd5cd795d58d7945ffb3de339c0e2ca91cd30260..2945f11ebe444107b6beb344cb0a69fcdea37e37 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -1200,6 +1200,9 @@ function use_macros()
        gsub(libdir, "%{_libdir}")
        gsub(javadir, "%{_javadir}")
 
+       gsub(systemdunitdir, "%{systemdunitdir}")
+       gsub(systemdtmpfilesdir, "%{systemdtmpfilesdir}")
+
        gsub(bindir, "%{_bindir}")
        gsub("%{prefix}/bin", "%{_bindir}")
        if (prefix"/bin" == bindir)
@@ -1458,7 +1461,6 @@ function use_macros()
        if (pear_subclass) {
                gsub("%{_subclass}", pear_subclass);
        }
-
 }
 
 function format_configure(line,                n, a, s) {
@@ -1955,6 +1957,9 @@ function import_rpm_macros() {
        php_pear_dir = ENVIRON["php_pear_dir"]
        php_data_dir = ENVIRON["php_data_dir"]
        tmpdir = ENVIRON["tmpdir"]
+
+       systemdunitdir = ENVIRON["systemdunitdir"]
+       systemdtmpfilesdir = ENVIRON["systemdtmpfilesdir"]
 }
 
 # php virtual deps as discussed in devel-en
@@ -2066,19 +2071,27 @@ function replace_requires() {
        # bad package.xml, see http://pear.php.net/bugs/bug.php?id=17779
        sub(/^php-php-gtk/, "php-gtk2", $2);
 
-       # jpackages
+       # jpackages / fedora java packages
        sub(/^antlr3$/, "java-antlr3", $2);
        sub(/^avalon-framework$/, "java-avalon-framework", $2);
        sub(/^avalon-logkit$/, "java-avalon-logkit", $2);
        sub(/^axis$/, "java-axis", $2);
+       sub(/^bouncycastle$/, "java-bcprov", $2);
+       sub(/^bouncycastle-mail$/, "java-bcmail", $2);
+       sub(/^bouncycastle-tsp$/, "java-bctsp", $2);
        sub(/^bsf$/, "java-bsf", $2);
+       sub(/^dom4j$/, "java-dom4j", $2);
+       sub(/^flute$/, "java-flute", $2);
        sub(/^gnu-regexp$/, "java-gnu-regexp", $2);
        sub(/^gnu.regexp$/, "java-gnu-regexp", $2);
        sub(/^hamcrest$/, "java-hamcrest", $2);
+       sub(/^itext$/, "java-itext", $2);
        sub(/^jaas$/, "java(jaas)", $2);
        sub(/^jaf$/, "java(jaf)", $2);
        sub(/^jakarta-ant$/, "ant", $2);
+       sub(/^jakarta-commons-codec$/, "java-commons-codec", $2);
        sub(/^jakarta-commons-httpclient$/, "java-commons-httpclient", $2);
+       sub(/^jakarta-commons-logging$/, "java-commons-logging", $2);
        sub(/^jakarta-log4j$/, "java-log4j", $2);
        sub(/^jakarta-oro$/, "java-oro", $2);
        sub(/^jakarta-servletapi$/, "java(servlet)", $2);
@@ -2102,25 +2115,37 @@ function replace_requires() {
        sub(/^jsse$/, "java(jsse)", $2);
        sub(/^jta$/, "java(jta)", $2);
        sub(/^junit$/, "java-junit", $2);
+       sub(/^junit4$/, "java-junit", $2);
        sub(/^ldapjdk$/, "ldapsdk", $2);
+       sub(/^libbase$/, "java-libbase", $2);
+       sub(/^libfonts$/, "java-libfonts", $2);
+       sub(/^libformula$/, "java-libformula", $2);
+       sub(/^liblayout$/, "java-liblayout", $2);
+       sub(/^libloader$/, "java-libloader", $2);
+       sub(/^librepository$/, "java-librepository", $2);
+       sub(/^libserializer$/, "java-libserializer", $2);
        sub(/^log4j$/, "java-log4j", $2);
        sub(/^logging-log4j$/, "java-log4j", $2);
        sub(/^oro$/, "java-oro", $2);
+       sub(/^pdf-renderer$/, "java-pdf-renderer", $2);
+       sub(/^pentaho-libxml$/, "java-libxml", $2);
        sub(/^rhino$/, "java-rhino", $2);
+       sub(/^sac$/, "java-sac", $2);
        sub(/^saxon-scripts$/, "saxon", $2);
        sub(/^servlet$/, "java(servlet)", $2);
        sub(/^uddi4j$/, "java-uddi4j", $2);
+       sub(/^ws-jaxme$/, "java-jaxme", $2);
        sub(/^wsdl4j$/, "java-wsdl4j", $2);
        sub(/^xalan-j$/, "java-xalan", $2);
        sub(/^xalan-j2$/, "java-xalan", $2);
-       sub(/^xerces-j$/, "java(jaxp_parser_impl)", $2);
-       sub(/^xerces-j2$/, "java(jaxp_parser_impl)", $2);
-       sub(/^java-xerces$/, "java(jaxp_parser_impl)", $2);
-       sub(/^xml-commons-apis$/, "java-xml-commons-apis", $2);
+       sub(/^xerces-j$/, "java-xerces", $2);
+       sub(/^xerces-j2$/, "java-xerces", $2);
+       sub(/^xml-commons-apis$/, "java-xml-commons", $2);
        sub(/^xml-commons-resolver$/, "java-xml-commons-resolver", $2);
+       sub(/^xmldb-api$/, "java-xmldb", $2);
+       sub(/^xmldb-api-sdk$/, "java-xmldb-sdk", $2);
 
        # fedora / redhat
-       sub(/^keyutils-libs-devel$/, "keyutils-devel", $2);
        sub(/^Django$/, "python-django", $2);
        sub(/^GitPython$/, "python-git", $2);
        sub(/^PyQt4-devel$/, "python-PyQt4-devel", $2);
@@ -2145,18 +2170,23 @@ function replace_requires() {
        sub(/^initscripts$/, "rc-scripts", $2);
        sub(/^iproute$/, "iproute2", $2);
        sub(/^iscsi-initiator-utils$/, "open-iscsi", $2);
-       sub(/^jakarta-commons-logging$/, "java-commons-logging", $2);
+       sub(/^keyutils-libs-devel$/, "keyutils-devel", $2);
+       sub(/^libX11-devel$/, "xorg-lib-libX11-devel", $2);
+       sub(/^libXScrnSaver-devel$/, "xorg-lib-libXScrnSaver-devel", $2);
+       sub(/^libXext-devel$/, "xorg-lib-libXext-devel", $2);
        sub(/^libXft-devel$/, "xorg-lib-libXft-devel", $2);
+       sub(/^libXinerama-devel$/, "xorg-lib-libXinerama-devel", $2);
        sub(/^libXrandr-devel$/, "xorg-lib-libXrandr-devel", $2);
+       sub(/^libXxf86vm-devel$/, "xorg-lib-libXxf86vm-devel", $2);
        sub(/^libacl-devel$/, "acl-devel", $2);
        sub(/^libcurl-devel$/, "curl-devel", $2);
        sub(/^libgudev1-devel$/, "udev-glib-devel", $2);
-       sub(/^libloader$/, "java-libloader", $2);
        sub(/^libsrtp-devel$/, "srtp-devel", $2);
        sub(/^libtdb$/, "tdb", $2);
        sub(/^libtdb-devel$/, "tdb-devel", $2);
        sub(/^libtevent$/, "tevent", $2);
        sub(/^libtevent-devel$/, "tevent-devel", $2);
+       sub(/^libusb1-devel$/, "libusb-devel", $2);
        sub(/^mod_wsgi$/, "apache-mod_wsgi", $2);
        sub(/^notify-python$/, "python-pynotify", $2);
        sub(/^pcsc-lite-ccid$/, "pcsc-driver-ccid", $2);
@@ -2188,8 +2218,10 @@ function replace_requires() {
        sub(/^sip-devel$/, "python-sip-devel", $2);
        sub(/^tftp-server$/, "tftpdaemon", $2);
        sub(/^tkinter$/, "python-tkinter", $2);
+       sub(/^urw-fonts$/, "fonts-Type1-urw", $2);
        sub(/^xapian-bindings-python$/, "python-xapian", $2);
        sub(/^xorg-x11-server-sdk$/, "xorg-xserver-server-devel", $2);
+
        # mandriva
        sub(/^python-gobject-devel$/, "python-pygobject-devel", $2);
        sub(/^python-pyrex$/, "python-Pyrex", $2);
@@ -2238,10 +2270,14 @@ function replace_requires() {
        sub(/^vala-devel$/, "vala", $2);
 
        # altlinux
+       sub(/^libatk-devel$/, "atk-devel", $2);
        sub(/^libgit-devel$/, "git-core-devel", $2);
+       sub(/^libgtk\+2-devel$/, "gtk+2-devel", $2);
        sub(/^libncurses-devel$/, "ncurses-devel", $2);
        sub(/^libncursesxx-devel$/, "ncurses-c++-devel", $2);
+       sub(/^libpango-devel$/, "pango-devel", $2);
        sub(/^libpcre-devel$/, "pcre-devel", $2);
+       sub(/^libpopt-devel$/, "popt-devel", $2);
        sub(/^libssl-devel$/, "openssl-devel", $2);
 
        # suse