rpms/xulrunner/devel mozilla-pkgconfig.patch,1.8,1.9

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv750

Modified Files:
	mozilla-pkgconfig.patch 
Log Message:
Resolves: #430395: idldir is inconsistent between libxul.pc and libxul-embedding.pc

mozilla-pkgconfig.patch:

Index: mozilla-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-pkgconfig.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mozilla-pkgconfig.patch	23 Jan 2008 15:16:57 -0000	1.8
+++ mozilla-pkgconfig.patch	28 Jan 2008 08:45:42 -0000	1.9
@@ -1,6 +1,6 @@
 diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in
 --- mozilla/config/autoconf.mk.in.pk	2008-01-22 03:50:04.000000000 +0100
-+++ mozilla/config/autoconf.mk.in	2008-01-23 15:34:19.000000000 +0100
++++ mozilla/config/autoconf.mk.in	2008-01-28 09:38:16.000000000 +0100
 @@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
@@ -21,7 +21,7 @@
  LIBXUL_SDK      = @LIBXUL_SDK@
 diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer/libxul.pc.in
 --- mozilla/xulrunner/installer/libxul.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul.pc.in	2008-01-23 15:45:30.000000000 +0100
++++ mozilla/xulrunner/installer/libxul.pc.in	2008-01-28 09:38:16.000000000 +0100
 @@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -41,8 +41,8 @@
  Cflags: -I${includedir}/${includetype} -fshort-wchar
 \ No newline at end of file
 diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
---- mozilla/xulrunner/installer/Makefile.in.pk	2008-01-23 15:34:19.000000000 +0100
-+++ mozilla/xulrunner/installer/Makefile.in	2008-01-23 15:34:19.000000000 +0100
+--- mozilla/xulrunner/installer/Makefile.in.pk	2008-01-28 09:38:16.000000000 +0100
++++ mozilla/xulrunner/installer/Makefile.in	2008-01-28 09:38:16.000000000 +0100
 @@ -117,6 +117,7 @@ endif
  	-e "s|%includedir%|$(includedir)|" \
  	-e "s|%idldir%|$(idldir)|" \
@@ -53,7 +53,7 @@
  	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
 diff -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-unstable.pc.in
 --- mozilla/xulrunner/installer/libxul-unstable.pc.in.pk	2008-01-05 07:50:34.000000000 +0100
-+++ mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-01-23 15:34:19.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-01-28 09:38:16.000000000 +0100
 @@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -64,9 +64,30 @@
  includetype=unstable
  
  Name: libxul
+diff -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
+--- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk	2008-01-28 09:39:18.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in	2008-01-28 09:39:32.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/unstable
+ includetype=unstable
+ 
+ Name: libxul-embedding-unstable
 diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk	2008-01-23 15:45:43.000000000 +0100
-+++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2008-01-23 15:45:55.000000000 +0100
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
++++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2008-01-28 09:39:08.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/stable
+ includetype=stable
+ 
+ # Note: the default pkg-config cflags will only list include directories
 @@ -11,5 +11,5 @@ includetype=stable
  Name: libxul-embedding
  Description: Static library for version-independent embedding of the Mozilla runtime
@@ -76,7 +97,7 @@
  Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
 diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.pk mozilla/xulrunner/installer/mozilla-js.pc.in
 --- mozilla/xulrunner/installer/mozilla-js.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-js.pc.in	2008-01-23 15:46:18.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-js.pc.in	2008-01-28 09:38:16.000000000 +0100
 @@ -6,5 +6,5 @@ Name: JavaScript
  Description: The Mozilla JavaScript Library
  Version: %MOZILLA_VERSION%
@@ -87,7 +108,7 @@
 +Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
 diff -up mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk mozilla/xulrunner/installer/mozilla-plugin.pc.in
 --- mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2008-01-23 15:34:19.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2008-01-28 09:38:16.000000000 +0100
 @@ -6,4 +6,4 @@ Name: Mozilla Plug-In API
  Description: Mozilla Plug-In API
  Version: %MOZILLA_VERSION%