rpms/xulrunner/devel mozilla-pkgconfig.patch, 1.1, 1.2 xulrunner.spec, 1.33, 1.34

Martin Stransky (stransky) fedora-extras-commits at redhat.com
Tue Dec 18 13:12:58 UTC 2007 

Author: stransky

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

Modified Files:
	mozilla-pkgconfig.patch xulrunner.spec 
Log Message:
moved SDK to xulrunner-sdk

mozilla-pkgconfig.patch:

Index: mozilla-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-pkgconfig.patch	6 Dec 2007 09:57:48 -0000	1.1
+++ mozilla-pkgconfig.patch	18 Dec 2007 13:12:49 -0000	1.2
@@ -1,23 +1,81 @@
-diff -up mozilla/config/autoconf.mk.in.old mozilla/config/autoconf.mk.in
---- mozilla/config/autoconf.mk.in.old	2007-10-11 20:50:54.000000000 +0200
-+++ mozilla/config/autoconf.mk.in	2007-12-06 10:48:22.000000000 +0100
-@@ -65,7 +65,7 @@ mandir		= @mandir@
- idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+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	2007-12-18 12:35:35.000000000 +0100
+@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
  
  installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 -sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
  
  DIST		= $(DEPTH)/dist
  LIBXUL_SDK      = @LIBXUL_SDK@
