rpms/nspr/devel nspr-4.6.1-gcc-visibility.patch, NONE, 1.1 nspr.spec, 1.9, 1.10

[fedora-cvs-commits at redhat.com]

Author: kengert

Update of /cvs/dist/rpms/nspr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29262

Modified Files:
	nspr.spec 
Added Files:
	nspr-4.6.1-gcc-visibility.patch 
Log Message:
Stop shipping static libraries.
Add an upstream patch to fix gcc visibility issues.


nspr-4.6.1-gcc-visibility.patch:
 prtypes.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE nspr-4.6.1-gcc-visibility.patch ---
Index: mozilla/nsprpub/pr/include/prtypes.h
diff -u mozilla/nsprpub/pr/include/prtypes.h:3.30 mozilla/nsprpub/pr/include/prtypes.h:3.30.2.1
--- mozilla/nsprpub/pr/include/prtypes.h:3.30   Fri Apr 29 21:02:54 2005
+++ mozilla/nsprpub/pr/include/prtypes.h        Tue Jan  3 17:43:35 2006
@@ -178,7 +178,9 @@

 #else /* Unix */

-#ifdef HAVE_VISIBILITY_PRAGMA
+/* GCC 3.3 and later support the visibility attribute. */
+#if (__GNUC__ >= 4) || \
+    (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
 #define PR_VISIBILITY_DEFAULT __attribute__((visibility("default")))
 #else
 #define PR_VISIBILITY_DEFAULT


Index: nspr.spec
===================================================================
RCS file: /cvs/dist/rpms/nspr/devel/nspr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nspr.spec	16 Dec 2005 06:40:40 -0000	1.9
+++ nspr.spec	4 Jan 2006 21:42:39 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	Netscape Portable Runtime
 Name:		nspr
 Version:	4.6.1
-Release:	1
+Release:	2
 License:	MPL/GPL/LGPL
 URL:		http://www.mozilla.org/projects/nspr/
 Group:		System Environment/Libraries
@@ -9,6 +9,8 @@
 Source0:	%{name}-%{version}.tar.gz
 Source1:	nspr.pc.in
 
+Patch1:         nspr-4.6.1-gcc-visibility.patch
+
 Provides:	mozilla-nspr
 Obsoletes:	mozilla-nspr
 
@@ -33,6 +35,7 @@
 %setup -q
 
 # patches
+%patch1 -p0
 
 %build
 
@@ -76,6 +79,9 @@
 %{__rm} -rf \
    $RPM_BUILD_ROOT/%{_bindir}/compile-et.pl \
    $RPM_BUILD_ROOT/%{_bindir}/prerr.properties \
+   $RPM_BUILD_ROOT/%{_libdir}/libnspr4.a \
+   $RPM_BUILD_ROOT/%{_libdir}/libplc4.a \
+   $RPM_BUILD_ROOT/%{_libdir}/libplds4.a \
    $RPM_BUILD_ROOT/%{_datadir}/aclocal/nspr.m4 \
    $RPM_BUILD_ROOT/%{_includedir}/nspr4/md
 
@@ -100,14 +106,14 @@
 %{_libdir}/pkgconfig/nspr.pc
 %{_bindir}/nspr-config
 
-# Static libs are temporarily shipped since nss currently needs
-# them to build (and all things depending on nss, e.g. firefox)
-# They will not be included in a future revision.
-%{_libdir}/libnspr4.a
-%{_libdir}/libplc4.a
-%{_libdir}/libplds4.a
-
 %changelog
+* Wed Jan  4 2006 Kai Engert <kengert at redhat.com>
+- Add an upstream patch to fix gcc visibility issues.
+
+* Tue Jan  3 2006 Christopher Aillon <caillon at redhat.com>
+- Stop shipping static libraries; NSS and dependencies no longer
+  require static libraries to build.
+
 * Thu Dec 15 2005 Christopher Aillon <caillon at redhat.com> 4.6.1-1
 - Update to 4.6.1