rpms/firefox/devel .cvsignore, 1.102, 1.103 firefox.spec, 1.340, 1.341 sources, 1.115, 1.116
Martin Stransky
stransky at fedoraproject.org
Wed Nov 18 11:08:32 UTC 2009
- Previous message (by thread): rpms/rhythmbox/devel .cvsignore, 1.59, 1.60 rhythmbox.spec, 1.273, 1.274 sources, 1.61, 1.62
- Next message (by thread): rpms/gnome-colors-icon-theme/devel .cvsignore, 1.2, 1.3 gnome-colors-icon-theme.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stransky
Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15550
Modified Files:
.cvsignore firefox.spec sources
Log Message:
Update to 3.6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore 5 Nov 2009 10:00:21 -0000 1.102
+++ .cvsignore 18 Nov 2009 11:08:31 -0000 1.103
@@ -10,3 +10,5 @@ firefox-3.5.4-source.tar.bz2
firefox-langpacks-3.5.4-20091026.tar.bz2
firefox-3.5.5-source.tar.bz2
firefox-langpacks-3.5.5-20091105.tar.bz2
+firefox-langpacks-3.6.1-20091118.tar.bz2
+firefox-3.6b2.source.tar.bz2
Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -r1.340 -r1.341
--- firefox.spec 5 Nov 2009 10:00:21 -0000 1.340
+++ firefox.spec 18 Nov 2009 11:08:31 -0000 1.341
@@ -2,35 +2,31 @@
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
-%define mozappdir %{_libdir}/%{name}-%{internal_version}
-%define tarballdir mozilla-1.9.1
+%define mozappdir %{_libdir}/%{name}-%{internal_version}
+%define tarballdir mozilla-1.9.2
-%define xulrunner_version 1.9.1.5-1
-%define internal_version %{version}
+%define xulrunner_version 1.9.2.1
+%define internal_version 3.6
-%define official_branding 1
-%define build_langpacks 1
+%define official_branding 0
+%define build_langpacks 1
%if ! %{official_branding}
%define cvsdate 20080327
%define nightly .cvs%{cvsdate}
+%define prever b2
%endif
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 3.5.5
-Release: 1%{?dist}
+Version: 3.6.1
+Release: 0.1.%{?prever}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
-%if %{official_branding}
-%define tarball firefox-%{internal_version}-source.tar.bz2
-%else
-%define tarball firefox-3.1b4-source.tar.bz2
-%endif
-Source0: %{tarball}
+Source0: firefox-%{internal_version}%{?prever}.source.tar.bz2
%if %{build_langpacks}
-Source2: firefox-langpacks-%{version}-20091105.tar.bz2
+Source2: firefox-langpacks-%{version}-20091118.tar.bz2
%endif
Source10: firefox-mozconfig
Source11: firefox-mozconfig-branded
@@ -41,6 +37,8 @@ Source23: firefox.1
Source100: find-external-requires
+#Build patches
+Patch0: firefox-version.patch
# Upstream patches
@@ -59,7 +57,7 @@ Source100: find-external-requires
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: desktop-file-utils
BuildRequires: system-bookmarks
-BuildRequires: xulrunner-devel-unstable >= %{xulrunner_version}
+BuildRequires: xulrunner-devel >= %{xulrunner_version}
Requires: xulrunner >= %{xulrunner_version}
Requires: system-bookmarks
@@ -80,6 +78,11 @@ compliance, performance and portability.
%setup -q -c
cd %{tarballdir}
+sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \
+ > version.patch
+%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
+
+
# For branding specific patches.
%if %{official_branding}
@@ -133,6 +136,11 @@ make -f client.mk build STRIP="/bin/true
%{__rm} -rf $RPM_BUILD_ROOT
cd %{tarballdir}
+INTERNAL_GECKO=%{internal_version}
+
+INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO}
+MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
+
DESTDIR=$RPM_BUILD_ROOT make install
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
@@ -330,6 +338,9 @@ gtk-update-icon-cache %{_datadir}/icons/
#---------------------------------------------------------------------
%changelog
+* Fri Nov 13 2009 Martin Stransky <stransky at redhat.com> - 3.6.1-0.1.b2
+- Rebase to 3.6.1 Beta 2
+
* Thu Nov 5 2009 Jan Horak <jhorak at redhat.com> - 3.5.5-1
- Update to 3.5.5
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources 5 Nov 2009 10:00:21 -0000 1.115
+++ sources 18 Nov 2009 11:08:31 -0000 1.116
@@ -1,2 +1,2 @@
-b3d92dfb40584141dc1068efc9bdfccc firefox-3.5.5-source.tar.bz2
-d3e23da5bac91f377db7f9b46866a665 firefox-langpacks-3.5.5-20091105.tar.bz2
+29da539ba954deea6c678d4d5e0fb85a firefox-langpacks-3.6.1-20091118.tar.bz2
+639cb790cecae3bde47ec650ab03c9a1 firefox-3.6b2.source.tar.bz2
- Previous message (by thread): rpms/rhythmbox/devel .cvsignore, 1.59, 1.60 rhythmbox.spec, 1.273, 1.274 sources, 1.61, 1.62
- Next message (by thread): rpms/gnome-colors-icon-theme/devel .cvsignore, 1.2, 1.3 gnome-colors-icon-theme.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list