SPECS (AC-branch): xulrunner.spec - use make to install .pc files

[glen]

Author: glen                         Date: Sat Jan  6 23:41:31 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use make to install .pc files

---- Files affected:
SPECS:
   xulrunner.spec (1.7.2.11 -> 1.7.2.12) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.7.2.11 SPECS/xulrunner.spec:1.7.2.12
--- SPECS/xulrunner.spec:1.7.2.11	Thu Jan  4 00:44:44 2007
+++ SPECS/xulrunner.spec	Sun Jan  7 00:41:25 2007
@@ -17,6 +17,7 @@
 # Source0-md5:	92b4936a5b8bd24edac8feaa26d13567
 Patch0:		%{name}-ldap-with-nss.patch
 Patch1:		%{name}-install.patch
+Patch2:		%{name}-pc.patch
 URL:		http://developer.mozilla.org/en/docs/XULRunner
 BuildRequires:	/bin/csh
 %{?with_gnome:BuildRequires:	GConf2-devel >= 1.2.1}
@@ -103,6 +104,7 @@
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cd mozilla
@@ -183,18 +185,11 @@
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_dump $RPM_BUILD_ROOT%{_bindir}/xpt_dump
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_link $RPM_BUILD_ROOT%{_bindir}/xpt_link
 
-for f in build/unix/*.pc ; do
-	sed -e 's/xulrunner-%{version}/xulrunner/' $f \
-		> $RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f)
-done
+%{__make} -C build/unix install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-sed -e 's,%{_lib}/xulrunner-%{version},%{_lib},g;s/xulrunner-%{version}/xulrunner/g' build/unix/xulrunner-gtkmozembed.pc \
-		> $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-gtkmozembed.pc
-
-# add includir/dom to Cflags, for openvrml.spec, perhaps others
-sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}' $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-plugin.pc
-
-rm $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nspr.pc
+# we use system pkgs
+rm $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-{nspr,nss}.pc
 
 # rename to without -bin extension for killall xulrunner to work
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner{-bin,}
@@ -452,6 +447,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7.2.12  2007/01/06 23:41:25  glen
+- use make to install .pc files
+
 Revision 1.7.2.11  2007/01/03 23:44:44  glen
 - fix *.pc files for amd64
 - cleanups
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xulrunner.spec?r1=1.7.2.11&r2=1.7.2.12&f=u