SPECS: xulrunner.spec - merged 3.0 from DEVEL, updated tarball to official ...

Wed Jun 18 14:07:31 CEST 2008

Author: hawk                         Date: Wed Jun 18 12:07:31 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged 3.0 from DEVEL, updated tarball to official FIREFOX_3_0_RELEASE

---- Files affected:
SPECS:
   xulrunner.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.48 SPECS/xulrunner.spec:1.49

--- SPECS/xulrunner.spec:1.48	Thu Apr 24 16:29:31 2008
+++ SPECS/xulrunner.spec	Wed Jun 18 14:07:25 2008
@@ -1,32 +1,29 @@
 # $Revision$, $Date$
 #
-# TODO:
-#  - updated mozilla-firefox-ac.patch (why it is enabled here and disabled in 
-#    mozilla-firefox.spec? basically its same source)
-#
 # Conditional build:
-%bcond_with	tests	# enable tests (whatever they check)
-%bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
-#
-%define		snap	20080417
-%define		rel		2
-#
+%bcond_with	tests		# enable tests (whatever they check)
+%bcond_without	gnome		# disable all GNOME components (gnomevfs, gnome, gnomeui)
+%bcond_without	kerberos	# disable krb5 support
+
+%define		rel	0.1
+%define		subver	20080618
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
-Version:	1.8.1.14
-Release:	1.%{snap}.%{rel}
+Version:	1.9
+Release:	%{subver}.%{rel}
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
-Source0:	%{name}-%{version}-%{snap}-source.tar.bz2
-# Source0-md5:	da464005676c6946360e99a3211609b1
+Source0:	%{name}-%{version}-%{subver}-source.tar.bz2
+# Source0-md5:	01c53eb651f8d372c496dd67eb39957a
 Patch0:		%{name}-ldap-with-nss.patch
 Patch1:		%{name}-install.patch
 Patch2:		%{name}-pc.patch
 Patch3:		%{name}-rpath.patch
-Patch4:		mozilla-firefox-ac.patch
+Patch4:		%{name}-mozldap.patch
+Patch5:		%{name}-configures.patch
+Patch6:		%{name}-gcc3.patch
 URL:		http://developer.mozilla.org/en/docs/XULRunner
