SPECS (DEVEL): mozilla-firefox.spec - cleanups; package devel file...

[glen]

Author: glen                         Date: Fri Nov  3 14:15:04 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- cleanups; package devel files just once

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.95.2.44 -> 1.95.2.45) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.95.2.44 SPECS/mozilla-firefox.spec:1.95.2.45
--- SPECS/mozilla-firefox.spec:1.95.2.44	Fri Nov  3 14:46:20 2006
+++ SPECS/mozilla-firefox.spec	Fri Nov  3 15:14:59 2006
@@ -17,13 +17,12 @@
 # Conditional build:
 %bcond_with	tests	# enable tests (whatever they check)
 %bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
-%bcond_without	javaxpcom	#
 #
 Summary:	Mozilla Firefox web browser
 Summary(pl):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox
 Version:	2.0
-Release:	0.19
+Release:	0.20
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -280,13 +279,11 @@
 # header/developement files
 cp -rfL dist/include	$RPM_BUILD_ROOT%{_includedir}/%{name}
 cp -rfL dist/idl	$RPM_BUILD_ROOT%{_includedir}/%{name}
-
-install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
-install dist/bin/xpidl $RPM_BUILD_ROOT%{_bindir}
-install dist/bin/xpt_dump $RPM_BUILD_ROOT%{_bindir}
-install dist/bin/xpt_link $RPM_BUILD_ROOT%{_bindir}
-
 ln -sf necko/nsIURI.h $RPM_BUILD_ROOT%{_includedir}/mozilla-firefox/nsIURI.h
+install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT{%{_firefoxdir},%{_bindir}}/xpidl
+mv $RPM_BUILD_ROOT{%{_firefoxdir},%{_bindir}}/xpt_dump
+mv $RPM_BUILD_ROOT{%{_firefoxdir},%{_bindir}}/xpt_link
 
 # pkgconfig files
 for f in build/unix/*.pc; do
@@ -294,7 +291,7 @@
 done
 
 # already provided by standalone packages
-rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-{nss,nspr}.pc
+rm $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-{nss,nspr}.pc
 
 sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g' \
 	$RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
@@ -356,7 +353,7 @@
 %attr(755,root,root) %{_firefoxdir}/*.sh
 %attr(755,root,root) %{_firefoxdir}/m*
 %attr(755,root,root) %{_firefoxdir}/f*
-%attr(755,root,root) %{_firefoxdir}/reg*
+%attr(755,root,root) %{_firefoxdir}/regxpcom
 %attr(755,root,root) %{_firefoxdir}/x*
 %{_pixmapsdir}/*
 %{_desktopdir}/*
@@ -372,10 +369,8 @@
 %{_firefoxdir}/extensions/inspector at mozilla.org/*
 
 # javaxpcom
-%if %{with javaxpcom}
 %{_firefoxdir}/javaxpcom-src.jar
 %{_firefoxdir}/javaxpcom.jar
-%endif
 
 # updater
 %{_firefoxdir}/updater
@@ -391,7 +386,6 @@
 %{_firefoxdir}/README.txt
 %{_firefoxdir}/chrome/chromelist.txt
 %{_firefoxdir}/dependentlibs.list
-#%{_firefoxdir}/chrome/installed-chrome.txt
 
 # files created by regxpcom and firefox -register
 %ghost %{_firefoxdir}/components/compreg.dat
@@ -420,6 +414,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95.2.45  2006/11/03 14:14:59  glen
+- cleanups; package devel files just once
+
 Revision 1.95.2.44  2006/11/03 13:46:20  glen
 - remove --disable-v1-string-abi, it was cause of memory faults
 - cleanups in spec and chrome+xpcom-generate
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.95.2.44&r2=1.95.2.45&f=u