-diff -up mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.old mozilla/xulrunner/installer/xulrunner-xpcom.pc.in
---- mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.old	2007-12-06 10:48:22.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-xpcom.pc.in	2007-12-06 10:48:22.000000000 +0100
-@@ -3,14 +3,15 @@ sdkdir=%sdkdir%
+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	2007-12-18 12:35:35.000000000 +0100
+@@ -2,6 +2,7 @@ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+ idldir=%idldir%
++libdir=%installdir%
+ includetype=stable
+ 
+ # Note: the default pkg-config includes will only list include directories
+diff -up mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in
+--- mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in.pk	2007-12-18 12:35:35.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in	2007-12-18 12:35:35.000000000 +0100
+@@ -5,7 +5,7 @@ idldir=%idldir%
+ includetype=stable
+ libdir=%sdkdir%
+ 
+-Name: mozilla-gtkembedmoz
++Name: xulrunner-gtkembedmoz
+ Description: Mozilla Embedding Widget for Gtk+
+ Version: %MOZILLA_VERSION%
+ Requires: %MOZ_APP_NAME%-xpcom = %MOZILLA_VERSION%
+diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
+--- mozilla/xulrunner/installer/Makefile.in.pk	2007-12-18 12:35:35.000000000 +0100
++++ mozilla/xulrunner/installer/Makefile.in	2007-12-18 12:48:50.000000000 +0100
+@@ -89,6 +89,14 @@ pkg_config_files = \
+ 	libxul-embedding.pc \
+ 	mozilla-js.pc \
+ 	mozilla-plugin.pc \
++	mozilla-xpcom.pc \
++	mozilla-embedding.pc \
++	mozilla-gtkmozembed.pc \
++	xulrunner-js.pc \
++	xulrunner-plugin.pc \
++	xulrunner-xpcom.pc \
++	xulrunner-embedding.pc \
++	xulrunner-gtkmozembed.pc \
+ 	$(NULL)
+ 
+ ifdef MOZ_NATIVE_NSPR
+@@ -114,6 +122,7 @@ endif
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%sdkdir%|$(sdkdir)|" \
++	-e "s|%installdir%|$(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/xulrunner-xpcom.pc.in.pk mozilla/xulrunner/installer/xulrunner-xpcom.pc.in
+--- mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.pk	2007-12-18 12:35:35.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-xpcom.pc.in	2007-12-18 12:35:35.000000000 +0100
+@@ -3,12 +3,13 @@ sdkdir=%sdkdir%
  includedir=%includedir%
  idldir=%idldir%
  includetype=stable
-+libdir=%sdkdir%
++libdir=%installdir%
  
  # Note: the default pkg-config includes will only list include directories
  # that contain stable (frozen or safe for linking) header files. To include
@@ -28,60 +86,50 @@
  Description: The Mozilla Runtime and Embedding Engine
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
-+Libs: -L${sdkdir} -lxpcomglue_s -lxul -lxpcom
- Cflags: -I${includedir}/${includetype} -fshort-wchar
-\ No newline at end of file
-diff -up mozilla/xulrunner/installer/libxul.pc.in.old mozilla/xulrunner/installer/libxul.pc.in
---- mozilla/xulrunner/installer/libxul.pc.in.old	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul.pc.in	2007-12-06 10:48:22.000000000 +0100
+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	2007-08-03 16:46:28.000000000 +0200
++++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2007-12-18 12:35:35.000000000 +0100
 @@ -2,6 +2,7 @@ prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
  idldir=%idldir%
-+libdir=%sdkdir%
++libdir=%installdir%
  includetype=stable
  
- # Note: the default pkg-config includes will only list include directories
-@@ -12,5 +13,5 @@ Name: libxul
- Description: The Mozilla Runtime and Embedding Engine
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
-+Libs: -L${sdkdir} -lxpcomglue_s -lxul -lxpcom
- Cflags: -I${includedir}/${includetype} -fshort-wchar
-\ No newline at end of file
-diff -up mozilla/xulrunner/installer/mozilla-xpcom.pc.in.old mozilla/xulrunner/installer/mozilla-xpcom.pc.in
---- mozilla/xulrunner/installer/mozilla-xpcom.pc.in.old	2007-12-06 10:48:22.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in	2007-12-06 10:48:22.000000000 +0100
-@@ -2,15 +2,16 @@ prefix=%prefix%
+ # Note: the default pkg-config cflags will only list include directories
+diff -up mozilla/xulrunner/installer/xulrunner-js.pc.in.pk mozilla/xulrunner/installer/xulrunner-js.pc.in
+--- mozilla/xulrunner/installer/xulrunner-js.pc.in.pk	2007-12-18 12:35:35.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-js.pc.in	2007-12-18 12:35:35.000000000 +0100
+@@ -1,10 +1,11 @@
+ prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
- idldir=%idldir%
-+libdir=%sdkdir%
- includetype=stable
++libdir=%installdir%
  
- # Note: the default pkg-config includes will only list include directories
- # that contain stable (frozen or safe for linking) header files. To include
- # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
- 
--Name: libxul
-+Name: mozilla-xpcom
- Description: The Mozilla Runtime and Embedding Engine
+ Name: JavaScript
+ Description: The Mozilla JavaScript Library
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
-+Libs: -L${sdkdir} -lxpcomglue_s -lxul -lxpcom
- Cflags: -I${includedir}/${includetype} -fshort-wchar
-\ No newline at end of file
-diff -up mozilla/xulrunner/installer/xulrunner-embedding.pc.in.old mozilla/xulrunner/installer/xulrunner-embedding.pc.in
---- mozilla/xulrunner/installer/xulrunner-embedding.pc.in.old	2007-12-06 10:48:22.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-embedding.pc.in	2007-12-06 10:48:22.000000000 +0100
-@@ -2,14 +2,15 @@ prefix=%prefix%
+ Libs: -L${sdkdir}/lib -lmozjs
+-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
+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	2007-12-18 12:35:35.000000000 +0100
+@@ -7,4 +7,4 @@ Description: The Mozilla JavaScript Libr
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lmozjs
+-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
+diff -up mozilla/xulrunner/installer/xulrunner-embedding.pc.in.pk mozilla/xulrunner/installer/xulrunner-embedding.pc.in
+--- mozilla/xulrunner/installer/xulrunner-embedding.pc.in.pk	2007-12-18 12:35:35.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-embedding.pc.in	2007-12-18 12:35:35.000000000 +0100
+@@ -2,13 +2,14 @@ prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
  idldir=%idldir%
-+libdir=%sdkdir%
++libdir=%installdir%
  includetype=stable
  
  # Note: the default pkg-config cflags will only list include directories
@@ -92,68 +140,45 @@
 +Name: xulrunner-embedding
  Description: Static library for version-independent embedding of the Mozilla runtime
  Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue
-+Libs: -L${sdkdir} -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
-diff -up mozilla/xulrunner/installer/xulrunner-plugin.pc.in.old mozilla/xulrunner/installer/xulrunner-plugin.pc.in
---- mozilla/xulrunner/installer/xulrunner-plugin.pc.in.old	2007-12-06 10:48:22.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-plugin.pc.in	2007-12-06 10:48:22.000000000 +0100
+ Libs: -L${sdkdir}/lib -lxpcomglue
+diff -up mozilla/xulrunner/installer/xulrunner-plugin.pc.in.pk mozilla/xulrunner/installer/xulrunner-plugin.pc.in
+--- mozilla/xulrunner/installer/xulrunner-plugin.pc.in.pk	2007-12-18 12:35:35.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-plugin.pc.in	2007-12-18 12:35:35.000000000 +0100
 @@ -1,6 +1,7 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
-+libdir=%sdkdir%
++libdir=%installdir%
  
  Name: Mozilla Plug-In API
  Description: Mozilla Plug-In API
-diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.old mozilla/xulrunner/installer/libxul-embedding.pc.in
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.old	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2007-12-06 10:48:22.000000000 +0100
-@@ -2,6 +2,7 @@ prefix=%prefix%
+diff -up mozilla/xulrunner/installer/mozilla-xpcom.pc.in.pk mozilla/xulrunner/installer/mozilla-xpcom.pc.in
+--- mozilla/xulrunner/installer/mozilla-xpcom.pc.in.pk	2007-12-18 12:35:35.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in	2007-12-18 12:35:35.000000000 +0100
+@@ -2,13 +2,14 @@ prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
  idldir=%idldir%
-+libdir=%sdkdir%
++libdir=%installdir%
  includetype=stable
  
- # Note: the default pkg-config cflags will only list include directories
-@@ -11,5 +12,5 @@ includetype=stable
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue
-+Libs: -L${sdkdir} -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
-diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.old mozilla/xulrunner/installer/mozilla-js.pc.in
---- mozilla/xulrunner/installer/mozilla-js.pc.in.old	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-js.pc.in	2007-12-06 10:48:22.000000000 +0100
-@@ -6,5 +6,5 @@ Name: JavaScript
- Description: The Mozilla JavaScript Library
+ # Note: the default pkg-config includes will only list include directories
+ # that contain stable (frozen or safe for linking) header files. To include
+ # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
+ 
+-Name: libxul
++Name: mozilla-xpcom
+ Description: The Mozilla Runtime and Embedding Engine
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${sdkdir}/lib -lmozjs
--Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
-+Libs: -L${sdkdir} -lmozjs
-+Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
-diff -up mozilla/xulrunner/installer/mozilla-plugin.pc.in.old mozilla/xulrunner/installer/mozilla-plugin.pc.in
---- mozilla/xulrunner/installer/mozilla-plugin.pc.in.old	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2007-12-06 10:51:23.000000000 +0100
-@@ -1,6 +1,7 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
- includedir=%includedir%
-+libdir=%sdkdir%
- 
- Name: Mozilla Plug-In API
- Description: Mozilla Plug-In API
-diff -up mozilla/xulrunner/installer/mozilla-embedding.pc.in.old mozilla/xulrunner/installer/mozilla-embedding.pc.in
---- mozilla/xulrunner/installer/mozilla-embedding.pc.in.old	2007-12-06 10:48:22.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-embedding.pc.in	2007-12-06 10:48:22.000000000 +0100
-@@ -2,14 +2,15 @@ prefix=%prefix%
+diff -up mozilla/xulrunner/installer/mozilla-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-embedding.pc.in
+--- mozilla/xulrunner/installer/mozilla-embedding.pc.in.pk	2007-12-18 12:35:35.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-embedding.pc.in	2007-12-18 12:35:35.000000000 +0100
+@@ -2,13 +2,14 @@ prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
  idldir=%idldir%
-+libdir=%sdkdir%
++libdir=%installdir%
  includetype=stable
  
  # Note: the default pkg-config cflags will only list include directories
@@ -164,53 +189,15 @@
 +Name: mozilla-embedding
  Description: Static library for version-independent embedding of the Mozilla runtime
  Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue
-+Libs: -L${sdkdir} -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
-diff -up mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in.old mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in
---- mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in.old	2007-12-06 10:48:22.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in	2007-12-06 10:48:22.000000000 +0100
-@@ -5,7 +5,7 @@ idldir=%idldir%
- includetype=stable
- libdir=%sdkdir%
- 
--Name: mozilla-gtkembedmoz
-+Name: xulrunner-gtkembedmoz
- Description: Mozilla Embedding Widget for Gtk+
- Version: %MOZILLA_VERSION%
- Requires: %MOZ_APP_NAME%-xpcom = %MOZILLA_VERSION%
-diff -up mozilla/xulrunner/installer/xulrunner-js.pc.in.old mozilla/xulrunner/installer/xulrunner-js.pc.in
---- mozilla/xulrunner/installer/xulrunner-js.pc.in.old	2007-12-06 10:48:22.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-js.pc.in	2007-12-06 10:48:22.000000000 +0100
-@@ -1,10 +1,11 @@
+ Libs: -L${sdkdir}/lib -lxpcomglue
+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	2007-12-18 12:35:35.000000000 +0100
+@@ -1,6 +1,7 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
-+libdir=%sdkdir%
++libdir=%installdir%
  
- Name: JavaScript
- Description: The Mozilla JavaScript Library
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${sdkdir}/lib -lmozjs
--Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
-+Libs: -L${sdkdir} -lmozjs
-+Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
-diff -up mozilla/xulrunner/installer/Makefile.in.old mozilla/xulrunner/installer/Makefile.in
---- mozilla/xulrunner/installer/Makefile.in.old	2007-08-10 14:56:59.000000000 +0200
-+++ mozilla/xulrunner/installer/Makefile.in	2007-12-06 10:48:22.000000000 +0100
-@@ -87,6 +87,14 @@ pkg_config_files = \
- 	libxul-embedding.pc \
- 	mozilla-js.pc \
- 	mozilla-plugin.pc \
-+	mozilla-xpcom.pc \
-+	mozilla-embedding.pc \
-+	mozilla-gtkmozembed.pc \
-+	xulrunner-js.pc \
-+	xulrunner-plugin.pc \
-+	xulrunner-xpcom.pc \
-+	xulrunner-embedding.pc \
-+	xulrunner-gtkmozembed.pc \
- 	$(NULL)
- 
- ifdef MOZ_NATIVE_NSPR
+ Name: Mozilla Plug-In API
+ Description: Mozilla Plug-In API


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xulrunner.spec	14 Dec 2007 10:24:02 -0000	1.33
+++ xulrunner.spec	18 Dec 2007 13:12:49 -0000	1.34
@@ -7,7 +7,6 @@
 
 %define official_branding 0
 
-
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
@@ -150,7 +149,7 @@
 cp mozilla-gtkmozembed.pc.in xulrunner-gtkmozembed.pc.in
 popd
 
-%patch107 -p1 -b .pkg
+%patch107 -p1 -b .pk
 
 
 # For branding specific patches.
@@ -201,18 +200,23 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 
 INTERNAL_GECKO="1.9pre"
+
 INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO}
 MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
 
