rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Don't strip provides when building the devel package

Browse Source
This commit is contained in:
Christopher Aillon 2006-07-27 18:39:56 +00:00
parent 30800a9b25
commit f64fde5d60
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firefox.spec
View File

@ -4,13 +4,14 @@
%define nss_version 3.10 %define nss_version 3.10
%define cairo_version 0.5 %define cairo_version 0.5
%define builddir %{_builddir}/mozilla %define builddir %{_builddir}/mozilla
%define build_devel_package 1
%define official_branding 1 %define official_branding 1
Summary: Mozilla Firefox Web browser. Summary: Mozilla Firefox Web browser.
Name: firefox Name: firefox
Version: 1.5.0.5 Version: 1.5.0.5
Release: 2 Release: 3
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
@ -85,14 +86,17 @@ Obsoletes: phoenix, mozilla-firebird, MozillaFirebird
Provides: webclient Provides: webclient
%define ffdir %{_libdir}/firefox-%{version} %define ffdir %{_libdir}/firefox-%{version}
%if %{build_devel_package}
AutoProv: 0 AutoProv: 0
%define _use_internal_dependency_generator 0 %define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE100} %define __find_requires %{SOURCE100}
%endif
%description %description
Mozilla Firefox is an open-source web browser, designed for standards Mozilla Firefox is an open-source web browser, designed for standards
compliance, performance and portability. compliance, performance and portability.
%if %{build_devel_package}
%package devel %package devel
Summary: Development files for Firefox Summary: Development files for Firefox
Group: Development/Libraries Group: Development/Libraries
@ -105,7 +109,7 @@ Requires: nss-devel >= %{nss_version}
Development files for Firefox. This package exists temporarily. Development files for Firefox. This package exists temporarily.
When xulrunner has reached version 1.0, firefox-devel will be When xulrunner has reached version 1.0, firefox-devel will be
removed in favor of xulrunner-devel. removed in favor of xulrunner-devel.
%endif
#--------------------------------------------------------------------- #---------------------------------------------------------------------
@ -249,6 +253,7 @@ done
%{__rm} -rf firefox-langpacks %{__rm} -rf firefox-langpacks
# Prepare our devel package # Prepare our devel package
%if %{build_devel_package}
%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version} %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version}
%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version} %{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version}
%{__cp} -r dist/include/* \ %{__cp} -r dist/include/* \
@ -260,6 +265,7 @@ install -c -m 755 dist/bin/xpcshell \
dist/bin/xpt_dump \ dist/bin/xpt_dump \
dist/bin/xpt_link \ dist/bin/xpt_link \
$RPM_BUILD_ROOT/%{ffdir} $RPM_BUILD_ROOT/%{ffdir}
%endif
# ghost files # ghost files
touch $RPM_BUILD_ROOT%{ffdir}/components/compreg.dat touch $RPM_BUILD_ROOT%{ffdir}/components/compreg.dat
@ -323,6 +329,7 @@ fi
%{ffdir}/updater* %{ffdir}/updater*
%{ffdir}/removed-files %{ffdir}/removed-files
%if %{build_devel_package}
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/idl/firefox-%{version} %{_datadir}/idl/firefox-%{version}
@ -332,10 +339,14 @@ fi
%{ffdir}/xpidl %{ffdir}/xpidl
%{ffdir}/xpt_dump %{ffdir}/xpt_dump
%{ffdir}/xpt_link %{ffdir}/xpt_link
%endif
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Thu Jul 27 2006 Christopher Aillon <caillon@redhat.com> - 1.5.0.5-3
- Don't strip provides when building the devel package
* Wed Jul 26 2006 Christopher Aillon <caillon@redhat.com> - 1.5.0.5-2 * Wed Jul 26 2006 Christopher Aillon <caillon@redhat.com> - 1.5.0.5-2
- Update to 1.5.0.5 - Update to 1.5.0.5