- Add virtual provides for gecko applications.

This commit is contained in:
Christopher Aillon 2006-10-11 20:54:47 +00:00
parent bef802580e
commit 777a1c822a
3 changed files with 32 additions and 3 deletions

View File

@ -1,2 +1,3 @@
firefox-1.5.0.6-source.tar.bz2 firefox-1.5.0.6-source.tar.bz2
firefox-langpacks-1.5.0.6-20060803.tar.bz2 firefox-langpacks-1.5.0.6-20060803.tar.bz2
add-gecko-provides

18
add-gecko-provides.in Executable file
View File

@ -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

View File

@ -11,7 +11,7 @@
Summary: Mozilla Firefox Web browser. Summary: Mozilla Firefox Web browser.
Name: firefox Name: firefox
Version: 1.5.0.7 Version: 1.5.0.7
Release: 6%{?dist} Release: 7%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL License: MPL/LGPL
Group: Applications/Internet Group: Applications/Internet
@ -32,6 +32,7 @@ Source22: firefox.png
Source23: firefox.1 Source23: firefox.1
Source50: firefox-xremote-client.sh.in Source50: firefox-xremote-client.sh.in
Source100: find-external-requires Source100: find-external-requires
Source101: add-gecko-provides.in
# build patches # build patches
Patch3: firefox-1.1-nss-system-nspr.patch Patch3: firefox-1.1-nss-system-nspr.patch
@ -100,9 +101,11 @@ Obsoletes: mozilla <= 37:1.7.13
Provides: webclient Provides: webclient
%define mozappdir %{_libdir}/firefox-%{version} %define mozappdir %{_libdir}/firefox-%{version}
%if ! %{build_devel_package}
AutoProv: 0
%define _use_internal_dependency_generator 0 %define _use_internal_dependency_generator 0
%if %{build_devel_package}
%define __find_provides %{_builddir}/add-gecko-provides
%else
%define __find_requires %{SOURCE100} %define __find_requires %{SOURCE100}
%endif %endif
@ -311,6 +314,10 @@ install -c -m 644 build/unix/*.pc \
GRE_PATH=%{mozappdir} GRE_PATH=%{mozappdir}
EOF 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 # ghost files
touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
@ -397,6 +404,9 @@ fi
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %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 * Wed Oct 4 2006 Christopher Aillon <caillon@redhat.com> 1.5.0.7-6
- Bring the invisible character to parity with GTK+ - Bring the invisible character to parity with GTK+