X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=adapter.awk;h=169684ae1d87f2de665859ecdf7e4702105fd7aa;hb=bd49d9cd08ccbe1363d06792afaf641e6723af8f;hp=a8faad7eb1b8bf12937175c1131aa2cc583f0824;hpb=5fb5a7f8e130d315a00839f29db4020ee4883709;p=packages%2Frpm-build-tools.git

diff --git a/adapter.awk b/adapter.awk
index a8faad7..169684a 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -1197,9 +1197,15 @@ function use_macros()
 	gsub("%{_datadir}/pkgconfig", "%{_npkgconfigdir}")
 	gsub(npkgconfigdir, "%{_npkgconfigdir}")
 
+	gsub("%{_datadir}/locale", "%{_localedir}")
+	gsub(localedir, "%{_localedir}")
+
 	gsub(libdir, "%{_libdir}")
 	gsub(javadir, "%{_javadir}")
 
+	gsub(systemdunitdir, "%{systemdunitdir}")
+	gsub(systemdtmpfilesdir, "%{systemdtmpfilesdir}")
+
 	gsub(bindir, "%{_bindir}")
 	gsub("%{prefix}/bin", "%{_bindir}")
 	if (prefix"/bin" == bindir)
@@ -1458,9 +1464,6 @@ function use_macros()
 	if (pear_subclass) {
 		gsub("%{_subclass}", pear_subclass);
 	}
-
-	gsub("/lib/systemd/system", "%{systemdunitdir}")
-
 }
 
 function format_configure(line,		n, a, s) {
@@ -1900,7 +1903,7 @@ function import_rpm_macros() {
 	}
 
 	# update this version dep each time some new macro export is added
-	if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.47) {
+	if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.49) {
 		print "adapter shell script is outdated, please cvs up it" > "/dev/stderr"
 		do_not_touch_anything = 1
 		exit(rc = 1);
@@ -1929,6 +1932,7 @@ function import_rpm_macros() {
 	javadir = ENVIRON["_javadir"]
 	pkgconfigdir = ENVIRON["_pkgconfigdir"]
 	npkgconfigdir = ENVIRON["_npkgconfigdir"]
+	localedir = ENVIRON["_localedir"]
 
 	perl_sitearch = ENVIRON["perl_sitearch"]
 	perl_archlib = ENVIRON["perl_archlib"]
@@ -1957,6 +1961,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
@@ -2042,6 +2049,7 @@ function replace_groupnames(group) {
 	group = replace(group, "Text Processing/Markup/XML", "Applications/Text");
 	group = replace(group, "Text tools", "Applications/Text");
 	group = replace(group, "User Interface/Desktops", "X11/Applications");
+	group = replace(group, "User Interface/X", "X11/Applications");
 	group = replace(group, "Utilities/System", "Applications/System");
 	group = replace(group, "Web/Database", "Applications/WWW");
 	group = replace(group, "X11/GNOME", "X11/Applications");
@@ -2093,7 +2101,6 @@ function replace_requires() {
 	sub(/^jakarta-oro$/, "java-oro", $2);
 	sub(/^jakarta-servletapi$/, "java(servlet)", $2);
 	sub(/^java-devel$/, "jdk", $2);
-	sub(/^java-xerces$/, "java(jaxp_parser_impl)", $2);
 	sub(/^java\(JSP\)$/, "java(jsp)", $2);
 	sub(/^java\(JavaServerFaces\)$/, "java(javaserverfaces)", $2);
 	sub(/^java\(Portlet\)$/, "java(portlet)", $2);
@@ -2136,8 +2143,8 @@ function replace_requires() {
 	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(/^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);
@@ -2152,6 +2159,7 @@ function replace_requires() {
 	sub(/^chkconfig$/, "/sbin/chkconfig", $2);
 	sub(/^db4-devel$/, "db-devel", $2);
 	sub(/^dbus-python$/, "python-dbus", $2);
+	sub(/^desktop-notification-daemon$/, "dbus(org.freedesktop.Notifications)", $2);
 	sub(/^file-devel$/, "libmagic-devel", $2);
 	sub(/^freetype2-devel$/, "freetype-devel", $2);
 	sub(/^fuse-devel$/, "libfuse-devel", $2);
@@ -2171,6 +2179,7 @@ function replace_requires() {
 	sub(/^keyutils-libs-devel$/, "keyutils-devel", $2);
 	sub(/^libX11-devel$/, "xorg-lib-libX11-devel", $2);
 	sub(/^libXScrnSaver-devel$/, "xorg-lib-libXScrnSaver-devel", $2);
+	sub(/^libXau-devel$/, "xorg-lib-libXau", $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);
@@ -2179,6 +2188,7 @@ function replace_requires() {
 	sub(/^libacl-devel$/, "acl-devel", $2);
 	sub(/^libcurl-devel$/, "curl-devel", $2);
 	sub(/^libgudev1-devel$/, "udev-glib-devel", $2);
+	sub(/^libselinux-python$/, "python-selinux", $2);
 	sub(/^libsrtp-devel$/, "srtp-devel", $2);
 	sub(/^libtdb$/, "tdb", $2);
 	sub(/^libtdb-devel$/, "tdb-devel", $2);
@@ -2190,6 +2200,7 @@ function replace_requires() {
 	sub(/^pcsc-lite-ccid$/, "pcsc-driver-ccid", $2);
 	sub(/^pulseaudio-libs-devel$/, "pulseaudio-devel", $2);
 	sub(/^pyOpenSSL$/, "python-pyOpenSSL", $2);
+	sub(/^pycairo$/, "python-pycairo", $2);
 	sub(/^pyflakes$/, "python-pyflakes", $2);
 	sub(/^pygobject2$/, "python-pygobject", $2);
 	sub(/^pygtk2$/, "python-pygtk", $2);
@@ -2198,9 +2209,11 @@ function replace_requires() {
 	sub(/^pysvn$/, "python-pysvn", $2);
 	sub(/^pytalloc$/, "python-talloc", $2);
 	sub(/^pytalloc-devel$/, "python-talloc-devel", $2);
+	sub(/^python-cups$/, "python-pycups", $2);
 	sub(/^python-enchant$/, "python-pyenchant", $2);
 	sub(/^python-imaging$/, "python-PIL", $2);
 	sub(/^python-imaging-tk$/, "python-PIL-tk", $2);
+	sub(/^python-newt$/, "python-snack", $2);
 	sub(/^python-pygtk$/, "python-pygtk-gtk", $2);
 	sub(/^python-recaptcha-client$/, "python-recaptcha", $2);
 	sub(/^python-twisted-core$/, "python-TwistedCore", $2);