-BuildRequires:	/bin/csh
 %{?with_gnome:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
@@ -34,18 +31,25 @@
 BuildRequires:	freetype-devel >= 1:2.1.8
 %{?with_gnome:BuildRequires:	gnome-vfs2-devel >= 2.0}
 BuildRequires:	gtk+2-devel >= 1:2.0.0
-BuildRequires:	krb5-devel
+%if "%{pld_release}" == "ac"
+%{?with_kerberos:BuildRequires:	heimdal-devel >= 0.7.1}
+%else
+%{?with_kerberos:BuildRequires:	krb5-devel}
+%endif
 BuildRequires:	libIDL-devel >= 0.8.0
 %{?with_gnome:BuildRequires:	libgnome-devel >= 2.0}
 %{?with_gnome:BuildRequires:	libgnomeui-devel >= 2.2.0}
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.2.7
 BuildRequires:	libstdc++-devel
+BuildRequires:	mozldap-devel >= 6.0
 BuildRequires:	nspr-devel >= 1:4.6.4
 BuildRequires:	nss-devel >= 1:3.11.3-3
 BuildRequires:	pango-devel >= 1:1.6.0
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel >= 2.1
@@ -115,25 +119,21 @@
 %prep
 %setup -qc
 cd mozilla
+rm -r nsprpub
 
-rm -rf mozilla/modules/libbz2
-
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-#%patch4 -p1
+#%patch2 -p1
+#%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%if "%{cc_version}" < "3.4"
+%patch6 -p2
+%endif
 
 %build
 cd mozilla
-
 cp -f %{_datadir}/automake/config.* build/autoconf
-cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
-
-if [ ! -f configure -o configure.in -nt configure ]; then
-	%{__aclocal} -I build/autoconf
-	autoconf2_13
-fi
 
 cat << 'EOF' > .mozconfig
 . $topsrcdir/xulrunner/config/mozconfig
@@ -182,11 +182,11 @@
 ac_add_options --disable-javaxpcom
 ac_add_options --disable-updater
 ac_add_options --enable-xinerama
-ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-lcms
 ac_add_options --enable-xft
 ac_add_options --with-distribution-id=org.pld-linux
-ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -197,7 +197,7 @@
 ac_add_options --disable-pedantic
 ac_add_options --disable-xterm-updates
 ac_add_options --enable-extensions="default,cookie,permissions,spellcheck"
-ac_add_options --enable-ldap
+#ac_add_options --enable-ldap
 ac_add_options --enable-xprint
 ac_add_options --with-pthreads
 ac_add_options --with-x
@@ -212,7 +212,7 @@
 rm -rf $RPM_BUILD_ROOT
 cd mozilla
 
-%{__make} -C xpinstall/packager make-package \
+%{__make} -C xulrunner/installer stage-package \
 	DESTDIR=$RPM_BUILD_ROOT \
 	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
@@ -226,11 +226,17 @@
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules $RPM_BUILD_ROOT%{_datadir}/%{name}/modules
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
 ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
 ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
+ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
+ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
 ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 
 # files created by regxpcom
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
@@ -239,7 +245,7 @@
 # header/development files
 cp -rfLp dist/include	$RPM_BUILD_ROOT%{_includedir}/%{name}
 cp -rfLp dist/idl/*	$RPM_BUILD_ROOT%{_datadir}/idl/xulrunner
-cp -rfLp dist/public/ldap{,-private} $RPM_BUILD_ROOT%{_includedir}/%{name}
+#cp -rfLp dist/public/ldap{,-private} $RPM_BUILD_ROOT%{_includedir}/%{name}
 install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl $RPM_BUILD_ROOT%{_bindir}/xpidl
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_dump $RPM_BUILD_ROOT%{_bindir}/xpt_dump
@@ -250,9 +256,6 @@
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
-# we use system pkgs
-rm $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-{nspr,nss}.pc
-
 # rpath is used, can move to bindir
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
 mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/xulrunner-bin,%{_bindir}/xulrunner}
@@ -274,22 +277,6 @@
 rm -rf $HOME
 EOF
 
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries/en-US.aff
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries/en-US.dic
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dirver
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/icons/document.png
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/icons/mozicon16.xpm
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/icons/mozicon50.xpm
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/mozilla-xremote-client
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/libnullplugin.so
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/libunixprintplugin.so
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/run-mozilla.sh
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpicleanup
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome/icons/default/default.xpm
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -313,39 +300,54 @@
 %attr(755,root,root) %{_bindir}/xulrunner
 %attr(744,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
 
-%dir %{_libdir}/%{name}/chrome
-%dir %{_libdir}/%{name}/components
-%dir %{_libdir}/%{name}/defaults
-%dir %{_libdir}/%{name}/greprefs
-%dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/res
-%dir %{_datadir}/%{name}
-
-%attr(755,root,root) %{_libdir}/%{name}/regxpcom
+# symlinks
+%{_libdir}/%{name}/chrome
+%{_libdir}/%{name}/defaults
+%{_libdir}/%{name}/dictionaries
+%{_libdir}/%{name}/greprefs
+%{_libdir}/%{name}/icons
+%{_libdir}/%{name}/modules
+%{_libdir}/%{name}/res
 
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
 
-%attr(755,root,root) %{_libdir}/%{name}/components/libauth.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libautoconfig.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libcookie.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libfileview.so
-%{?with_gnome:%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so}
-%{?with_gnome:%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so}
-%{?with_gnome:%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so}
-%attr(755,root,root) %{_libdir}/%{name}/components/libmozldap.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libmyspell.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libpermissions.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libpipboot.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libpipnss.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libpippki.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libspellchecker.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libsystem-pref.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libtransformiix.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libuniversalchardet.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libwebsrvcs.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libxmlextras.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libxulutil.so
+%dir %{_libdir}/%{name}/plugins
+%dir %{_libdir}/%{name}/components
+
+%{_libdir}/%{name}/LICENSE
+%{_libdir}/%{name}/README.txt
+%{_libdir}/%{name}/dependentlibs.list
+%{_libdir}/%{name}/platform.ini
+
+%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
+
+# TODO system nss!
+%{_libdir}/%{name}/libfreebl3.chk
+%{_libdir}/%{name}/libsoftokn3.chk
+%attr(755,root,root) %{_libdir}/%{name}/libfreebl3.so
+%attr(755,root,root) %{_libdir}/%{name}/libnss3.so
+%attr(755,root,root) %{_libdir}/%{name}/libnssckbi.so
+%attr(755,root,root) %{_libdir}/%{name}/libnssdbm3.so
+%attr(755,root,root) %{_libdir}/%{name}/libnssutil3.so
+%attr(755,root,root) %{_libdir}/%{name}/libsmime3.so
+%attr(755,root,root) %{_libdir}/%{name}/libsoftokn3.so
+%attr(755,root,root) %{_libdir}/%{name}/libsqlite3.so
+%attr(755,root,root) %{_libdir}/%{name}/libssl3.so
+
+%attr(755,root,root) %{_libdir}/%{name}/libjemalloc.so
+
+%attr(755,root,root) %{_libdir}/%{name}/*.sh
+%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
+
+%if %{with gnome}
+%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so
+%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so
+%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
+%{_libdir}/%{name}/components/imgicon.xpt
+%endif
+
+%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
 
 %{_libdir}/%{name}/components/accessibility*.xpt
 %{_libdir}/%{name}/components/alerts.xpt
@@ -360,6 +362,7 @@
 %{_libdir}/%{name}/components/commandlines.xpt
 %{_libdir}/%{name}/components/composer.xpt
 %{_libdir}/%{name}/components/content_*.xpt
+%{_libdir}/%{name}/components/contentprefs.xpt
 %{_libdir}/%{name}/components/cookie.xpt
 %{_libdir}/%{name}/components/directory.xpt
 %{_libdir}/%{name}/components/docshell.xpt
@@ -369,14 +372,13 @@
 %{_libdir}/%{name}/components/embed_base.xpt
 %{_libdir}/%{name}/components/extensions.xpt
 %{_libdir}/%{name}/components/exthandler.xpt
+%{_libdir}/%{name}/components/exthelper.xpt
 %{_libdir}/%{name}/components/fastfind.xpt
 %{_libdir}/%{name}/components/feeds.xpt
 %{_libdir}/%{name}/components/filepicker.xpt
 %{_libdir}/%{name}/components/find.xpt
 %{_libdir}/%{name}/components/gfx*.xpt
-%{_libdir}/%{name}/components/history.xpt
 %{_libdir}/%{name}/components/htmlparser.xpt
-%{?with_gnome:%{_libdir}/%{name}/components/imgicon.xpt}
 %{_libdir}/%{name}/components/imglib2.xpt
 %{_libdir}/%{name}/components/inspector.xpt
 %{_libdir}/%{name}/components/intl.xpt
@@ -384,20 +386,21 @@
 %{_libdir}/%{name}/components/js*.xpt
 %{_libdir}/%{name}/components/layout*.xpt
 %{_libdir}/%{name}/components/locale.xpt
+%{_libdir}/%{name}/components/loginmgr.xpt
 %{_libdir}/%{name}/components/lwbrk.xpt
 %{_libdir}/%{name}/components/mimetype.xpt
 %{_libdir}/%{name}/components/moz*.xpt
 %{_libdir}/%{name}/components/necko*.xpt
 %{_libdir}/%{name}/components/oji.xpt
-%{_libdir}/%{name}/components/passwordmgr.xpt
+%{_libdir}/%{name}/components/parentalcontrols.xpt
 %{_libdir}/%{name}/components/pipboot.xpt
 %{_libdir}/%{name}/components/pipnss.xpt
 %{_libdir}/%{name}/components/pippki.xpt
+%{_libdir}/%{name}/components/places.xpt
 %{_libdir}/%{name}/components/plugin.xpt
 %{_libdir}/%{name}/components/pref.xpt
 %{_libdir}/%{name}/components/prefetch.xpt
 %{_libdir}/%{name}/components/profile.xpt
-%{_libdir}/%{name}/components/progressDlg.xpt
 %{_libdir}/%{name}/components/proxyObjInst.xpt
 %{_libdir}/%{name}/components/rdf.xpt
 %{_libdir}/%{name}/components/satchel.xpt
@@ -417,62 +420,61 @@
 %{_libdir}/%{name}/components/webBrowser_core.xpt
 %{_libdir}/%{name}/components/webbrowserpersist.xpt
 %{_libdir}/%{name}/components/webshell_idls.xpt
-%{_libdir}/%{name}/components/websrvcs.xpt
 %{_libdir}/%{name}/components/widget.xpt
 %{_libdir}/%{name}/components/windowds.xpt
 %{_libdir}/%{name}/components/windowwatcher.xpt
 %{_libdir}/%{name}/components/x*.xpt
+%{_libdir}/%{name}/components/zipwriter.xpt
 
 %{_libdir}/%{name}/components/FeedProcessor.js
 %{_libdir}/%{name}/components/jsconsole-clhandler.js
-%{_libdir}/%{name}/components/nsCloseAllWindows.js
+%{_libdir}/%{name}/components/nsAddonRepository.js
+%{_libdir}/%{name}/components/nsBadCertHandler.js
+%{_libdir}/%{name}/components/nsBlocklistService.js
+%{_libdir}/%{name}/components/nsContentDispatchChooser.js
+%{_libdir}/%{name}/components/nsContentPrefService.js
 %{_libdir}/%{name}/components/nsDefaultCLH.js
 %{_libdir}/%{name}/components/nsDictionary.js
+%{_libdir}/%{name}/components/nsDownloadManagerUI.js
 %{_libdir}/%{name}/components/nsExtensionManager.js
 %{_libdir}/%{name}/components/nsFilePicker.js
+%{_libdir}/%{name}/components/nsHandlerService.js
 %{_libdir}/%{name}/components/nsHelperAppDlg.js
-%{_libdir}/%{name}/components/nsInterfaceInfoToIDL.js
-%{_libdir}/%{name}/components/nsKillAll.js
+%{_libdir}/%{name}/components/nsLivemarkService.js
+%{_libdir}/%{name}/components/nsLoginInfo.js
+%{_libdir}/%{name}/components/nsLoginManager.js
+%{_libdir}/%{name}/components/nsLoginManagerPrompter.js
 %{_libdir}/%{name}/components/nsProgressDialog.js
 %{_libdir}/%{name}/components/nsProxyAutoConfig.js
 %{_libdir}/%{name}/components/nsResetPref.js
-%{_libdir}/%{name}/components/nsUpdateService.js
+%{_libdir}/%{name}/components/nsTaggingService.js
+%{_libdir}/%{name}/components/nsTryToClose.js
 %{_libdir}/%{name}/components/nsURLFormatter.js
-%{_libdir}/%{name}/components/nsXmlRpcClient.js
+%{_libdir}/%{name}/components/nsUpdateService.js
+%{_libdir}/%{name}/components/nsWebHandlerApp.js
 %{_libdir}/%{name}/components/nsXULAppInstall.js
+%{_libdir}/%{name}/components/nsXmlRpcClient.js
+%{_libdir}/%{name}/components/pluginGlue.js
+%{_libdir}/%{name}/components/storage-Legacy.js
+%{_libdir}/%{name}/components/txEXSLTRegExFunctions.js
 
 # do not use *.dat here, so check-files can catch any new files
 # (and they won't be just silently placed empty in rpm)
 %ghost %{_libdir}/%{name}/components/compreg.dat
 %ghost %{_libdir}/%{name}/components/xpti.dat
 
-%dir %{_datadir}/%{name}/chrome
-%{_datadir}/%{name}/chrome/classic.jar
-%{_datadir}/%{name}/chrome/classic.manifest
-%{_datadir}/%{name}/chrome/comm.jar
-%{_datadir}/%{name}/chrome/comm.manifest
-%{_datadir}/%{name}/chrome/en-US.jar
-%{_datadir}/%{name}/chrome/en-US.manifest
-%{_datadir}/%{name}/chrome/pippki.jar
-%{_datadir}/%{name}/chrome/pippki.manifest
-%{_datadir}/%{name}/chrome/toolkit.jar
-%{_datadir}/%{name}/chrome/toolkit.manifest
-
-%{_datadir}/%{name}/chrome/chromelist.txt
-#%ghost %{_datadir}/%{name}/chrome/installed-chrome.txt
-
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/defaults
 %{_datadir}/%{name}/greprefs
+%{_datadir}/%{name}/icons
+%{_datadir}/%{name}/modules
 %{_datadir}/%{name}/res
 
 %files libs
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/libgtkembedmoz.so
-%attr(755,root,root) %{_libdir}/%{name}/libldap50.so
 %attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
-%attr(755,root,root) %{_libdir}/%{name}/libprldap50.so
-%attr(755,root,root) %{_libdir}/%{name}/libssldap50.so
 %attr(755,root,root) %{_libdir}/%{name}/libxpcom.so
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
 
@@ -483,11 +485,9 @@
 %attr(755,root,root) %{_bindir}/xpidl
 %attr(755,root,root) %{_bindir}/xpt_dump
 %attr(755,root,root) %{_bindir}/xpt_link
-%attr(755,root,root) %{_bindir}/xulrunner-config
 %attr(755,root,root) %{_libdir}/%{name}/xulrunner-stub
 %{_includedir}/%{name}
 %{_datadir}/idl/%{name}
-%{_pkgconfigdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -495,6 +495,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2008/06/18 12:07:25  hawk
+- merged 3.0 from DEVEL, updated tarball to official FIREFOX_3_0_RELEASE
+
 Revision 1.48  2008/04/24 14:29:31  glen
 - release 2 (1 for ac)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xulrunner.spec?r1=1.48&r2=1.49&f=u

