rpms/mozilla/devel mozilla-1.7.8-nspr-pkgconfig.patch, NONE, 1.1 mozilla.spec, 1.67, 1.68

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Jul 16 03:36:26 UTC 2005 

Author: caillon

Update of /cvs/dist/rpms/mozilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5749

Modified Files:
	mozilla.spec 
Added Files:
	mozilla-1.7.8-nspr-pkgconfig.patch 
Log Message:
* Fri Jul 15 2005 Christopher Aillon <caillon at redhat.com> 37:1.7.8-6
- Teach mozilla-nss.pc about system NSPR


mozilla-1.7.8-nspr-pkgconfig.patch:
 build/unix/Makefile.in         |    8 +++++++-
 build/unix/mozilla-js.pc.in    |    2 +-
 build/unix/mozilla-nspr.pc.in  |    2 +-
 build/unix/mozilla-nss.pc.in   |    2 +-
 build/unix/mozilla-xpcom.pc.in |    2 +-
 config/autoconf.mk.in          |    1 +
 6 files changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE mozilla-1.7.8-nspr-pkgconfig.patch ---
Index: build/unix/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/build/unix/Makefile.in,v
retrieving revision 1.25
diff -u -p -6 -r1.25 Makefile.in
--- build/unix/Makefile.in	1 Jun 2005 13:34:37 -0000	1.25
+++ build/unix/Makefile.in	28 Jun 2005 06:08:48 -0000
@@ -50,15 +50,19 @@ PACKAGE_FILE = unix.pkg
 include $(topsrcdir)/config/rules.mk
 
 # Hack to make sure that mozilla-config has the proper nspr dependencies
 ifdef MOZ_NATIVE_NSPR
 FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags)
 FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs)
+NSPR_NAME=nspr
+NSPR_VERSION=$(shell $(NSPR_CONFIG) --version)
 else
 FULL_NSPR_CFLAGS=-I$(includedir)/nspr
 FULL_NSPR_LIBS=$(subst -L$(libdir),-L$(mozappdir),$(shell $(DEPTH)/nsprpub/config/nspr-config --libs))
+NSPR_NAME=$(MOZ_APP_NAME)-nspr
+NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
 endif
 
 ifdef MOZ_ENABLE_GTK
 SUPERWIN_LIBS=-lgtksuperwin
 endif
 
@@ -91,13 +95,15 @@ $(MOZ_APP_NAME)-%.pc : mozilla-%.pc.in M
 	-e "s|%idldir%|$(idldir)|" \
 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
 	-e "s|%SUPERWIN_LIBS%|$(SUPERWIN_LIBS)|" \
 	-e "s|%DEFS%|$(_DEFS)|" \
 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
-	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" > $@
+	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
+	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
+	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
 
 libs:: $(MOZ_APP_NAME)-config
 	chmod 755 $<
 	$(INSTALL) -m 755 $< $(DIST)/bin
 
 libs:: $(srcdir)/run-mozilla.sh $(pkg_config_files)
Index: build/unix/mozilla-js.pc.in
===================================================================
RCS file: /cvsroot/mozilla/build/unix/mozilla-js.pc.in,v
retrieving revision 1.5
diff -u -r1.5 mozilla-js.pc.in
--- build/unix/mozilla-js.pc.in	22 Apr 2005 17:11:13 -0000	1.5
+++ build/unix/mozilla-js.pc.in	19 May 2005 11:15:51 -0000
@@ -6,6 +6,6 @@
 Name: JavaScript
 Description: The Mozilla JavaScript Library
 Version: %MOZILLA_VERSION%
-Requires: mozilla-nspr = %MOZILLA_VERSION%
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
 Libs: -L${libdir} -lmozjs
 Cflags: -I${includedir}/js -DXP_UNIX
Index: build/unix/mozilla-nss.pc.in
===================================================================
RCS file: /cvsroot/mozilla/build/unix/mozilla-nss.pc.in,v
retrieving revision 1.2
diff -u -r1.2 mozilla-nss.pc.in
--- build/unix/mozilla-nss.pc.in	22 Apr 2005 17:11:13 -0000	1.2
+++ build/unix/mozilla-nss.pc.in	19 May 2005 11:15:56 -0000
@@ -6,6 +6,6 @@
 Name: NSS
 Description: Mozilla Network Security Services
 Version: %MOZILLA_VERSION%
-Requires: mozilla-nspr = %MOZILLA_VERSION%
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
 Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
 Cflags: -I${includedir}/nss
Index: build/unix/mozilla-xpcom.pc.in
===================================================================
RCS file: /cvsroot/mozilla/build/unix/mozilla-xpcom.pc.in,v
retrieving revision 1.4
diff -u -r1.4 mozilla-xpcom.pc.in
--- build/unix/mozilla-xpcom.pc.in	22 Apr 2005 17:11:13 -0000	1.4
+++ build/unix/mozilla-xpcom.pc.in	19 May 2005 11:16:06 -0000
@@ -7,6 +7,6 @@
 Name: XPCOM
 Description: The Mozilla Cross Platform Component Library
 Version: %MOZILLA_VERSION%
-Requires: mozilla-nspr = %MOZILLA_VERSION%
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
 Libs: -L${libdir} -lxpcom
 Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
