rpms/xulrunner/devel mozilla-sqlite-build.patch, NONE, 1.1 mozilla-xpcom.patch, 1.2, 1.3 xulrunner-mozconfig, 1.5, 1.6 xulrunner.spec, 1.22, 1.23
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Wed Nov 14 10:24:29 UTC 2007
Author: stransky
Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26611
Modified Files:
mozilla-xpcom.patch xulrunner-mozconfig xulrunner.spec
Added Files:
mozilla-sqlite-build.patch
Log Message:
* Wed Nov 14 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha9.3
- more build fixes, use system nss libraries
mozilla-sqlite-build.patch:
--- NEW FILE mozilla-sqlite-build.patch ---
diff -up mozilla/storage/build/Makefile.in.old mozilla/storage/build/Makefile.in
--- mozilla/storage/build/Makefile.in.old 2007-08-10 18:19:57.000000000 +0200
+++ mozilla/storage/build/Makefile.in 2007-11-14 09:17:00.000000000 +0100
@@ -21,7 +21,6 @@
#
# Contributor(s):
# Vladimir Vukicevic <vladimir.vukicevic at oracle.com>
-# Shawn Wilsher <me at shawnwilsher.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -71,10 +70,9 @@ LOCAL_INCLUDES = \
SHARED_LIBRARY_LIBS = \
../src/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \
+ $(DEPTH)/db/sqlite3/src/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) \
$(NULL)
-EXTRA_DSO_LIBS += sqlite3
-
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
diff -up mozilla/toolkit/library/libxul-config.mk.old mozilla/toolkit/library/libxul-config.mk
--- mozilla/toolkit/library/libxul-config.mk.old 2007-09-17 01:48:08.000000000 +0200
+++ mozilla/toolkit/library/libxul-config.mk 2007-11-14 09:14:16.000000000 +0100
@@ -21,7 +21,6 @@
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
-# Shawn Wilsher <me at shawnwilsher.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -223,7 +222,6 @@ endif
ifdef MOZ_STORAGE
COMPONENT_LIBS += storagecomps
-EXTRA_DSO_LIBS += sqlite3
endif
ifdef MOZ_PLACES
diff -up mozilla/xpcom/stub/Makefile.in.old mozilla/xpcom/stub/Makefile.in
--- mozilla/xpcom/stub/Makefile.in.old 2007-10-13 23:13:52.000000000 +0200
+++ mozilla/xpcom/stub/Makefile.in 2007-11-14 09:15:28.000000000 +0100
@@ -91,7 +91,6 @@ DEPENDENT_LIBS_LIST += \
ifdef MOZ_ENABLE_LIBXUL
DEPENDENT_LIBS_LIST += \
- $(LIB_PREFIX)sqlite3$(DLL_SUFFIX) \
$(LIB_PREFIX)softokn3$(DLL_SUFFIX) \
$(LIB_PREFIX)nss3$(DLL_SUFFIX) \
$(LIB_PREFIX)ssl3$(DLL_SUFFIX) \
diff -up mozilla/config/static-config.mk.old mozilla/config/static-config.mk
--- mozilla/config/static-config.mk.old 2007-07-24 00:02:20.000000000 +0200
+++ mozilla/config/static-config.mk 2007-11-14 09:14:16.000000000 +0100
@@ -98,10 +98,6 @@ ifdef MOZ_ENABLE_PANGO
STATIC_EXTRA_LIBS += $(MOZ_PANGO_LIBS)
endif
-ifdef MOZ_STORAGE
-EXTRA_DSO_LIBS += sqlite3
-endif
-
ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
STATIC_EXTRA_LIBS += $(MOZ_STARTUP_NOTIFICATION_LIBS)
endif
diff -up mozilla/config/system-headers.old mozilla/config/system-headers
--- mozilla/config/system-headers.old 2007-10-12 14:34:46.000000000 +0200
+++ mozilla/config/system-headers 2007-11-14 09:14:16.000000000 +0100
@@ -617,8 +617,6 @@ SIOUX.h
size_t.h
someincludefile.h
Sound.h
-sqlite3.h
-sqlite3file.h
ssdef.h
sslerr.h
ssl.h
diff -up mozilla/db/sqlite3/src/sqlite3file.h.old mozilla/db/sqlite3/src/sqlite3file.h
--- mozilla/db/sqlite3/src/sqlite3file.h.old 2007-07-25 04:18:54.000000000 +0200
+++ mozilla/db/sqlite3/src/sqlite3file.h 2007-11-14 09:14:16.000000000 +0100
@@ -199,11 +199,7 @@ struct sqlite3OsVtbl {
/*
** Files other than os.c just reference the global virtual function table.
*/
-#ifdef XP_WIN
- extern __declspec(dllimport) struct sqlite3OsVtbl sqlite3Os;
-#else
extern struct sqlite3OsVtbl sqlite3Os;
-#endif // windows symbol ifdef
#endif /* _SQLITE_OS_C_ */
} // extern "C"
diff -up mozilla/db/sqlite3/src/Makefile.in.old mozilla/db/sqlite3/src/Makefile.in
--- mozilla/db/sqlite3/src/Makefile.in.old 2007-09-16 03:47:04.000000000 +0200
+++ mozilla/db/sqlite3/src/Makefile.in 2007-11-14 09:20:17.000000000 +0100
@@ -45,15 +45,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = sqlite3
-LIBRARY_NAME = sqlite3
-FORCE_SHARED_LIB = 1
-VISIBILITY_FLAGS =
-
-ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
-ifndef GNU_CC
-DEFFILE = $(win_srcdir)/sqlite.def
-endif
-endif
+LIBRARY_NAME = sqlite3_s
+MODULE_NAME = sqlite3
+FORCE_STATIC_LIB = 1
ifdef GNU_CC
MODULE_OPTIMIZE_FLAGS = -O3
@@ -83,7 +77,15 @@ DEFINES += -DOS2_HIGH_MEMORY
endif
endif
+ifdef ENABLE_TESTS
+##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX)
+##SIMPLE_PROGRAMS = sqlite-shell
+endif
+
include $(topsrcdir)/config/rules.mk
+
+sqlite-shell.$(OBJ_SUFFIX): shell.c
+ $(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $(_VPATH_SRCS)
# next line allows use of MOZ_OBJDIR in .mozconfig with older gcc on BeOS, maybe others
LOCAL_INCLUDES += -I$(srcdir)
mozilla-xpcom.patch:
Index: mozilla-xpcom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-xpcom.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozilla-xpcom.patch 6 Nov 2007 10:12:06 -0000 1.2
+++ mozilla-xpcom.patch 14 Nov 2007 10:24:26 -0000 1.3
@@ -1,68 +1,137 @@
---- mozilla/xulrunner/installer/mozilla-xpcom.pc.in.xul 2007-11-01 11:49:13.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in 2007-11-01 11:49:13.000000000 +0100
-@@ -2,13 +2,14 @@ prefix=%prefix%
- sdkdir=%sdkdir%
+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-11-08 10:41:16.000000000 +0100
+@@ -65,7 +65,7 @@ mandir = @mandir@
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(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)
+
+ 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-11-08 10:41:16.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-xpcom.pc.in 2007-11-08 11:22:04.000000000 +0100
+@@ -3,14 +3,15 @@ sdkdir=%sdkdir%
includedir=%includedir%
idldir=%idldir%
-+libdir=%sdkdir%/lib
includetype=stable
++libdir=%sdkdir%
# 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
++Name: xulrunner-xpcom
Description: The Mozilla Runtime and Embedding Engine
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
---- mozilla/xulrunner/installer/xulrunner-plugin.pc.in.xul 2007-11-01 11:49:13.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-plugin.pc.in 2007-11-01 11:51:50.000000000 +0100
-@@ -1,6 +1,7 @@
- prefix=%prefix%
+-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-11-08 11:23:56.000000000 +0100
+@@ -2,6 +2,7 @@ prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
-+libdir=%sdkdir%/lib
+ idldir=%idldir%
++libdir=%sdkdir%
+ includetype=stable
- Name: Mozilla Plug-In API
- Description: Mozilla Plug-In API
---- mozilla/xulrunner/installer/libxul.pc.in.xul 2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul.pc.in 2007-11-01 11:49:13.000000000 +0100
-@@ -2,6 +2,7 @@ prefix=%prefix%
+ # 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-11-08 10:41:16.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in 2007-11-08 11:22:29.000000000 +0100
+@@ -2,15 +2,16 @@ prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
idldir=%idldir%
-+libdir=%sdkdir%/lib
++libdir=%sdkdir%
includetype=stable
# Note: the default pkg-config includes will only list include directories
---- mozilla/xulrunner/installer/xulrunner-js.pc.in.xul 2007-11-01 11:49:13.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-js.pc.in 2007-11-01 11:51:32.000000000 +0100
+ # 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 -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-11-08 10:41:16.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-embedding.pc.in 2007-11-08 11:22:22.000000000 +0100
+@@ -2,14 +2,15 @@ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+ idldir=%idldir%
++libdir=%sdkdir%
+ includetype=stable
+
+ # Note: the default pkg-config cflags 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-embedding
++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-11-08 10:41:16.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-plugin.pc.in 2007-11-08 10:41:16.000000000 +0100
@@ -1,6 +1,7 @@
prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
-+libdir=%sdkdir%/lib
++libdir=%sdkdir%
- Name: JavaScript
- Description: The Mozilla JavaScript Library
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.xul 2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2007-11-01 11:50:48.000000000 +0100
+ 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-11-08 11:24:04.000000000 +0100
@@ -2,6 +2,7 @@ prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
idldir=%idldir%
-+libdir=%sdkdir%/lib
++libdir=%sdkdir%
includetype=stable
# Note: the default pkg-config cflags will only list include directories
---- mozilla/xulrunner/installer/xulrunner-embedding.pc.in.xul 2007-11-01 11:49:13.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-embedding.pc.in 2007-11-01 11:51:13.000000000 +0100
-@@ -2,13 +2,14 @@ prefix=%prefix%
+@@ -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-embedding.pc.in.old mozilla/xulrunner/installer/mozilla-embedding.pc.in
+--- mozilla/xulrunner/installer/mozilla-embedding.pc.in.old 2007-11-08 10:41:16.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-embedding.pc.in 2007-11-08 11:23:44.000000000 +0100
+@@ -2,14 +2,15 @@ prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
idldir=%idldir%
-+libdir=%sdkdir%/lib
++libdir=%sdkdir%
includetype=stable
# Note: the default pkg-config cflags will only list include directories
@@ -70,29 +139,31 @@
# nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
-Name: libxul-embedding
-+Name: xulrunner-embedding
++Name: mozilla-embedding
Description: Static library for version-independent embedding of the Mozilla runtime
Version: %MOZILLA_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue
---- mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.xul 2007-11-01 11:49:13.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-xpcom.pc.in 2007-11-01 11:52:20.000000000 +0100
-@@ -3,12 +3,13 @@ sdkdir=%sdkdir%
+-Libs: -L${sdkdir}/lib -lxpcomglue
++Libs: -L${sdkdir} -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+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-11-08 10:41:16.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-js.pc.in 2007-11-08 11:22:15.000000000 +0100
+@@ -1,10 +1,11 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
includedir=%includedir%
- idldir=%idldir%
- includetype=stable
-+libdir=%sdkdir%/lib
-
- # 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
++libdir=%sdkdir%
--Name: libxul
-+Name: xulrunner-xpcom
- Description: The Mozilla Runtime and Embedding Engine
+ Name: JavaScript
+ Description: The Mozilla JavaScript Library
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
---- mozilla/xulrunner/installer/Makefile.in.xul 2007-08-10 14:56:59.000000000 +0200
-+++ mozilla/xulrunner/installer/Makefile.in 2007-11-01 11:55:06.000000000 +0100
+-Libs: -L${sdkdir}/lib -lmozjs
++Libs: -L${sdkdir} -lmozjs
+ Cflags: -I${includedir}/stable -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-11-08 10:41:16.000000000 +0100
@@ -87,6 +87,12 @@ pkg_config_files = \
libxul-embedding.pc \
mozilla-js.pc \
Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xulrunner-mozconfig 6 Nov 2007 10:12:06 -0000 1.5
+++ xulrunner-mozconfig 14 Nov 2007 10:24:26 -0000 1.6
@@ -2,10 +2,8 @@
ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
-ac_add_options --without-system-nspr
-ac_add_options --without-system-nss
-#ac_add_options --with-system-nspr
-#ac_add_options --with-system-nss
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
#ac_add_options --with-system-png
Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xulrunner.spec 6 Nov 2007 10:12:06 -0000 1.22
+++ xulrunner.spec 14 Nov 2007 10:24:26 -0000 1.23
@@ -47,6 +47,7 @@
# Other
Patch104: mozilla-firefox-head.ppc64.patch
Patch105: mozilla-xpcom.patch
+Patch106: mozilla-sqlite-build.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -141,7 +142,8 @@
cp mozilla-embedding.pc.in xulrunner-embedding.pc.in
popd
-%patch105 -p1
+%patch105 -p1 -b .pkg
+%patch106 -p1 -b .sqlite
# For branding specific patches.
@@ -284,6 +286,16 @@
rm -rf $RPM_BUILD_ROOT/usr/lib/xulrunner-1.9a9pre/crashreporter
rm -rf $RPM_BUILD_ROOT/usr/lib/xulrunner-1.9a9pre/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
@@ -335,8 +347,6 @@
%{_libdir}/%{name}-*/xulrunner-bin
%{_libdir}/%{name}-*/xulrunner-stub
%{_libdir}/%{name}-*/platform.ini
-%{_libdir}/%{name}-*/libfreebl3.chk
-%{_libdir}/%{name}-*/libsoftokn3.chk
%{_libdir}/%{name}-*/dependentlibs.list
# XXX See if these are needed still
@@ -347,21 +357,23 @@
%defattr(-,root,root)
%{_datadir}/idl/%{name}-*
%{_includedir}/%{name}-*
-%dir %{_libdir}/%{name}-devel-*
-%{_libdir}/%{name}-devel-*/*
+%dir %{_libdir}/%{name}-*
%{_libdir}/%{name}-*/xpcshell
%{_libdir}/%{name}-*/xpicleanup
%{_libdir}/%{name}-*/xpidl
%{_libdir}/%{name}-*/xpt_dump
%{_libdir}/%{name}-*/xpt_link
-%{_libdir}/%{name}-*/*.a
%{_libdir}/%{name}-*/xpcom-config.h
+%{_libdir}/%{name}-*/sdk/*
%{_libdir}/pkgconfig/*.pc
%endif
#---------------------------------------------------------------------
%changelog
+* Wed Nov 14 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha9.3
+- more build fixes, use system nss libraries
+
* Tue Nov 6 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha9.2
- build fixes
More information about the fedora-extras-commits
mailing list