From 777a1c822ae5c2fc12e6e488ac0ce5efbdb39dd7 Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@fedoraproject.org>
Date: Wed, 11 Oct 2006 20:54:47 +0000
Subject: - Add virtual provides for gecko applications.

---
 .cvsignore            |  1 +
 add-gecko-provides.in | 18 ++++++++++++++++++
 firefox.spec          | 16 +++++++++++++---
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100755 add-gecko-provides.in

diff --git a/.cvsignore b/.cvsignore
index 5b17369..5632706 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 firefox-1.5.0.6-source.tar.bz2
 firefox-langpacks-1.5.0.6-20060803.tar.bz2
+add-gecko-provides
diff --git a/add-gecko-provides.in b/add-gecko-provides.in
new file mode 100755
index 0000000..2b47376
--- /dev/null
+++ b/add-gecko-provides.in
@@ -0,0 +1,18 @@
+#!/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
diff --git a/firefox.spec b/firefox.spec
index b5eda9d..f9d3bf9 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -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 @@ Source22:       firefox.png
 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 @@ Obsoletes:      mozilla <= 37:1.7.13
 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 @@ install -c -m 644 build/unix/*.pc \
 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 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Oct 11 2006 Christopher Aillon <caillon@redhat.com> 1.5.0.7-7
+- Add virtual provides for gecko applications.
+
 * Wed Oct  4 2006 Christopher Aillon <caillon@redhat.com> 1.5.0.7-6
 - Bring the invisible character to parity with GTK+
 
-- 
cgit