rpms/firefox/devel add-gecko-provides.in, NONE, 1.1 .cvsignore, 1.29, 1.30 firefox.spec, 1.157, 1.158

[fedora-cvs-commits at redhat.com]

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18992

Modified Files:
	.cvsignore firefox.spec 
Added Files:
	add-gecko-provides.in 
Log Message:
* Wed Oct 11 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-7
- Add virtual provides for gecko applications.



--- NEW FILE add-gecko-provides.in ---
#!/bin/sh
#
# Use the internal provides generator"
#
filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
provides=`echo $filelist | /usr/lib/rpm/find-provides`
echo $provides

#
# 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@"
fi


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	8 Aug 2006 17:27:39 -0000	1.29
+++ .cvsignore	11 Oct 2006 20:54:47 -0000	1.30
@@ -1,2 +1,3 @@
 firefox-1.5.0.6-source.tar.bz2
 firefox-langpacks-1.5.0.6-20060803.tar.bz2
+add-gecko-provides


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- firefox.spec	4 Oct 2006 18:01:39 -0000	1.157
+++ firefox.spec	11 Oct 2006 20:54:47 -0000	1.158
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -32,6 +32,7 @@
 Source23:       firefox.1
 Source50:       firefox-xremote-client.sh.in
 Source100:      find-external-requires
+Source101:      add-gecko-provides.in
 
 # build patches
 Patch3:         firefox-1.1-nss-system-nspr.patch
@@ -100,9 +101,11 @@
 Provides:       webclient
 %define mozappdir %{_libdir}/firefox-%{version}
 
-%if ! %{build_devel_package}
-AutoProv: 0
 %define _use_internal_dependency_generator 0
+
+%if %{build_devel_package}
+%define __find_provides %{_builddir}/add-gecko-provides
+%else
 %define __find_requires %{SOURCE100}
 %endif
 
@@ -311,6 +314,10 @@
 GRE_PATH=%{mozappdir}
 EOF
 
+GECKO_VERSION=$(./config/milestone.pl --topsrcdir='.')
+%{__cat} %{SOURCE101} | %{__sed} -e "s/@GECKO_VERSION@/$GECKO_VERSION/g" > \
+                        %{_builddir}/add-gecko-provides
+chmod +x %{_builddir}/add-gecko-provides
 
 # ghost files
 touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
@@ -397,6 +404,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Oct 11 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-7
+- Add virtual provides for gecko applications.
+
 * Wed Oct  4 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-6
 - Bring the invisible character to parity with GTK+