rpms/xulrunner/devel mozilla-pkgconfig.patch, 1.6, 1.7 xulrunner.spec, 1.53, 1.54 mozilla-sqlite-build.patch, 1.4, NONE

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	mozilla-pkgconfig.patch xulrunner.spec 
Removed Files:
	mozilla-sqlite-build.patch 
Log Message:
removed sqlite patch, updated pkgconfig patch

mozilla-pkgconfig.patch:

Index: mozilla-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-pkgconfig.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mozilla-pkgconfig.patch	13 Jan 2008 23:57:38 -0000	1.6
+++ mozilla-pkgconfig.patch	23 Jan 2008 09:54:12 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in
 --- mozilla/config/autoconf.mk.in.pk	2007-10-11 20:50:54.000000000 +0200
-+++ mozilla/config/autoconf.mk.in	2008-01-08 10:24:14.000000000 +0100
++++ mozilla/config/autoconf.mk.in	2008-01-16 16:29:22.000000000 +0100
 @@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
@@ -21,22 +21,35 @@
  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-08 10:43:50.000000000 +0100
-@@ -1,7 +1,7 @@
++++ mozilla/xulrunner/installer/libxul.pc.in	2008-01-16 16:40:56.000000000 +0100
+@@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
++libdir=%libdir%
  includedir=%includedir%
 -idldir=%idldir%
 +idldir=%idldir%/stable
  includetype=stable
  
  # Note: the default pkg-config includes will only list include directories
+diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
+--- mozilla/xulrunner/installer/Makefile.in.pk	2008-01-16 16:29:22.000000000 +0100
++++ mozilla/xulrunner/installer/Makefile.in	2008-01-16 16:42:57.000000000 +0100
+@@ -117,6 +117,7 @@ endif
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%sdkdir%|$(sdkdir)|" \
++	-e "s|%libdir%|$(installdir)|" \
+ 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-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-08 10:43:55.000000000 +0100
-@@ -1,7 +1,7 @@
++++ mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-01-16 16:41:23.000000000 +0100
+@@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
++libdir=%libdir%
  includedir=%includedir%
 -idldir=%idldir%
 +idldir=%idldir%/unstable
@@ -45,7 +58,7 @@
  Name: libxul
 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-08 10:24:14.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-js.pc.in	2008-01-16 16:29:22.000000000 +0100
 @@ -7,4 +7,4 @@ Description: The Mozilla JavaScript Libr
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
@@ -54,7 +67,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-08 10:24:14.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2008-01-16 16:29:22.000000000 +0100
 @@ -6,4 +6,4 @@ Name: Mozilla Plug-In API
  Description: Mozilla Plug-In API
  Version: %MOZILLA_VERSION%


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xulrunner.spec	22 Jan 2008 05:12:59 -0000	1.53
+++ xulrunner.spec	23 Jan 2008 09:54:12 -0000	1.54
@@ -40,7 +40,6 @@
 # font system fixes
 
 # Other
-Patch105:       mozilla-sqlite-build.patch
 Patch107:       mozilla-pkgconfig.patch
 
 %if %{official_branding}
@@ -114,7 +113,6 @@
 %patch5   -p1
 %patch6   -p1 -b .ver
 
-%patch105 -p1 -b .sqlite
 %patch107 -p1 -b .pk
 
 


--- mozilla-sqlite-build.patch DELETED ---