[packages/adapter: 187/631] - real adaption

glen glen at pld-linux.org
Mon Sep 12 19:50:08 CEST 2016


commit 5e15e952d881fca3a4637119b049058df755f2d5
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Sep 5 10:58:09 2005 +0000

    - real adaption
    
    Changed files:
        adapter.awk -> 1.179

 adapter.awk | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/adapter.awk b/adapter.awk
index b204f63..96b028d 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -267,6 +267,9 @@ preamble == 1 {
 			next
 	}
 
+	# atrpms
+	$0 = fixedsub("%perl_configure", "%{__perl} Makefile.PL \\\n\tINSTALLDIRS=vendor", $0);
+	$0 = fixedsub("%perl_makecheck", "%{?with_tests:%{__make} test}", $0);
 }
 
 ##########
@@ -319,6 +322,13 @@ preamble == 1 {
 	# No lines contain 'chmod' if it sets the modes to '644'
 	if ($1 ~ /chmod/ && $2 ~ /644/)
 		next
+
+	# foreign rpms
+	$0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
+	$0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
+
+	# atrpms
+	$0 = fixedsub("%perl_makeinstall", "%{__make} pure_install \\\n\tDESTDIR=$RPM_BUILD_ROOT", $0);
 }
 
 ##########
@@ -824,7 +834,8 @@ function use_macros()
 
 	gsub("^%{__make} install DESTDIR=\$RPM_BUILD_ROOT", "%{__make} install \\\n\tDESTDIR=$RPM_BUILD_ROOT")
 	gsub("^fix-info-dir$", "[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>\&1")
-	gsub("%buildroot", "$RPM_BUILD_ROOT")
+	$0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
+	$0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
 	gsub("%_bindir", "%{_bindir}")
 	gsub("%_datadir", "%{_datadir}")
 	gsub("%_iconsdir", "%{_iconsdir}")
@@ -928,6 +939,11 @@ function use_files_macros(	i, n, t, a)
 	if (/%{_mandir}/) {
 		gsub("\.gz$", "*")
 	}
+
+	# atrpms
+	$0 = fixedsub("%{perl_man1dir}", "%{_mandir}/man1", $0);
+	$0 = fixedsub("%{perl_man3dir}", "%{_mandir}/man3", $0);
+	$0 = fixedsub("%{perl_bin}", "%{_bindir}", $0);
 }
 
 function fill(ch, n, i) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885



More information about the pld-cvs-commit mailing list