rpms/firefox/F-7 add-gecko-provides.in, 1.1, 1.2 firefox.spec, 1.182, 1.183

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/firefox/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12259

Modified Files:
	add-gecko-provides.in firefox.spec 
Log Message:
* Wed May 30 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-1
- Final version



Index: add-gecko-provides.in
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-7/add-gecko-provides.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- add-gecko-provides.in	11 Oct 2006 20:54:47 -0000	1.1
+++ add-gecko-provides.in	31 May 2007 03:23:50 -0000	1.2
@@ -9,10 +9,13 @@
 #
 # Now output the stuff we want to add
 #
-core_files=`echo $filelist | grep "libxpcom.so" | wc -l`
-devel_files=`echo $filelist | grep "nsISupports" | wc -l`
-if [ $devel_files -gt 0 ]; then
-  echo "gecko-devel = @GECKO_VERSION@"
-elif [ $core_files -gt 0 ]; then
-  echo "gecko-libs = @GECKO_VERSION@"
+core_files=`echo $filelist | grep "libxpcom\.so" | wc -l`
+devel_files=`echo $filelist | grep "firefox\-xpcom\.pc" | wc -l`
+debug_files=`echo $filelist | grep "libxpcom\.so\.debug" | wc -l`
+if [ $debug_files -eq 0 ]; then
+  if [ $devel_files -gt 0 ]; then
+    echo "gecko-devel = @GECKO_VERSION@"
+  elif [ $core_files -gt 0 ]; then
+    echo "gecko-libs = @GECKO_VERSION@"
+  fi
 fi


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-7/firefox.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- firefox.spec	23 May 2007 19:45:10 -0000	1.182
+++ firefox.spec	31 May 2007 03:23:50 -0000	1.183
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.4
-Release:        0.rc3%{?dist}
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -416,6 +416,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed May 30 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-1
+- Final version
+
 * Wed May 23 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-0.rc3
 - Update to 2.0.0.4 RC3