Index: build/unix/mozilla-nspr.pc.in
===================================================================
RCS file: /cvsroot/mozilla/build/unix/mozilla-nspr.pc.in,v
retrieving revision 1.2
diff -u -p -r1.2 mozilla-nspr.pc.in
--- build/unix/mozilla-nspr.pc.in	1 Jun 2005 13:34:36 -0000	1.2
+++ build/unix/mozilla-nspr.pc.in	28 Jun 2005 10:13:05 -0000
@@ -5,7 +5,7 @@ includedir=%includedir%
 
 Name: NSPR
 Description: The Netscape Portable Runtime
-Version: %MOZILLA_VERSION%
+Version: %NSPR_VERSION%
 Libs: %FULL_NSPR_LIBS%
 Cflags: %FULL_NSPR_CFLAGS%
 
Index: config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.357
diff -u -r3.357 autoconf.mk.in
--- config/autoconf.mk.in	5 Jul 2005 20:37:25 -0000	3.357
+++ config/autoconf.mk.in	6 Jul 2005 07:23:09 -0000
@@ -376,6 +376,7 @@
 PNG_REQUIRES	= png
 endif
 
+NSPR_CONFIG	= @NSPR_CONFIG@
 NSPR_CFLAGS	= @NSPR_CFLAGS@
 NSPR_LIBS	= @NSPR_LIBS@
 


Index: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mozilla.spec	15 Jul 2005 14:58:45 -0000	1.67
+++ mozilla.spec	16 Jul 2005 03:36:22 -0000	1.68
@@ -10,7 +10,7 @@
 Name:        mozilla
 Summary:     Web browser and mail reader
 Version:     1.7.8
-Release:     5
+Release:     6
 Epoch:       37
 License:     MPL/NPL/GPL/LGPL
 Source0:     mozilla-%{version}-source.tar.bz2
@@ -33,10 +33,10 @@
 Patch2:      mozilla-1.4-prdtoa.patch
 Patch3:      firefox-1.0-gcc4-compile.patch
 Patch4:      firefox-1.0-recv-fortify.patch
-Patch5:      firefox-1.0-nspr-config.patch
-Patch6:      firefox-1.0-gfxshared_s.patch
-Patch7:      firefox-1.0-nss-system-nspr.patch
-Patch8:      firefox-1.0-system-nspr-ldap.patch
+Patch5:      firefox-1.0-gfxshared_s.patch
+Patch6:      firefox-1.0-nss-system-nspr.patch
+Patch7:      firefox-1.0-system-nspr-ldap.patch
+Patch8:      mozilla-1.7.8-nspr-pkgconfig.patch
 
 # customization patches
 Patch20:     mozilla-redhat-home-page.patch
@@ -175,8 +175,8 @@
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
-%patch6 -p0
-%patch7 -p1
+%patch6 -p1
+%patch7 -p0
 %patch8 -p0
 
 # customization patches
@@ -439,7 +439,7 @@
   %{builddir}/mozilla-nss-devel.list
 
 # copy our idl into place
-#mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/idl/mozilla-%{version}
+#%{__mkdir_p} $RPM_BUILD_ROOT/%{prefix}/share/idl/mozilla-%{version}
 #(cd dist/idl ; tar chf - * | \
 #  (cd $RPM_BUILD_ROOT/%{prefix}/share/idl/mozilla-%{version} ; \
 #   tar xvf -))
@@ -452,11 +452,11 @@
   $RPM_BUILD_ROOT/%{mozdir}
 
 # set up our desktop files
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/pixmaps/
+%{__mkdir_p} $RPM_BUILD_ROOT/%{prefix}/share/pixmaps/
 
 # install desktop files in correct directory
 %if %{desktop_file}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
 desktop-file-install --vendor mozilla \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
@@ -470,7 +470,7 @@
     --add-category Network \
     %{SOURCE12}
 %else
-mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet
+%{__mkdir_p} $RPM_BUILD_ROOT/etc/X11/applnk/Internet
 install -c -m 644  %{SOURCE4} %{SOURCE12} \
    $RPM_BUILD_ROOT/etc/X11/applnk/Internet
 %endif
@@ -505,8 +505,8 @@
 %{__rm} $RPM_BUILD_ROOT/rh-default-prefs
 
 # install our rebuild file
-cat %{SOURCE11} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
-		      -e 's,LIBDIR,%{_libdir},g' > \
+%{__cat} %{SOURCE11} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
+			   -e 's,LIBDIR,%{_libdir},g' > \
   $RPM_BUILD_ROOT/%{mozdir}/mozilla-rebuild-databases.pl
 
 chmod 755 \
@@ -514,7 +514,7 @@
 
 # we own /usr/lib/mozilla/plugins which is the version-independent
 # place that plugins can be installed
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/mozilla/plugins
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/mozilla/plugins
 
 # ghost files
 touch $RPM_BUILD_ROOT%{mozdir}/chrome/chrome.rdf
@@ -536,7 +536,7 @@
 %define gre_conf_file gre.conf
 %endif
 
-mkdir -p $RPM_BUILD_ROOT/etc/gre.d/
+%{__mkdir_p} $RPM_BUILD_ROOT/etc/gre.d/
 echo [%{version}] > \
   $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file}
 echo GRE_PATH=%{_libdir}/mozilla-%{version} >> \
@@ -793,6 +793,9 @@
 %{mozdir}/xpt_link
 
 %changelog
+* Fri Jul 15 2005 Christopher Aillon <caillon at redhat.com> 37:1.7.8-6
+- Teach mozilla-nss.pc about system NSPR
+
 * Fri Jul 15 2005 Christopher Aillon <caillon at redhat.com> 37:1.7.8-5
 - Fix a crash on 64bit platforms (#160330)

More information about the fedora-cvs-commits mailing list