SPECS (AC-branch): xulrunner.spec - fix *.pc files for amd64 - cle...

[glen]

Author: glen                         Date: Wed Jan  3 23:44:49 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- fix *.pc files for amd64
- cleanups

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

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.7.2.10 SPECS/xulrunner.spec:1.7.2.11
--- SPECS/xulrunner.spec:1.7.2.10	Wed Jan  3 22:06:22 2007
+++ SPECS/xulrunner.spec	Thu Jan  4 00:44:44 2007
@@ -4,12 +4,13 @@
 %bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
 #
 %define		_snap	20070102
+%define		_rel	2
 #
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
 Version:	1.8.1.1
-Release:	1.%{_snap}.1
+Release:	1.%{_snap}.%{_rel}
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
 Source0:	%{name}-%{version}-%{_snap}-source.tar.bz2
@@ -149,7 +150,6 @@
 
 %{__make} -C xpinstall/packager make-package \
 	DESTDIR=$RPM_BUILD_ROOT \
-	PACKAGE=%{name} \
 	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
 
@@ -188,13 +188,13 @@
 		> $RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f)
 done
 
-sed -e 's,lib/xulrunner-%{version},lib,g;s/xulrunner-%{version}/xulrunner/g' build/unix/xulrunner-gtkmozembed.pc \
+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 -f $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nspr.pc
+rm $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nspr.pc
 
 # rename to without -bin extension for killall xulrunner to work
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner{-bin,}
@@ -452,6 +452,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7.2.11  2007/01/03 23:44:44  glen
+- fix *.pc files for amd64
+- cleanups
+
 Revision 1.7.2.10  2007/01/03 21:06:22  hawk
 - updated to 1.8.1.1, snapshot checked out from Mozilla CVS from
   FIREFOX_2_0_0_1_RELEASE branch, dropped nsIPermission.patch and
================================================================

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