+INTERNAL_APP_SDK_NAME=%{name}-sdk-${INTERNAL_GECKO}
+MOZ_APP_SDK_DIR=%{_libdir}/${INTERNAL_APP_SDK_NAME}
+
 DESTDIR=$RPM_BUILD_ROOT make install
 
 %{__mkdir_p} $RPM_BUILD_ROOT/${MOZ_APP_DIR} \
-             $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_NAME} \
-             $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_NAME}             
-%{__install} -p -d dist/sdk/include $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_NAME}
-%{__install} -p -d dist/sdk/idl $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_NAME}
-%{__install} -p dist/sdk/bin/* $RPM_BUILD_ROOT/$MOZ_APP_DIR
-%{__install} -p dist/sdk/lib/* $RPM_BUILD_ROOT/$MOZ_APP_DIR
+             $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} \
+             $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME}
+#%{__install} -p -d dist/sdk/include $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME}
+#%{__install} -p -d dist/sdk/idl $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
+#%{__install} -p dist/sdk/bin/* $RPM_BUILD_ROOT/$MOZ_APP_DIR
+#%{__install} -p dist/sdk/lib/* $RPM_BUILD_ROOT/$MOZ_APP_SDK_DIR
+%{__install} -p dist/sdk/bin/regxpcom $RPM_BUILD_ROOT/$MOZ_APP_DIR
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
 
@@ -248,18 +252,44 @@
 
 # Prepare our devel package
 %if %{build_devel_package}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_NAME}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_NAME}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+
 %{__cp} -rL dist/include/* \
-  $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_NAME}
-%{__cp} -rL dist/idl/* \
-  $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_NAME}
+  $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
+#%{__cp} -rL dist/idl/* \
+#  $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
+#%{__mv} $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_NAME}/* \
+#  $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
+#%{__mv} $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_NAME}/* \
+#  $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
+
 install -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \
   dist/bin/xpt_dump \
   dist/bin/xpt_link \
   $RPM_BUILD_ROOT/${MOZ_APP_DIR}
+
+%{__rm} -rf $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_NAME}
+%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_NAME}
+
+%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/include
+ln -s  %{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/include
+%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/idl
+ln -s  %{_datadir}/idl/${INTERNAL_APP_SDK_NAME}/unstable $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/idl
+
+%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/include
+ln -s  %{_includedir}/${INTERNAL_APP_SDK_NAME}/stable $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/include
+%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/idl
+ln -s  %{_datadir}/idl/${INTERNAL_APP_SDK_NAME}/stable $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/idl
+
+%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/lib/*.so
+pushd $RPM_BUILD_ROOT${MOZ_APP_DIR}
+for i in *.so; do
+    ln -s ${MOZ_APP_DIR}/$i $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/lib/$i
+done
+popd
 %endif
 
 # GRE stuff
@@ -277,8 +307,14 @@
 EOF
 
 # Library path
+%ifarch x86_64 ia64 ppc64 s390x
+%define ld_conf_file xulrunner-64.conf
+%else
+%define ld_conf_file xulrunner-32.conf
+%endif
+
 %{__mkdir_p} $RPM_BUILD_ROOT/etc/ld.so.conf.d
-%{__cat} > $RPM_BUILD_ROOT/etc/ld.so.conf.d/xulrunner.conf << EOF
+%{__cat} > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{ld_conf_file} << EOF
 ${MOZ_APP_DIR}
 EOF
 
@@ -299,16 +335,6 @@
 %{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_DIR}/crashreporter
 %{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_DIR}/crashreporter.ini
 
-#rm -rf $RPM_BUILD_ROOT${MOZ_APP_DIR}/*.a
-
-%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_DIR}/bin
-%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_DIR}/lib
-%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_DIR}/include
-%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_DIR}/idl
-
-%{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_DIR}/sdk/lib
-ln -s ${MOZ_APP_DIR} $RPM_BUILD_ROOT${MOZ_APP_DIR}/sdk/lib
-
 #---------------------------------------------------------------------
 
 %clean
@@ -333,12 +359,12 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/xulrunner
-#%exclude %{_bindir}/xulrunner-config
 %{_mandir}/man1/*
 %{_libdir}/mozilla
 %dir /etc/gre.d
 /etc/gre.d/%{gre_conf_file}
 %dir %{_libdir}/%{name}-*
+%exclude %dir %{_libdir}/%{name}-sdk-*
 %{_libdir}/%{name}-*/LICENSE
 %{_libdir}/%{name}-*/README.txt
 %{_libdir}/%{name}-*/chrome
