From f897fae3e055613c5a798e331a2569417d047545 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 22:19:07 +0100 Subject: [PATCH] disable hiding provides like in xulrunner and obsolete xulrunner obsolete xulrunner [release 36.0.4-2mamba;Mon Mar 23 2015] --- firefox.spec | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/firefox.spec b/firefox.spec index 120d984..1db9685 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,5 +1,5 @@ %define distroname openmamba -%define default_browser_homepage http://www.openmamba.org +%define default_browser_homepage http://openmamba.org %define testing 0 @@ -18,7 +18,7 @@ Name: firefox Version: 36.0.4 -Release: 1mamba +Release: 2mamba Epoch: 1 Summary: The next generation browsing technology from mozilla.org Group: Graphical Desktop/Applications/Internet @@ -110,6 +110,8 @@ BuildRequires: unzip BuildRequires: bash BuildRequires: yasm #Requires: xulrunner = %{version} +Provides: xulrunner +Obsoletes: xulrunner BuildRoot: %{_tmppath}/firefox-%{version}-root %description @@ -119,6 +121,8 @@ Mofilla Firefox is the next generation browsing technology from mozilla.org. Summary: Devel files for Mozilla Firefox Group: Development/Applications Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Provides: xulrunner-devel +Obsoletes: xulrunner-devel %description devel Mofilla Firefox is the next generation browsing technology from mozilla.org. @@ -146,25 +150,25 @@ sed -e 's|__RPM_VERSION_INTERNAL__|%{firefox_internal_version}|' %{PATCH0} | pat #%patch6 -p2 %patch7 -p1 -%define _use_internal_dependency_generator 0 -%define __find_provides %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh - -cat > %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh <<_EOF -#! /bin/sh -grep -v %{buildroot}%{_libdir}/firefox- | \ -%{_prefix}/lib/rpm/find-provides %{buildroot} %{_target_cpu} -_EOF -chmod +x %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh - -%define __find_requires %{_builddir}/firefox-%{version}/%{source_dir}/find_requires.sh -cat > %{_builddir}/firefox-%{version}/%{source_dir}/find_requires.sh <<_EOF -#! /bin/sh -%{_prefix}/lib/rpm/find-requires %{buildroot} %{_target_cpu} 2>/dev/null | -while read line; do - [ ! -f %{buildroot}%{firefoxappdir}/\$line ] && echo "\$line" -done -_EOF -chmod +x %{_builddir}/firefox-%{version}/%{source_dir}/find_requires.sh +#% define _use_internal_dependency_generator 0 +#% define __find_provides %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh +# +#cat > %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh <<_EOF +##! /bin/sh +#grep -v %{buildroot}%{_libdir}/firefox- | \ +#%{_prefix}/lib/rpm/find-provides %{buildroot} %{_target_cpu} +#_EOF +#chmod +x %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh +# +#% define __find_requires %{_builddir}/firefox-%{version}/%{source_dir}/find_requires.sh +#cat > %{_builddir}/firefox-%{version}/%{source_dir}/find_requires.sh <<_EOF +##! /bin/sh +#%{_prefix}/lib/rpm/find-requires %{buildroot} %{_target_cpu} 2>/dev/null | +#while read line; do +# [ ! -f %{buildroot}%{firefoxappdir}/\$line ] && echo "\$line" +#done +#_EOF +#chmod +x %{_builddir}/firefox-%{version}/%{source_dir}/find_requires.sh #___EOF @@ -1704,6 +1708,10 @@ Zulu language support for Firefox. #%{firefoxappdir}/browser/extensions/langpack-zu@firefox.mozilla.org/ %changelog +* Mon Mar 23 2015 Silvan Calarco 36.0.4-2mamba +- disable hiding provides like in xulrunner and obsolete xulrunner +- obsolete xulrunner + * Sun Mar 22 2015 Automatic Build System 36.0.4-1mamba - automatic version update by autodist