SPECS (DEVEL): adapter.spec, adapter.awk - moved pkgconfig subst t...

glen glen at pld-linux.org
Mon Oct 10 11:18:53 CEST 2005


Author: glen                         Date: Mon Oct 10 09:18:53 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- moved pkgconfig subst to use_files_macros()

---- Files affected:
SPECS:
   adapter.spec (1.26.2.11 -> 1.26.2.12) , adapter.awk (1.195 -> 1.196) 

---- Diffs:

================================================================
Index: SPECS/adapter.spec
diff -u SPECS/adapter.spec:1.26.2.11 SPECS/adapter.spec:1.26.2.12
--- SPECS/adapter.spec:1.26.2.11	Mon Oct 10 10:24:03 2005
+++ SPECS/adapter.spec	Mon Oct 10 11:18:48 2005
@@ -85,6 +85,10 @@
 	$RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,rc.d/init.d} \
 	$RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \
 
+%if "%{_lib}" != "lib"
+mv -f $RPM_BUILD_ROOT{/usr/lib/pkgconfig,%{_pkgconfigdir}}
+%endif
+
 install -m 754 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/entrance
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/Xsession
 install -m755 esvn $RPM_BUILD_ROOT%{_bindir}/esvn
@@ -155,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26.2.12  2005/10/10 09:18:48  glen
+- moved pkgconfig subst to use_files_macros()
+
 Revision 1.26.2.11  2005/10/10 08:24:03  glen
 - _pkgconfigdir macro
 

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.195 SPECS/adapter.awk:1.196
--- SPECS/adapter.awk:1.195	Mon Oct 10 10:24:04 2005
+++ SPECS/adapter.awk	Mon Oct 10 11:18:48 2005
@@ -846,10 +846,6 @@
 
 	gsub(examplesdir, "%{_examplesdir}")
 
-	gsub(libdir "/pkgconfig", "%{_pkgconfigdir}");
-	gsub("%{_libdir}/pkgconfig", "%{_pkgconfigdir}");
-	gsub("%{_prefix}/lib/pkgconfig", "%{_pkgconfigdir}");
-
 	if (prefix != "/") {
 		# leave --with-foo=/usr alone
 		if ($0 !~ "--with.*=.*" prefix) {
@@ -862,6 +858,8 @@
 					continue;
 				if ($c ~ prefix "/lib/sendmail")
 					continue;
+				if ($c ~ prefix "/lib/pkgconfig")
+					continue;
 				gsub(prefix, "%{_prefix}", $c)
 			}
 		}
@@ -970,7 +968,6 @@
 		}
 	}
 
-
 	# kill leading zeros
 	if (/%attr\(0[1-9]/) {
 		gsub("%attr\\(0", "%attr(")
@@ -1000,6 +997,10 @@
 	$0 = fixedsub("%{perl_man1dir}", "%{_mandir}/man1", $0);
 	$0 = fixedsub("%{perl_man3dir}", "%{_mandir}/man3", $0);
 	$0 = fixedsub("%{perl_bin}", "%{_bindir}", $0);
+
+	gsub(libdir "/pkgconfig", "%{_pkgconfigdir}");
+	gsub("%{_libdir}/pkgconfig", "%{_pkgconfigdir}");
+	gsub("%{_prefix}/lib/pkgconfig", "%{_pkgconfigdir}");
 }
 
 function fill(ch, n, i) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.11&r2=1.26.2.12&f=u
    http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.195&r2=1.196&f=u




More information about the pld-cvs-commit mailing list