@@ -362,7 +388,7 @@
 %{_libdir}/%{name}-*/xulrunner-stub
 %{_libdir}/%{name}-*/platform.ini
 %{_libdir}/%{name}-*/dependentlibs.list
-%{_sysconfdir}/ld.so.conf.d/xulrunner.conf
+%{_sysconfdir}/ld.so.conf.d/xulrunner*.conf
 
 # XXX See if these are needed still
 %{_libdir}/%{name}-*/updater*
@@ -378,9 +404,7 @@
 %{_libdir}/%{name}-*/xpidl
 %{_libdir}/%{name}-*/xpt_dump
 %{_libdir}/%{name}-*/xpt_link
-%{_libdir}/%{name}-*/xpcom-config.h
-%{_libdir}/%{name}-*/sdk/*
-%{_libdir}/%{name}-*/*.a
+%{_libdir}/%{name}-sdk-*/*
 %{_libdir}/pkgconfig/*.pc
 %endif
 
@@ -389,6 +413,7 @@
 %changelog
 * Wed Dec 12 2007 Martin Stransky <stransky at redhat.com> 1.9-0.beta2.1
 - updated to Beta 2.
+- moved SDK to xulrunner-sdk
 
 * Thu Dec 06 2007 Martin Stransky <stransky at redhat.com> 1.9-0.beta1.4
 - fixed mozilla-plugin.pc (#412971)

More information about the fedora-extras-commits mailing list