rpms/firefox/devel .cvsignore, 1.35, 1.36 firefox-xremote-client.sh.in, 1.1, 1.2 firefox.sh.in, 1.19, 1.20 firefox.spec, 1.186, 1.187 sources, 1.39, 1.40
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Tue Jul 31 10:50:47 UTC 2007
Author: stransky
Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1506
Modified Files:
.cvsignore firefox-xremote-client.sh.in firefox.sh.in
firefox.spec sources
Log Message:
added nspluginwrapper support
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 18 Jul 2007 15:01:13 -0000 1.35
+++ .cvsignore 31 Jul 2007 10:50:12 -0000 1.36
@@ -1,2 +1,3 @@
firefox-2.0.0.5-source.tar.bz2
firefox-langpacks-2.0.0.5-20070718.tar.bz2
+plugin-config-1.1.tar.gz
Index: firefox-xremote-client.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox-xremote-client.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-xremote-client.sh.in 9 Sep 2004 04:44:49 -0000 1.1
+++ firefox-xremote-client.sh.in 31 Jul 2007 10:50:12 -0000 1.2
@@ -12,9 +12,9 @@
##
if [ "$LD_LIBRARY_PATH" ]
then
- LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins:LIBDIR/mozilla/plugins:LIBDIR:$LD_LIBRARY_PATH
+ LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins-wrapped:LIBDIR/mozilla/plugins-wrapped:LIBDIR:$LD_LIBRARY_PATH
else
- LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins:LIBDIR/mozilla/plugins:LIBDIR
+ LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins-wrapped:LIBDIR/mozilla/plugins-wrapped:LIBDIR
fi
export LD_LIBRARY_PATH
Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- firefox.sh.in 12 Mar 2007 16:40:52 -0000 1.19
+++ firefox.sh.in 31 Jul 2007 10:50:12 -0000 1.20
@@ -77,9 +77,9 @@
##
if [ "$MOZ_PLUGIN_PATH" ]
then
- MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$MOZ_LIB_DIR/mozilla/plugins:$MOZ_DIST_BIN/plugins
+ MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$MOZ_LIB_DIR/mozilla/plugins-wrapped:$MOZ_DIST_BIN/plugins-wrapped
else
- MOZ_PLUGIN_PATH=$MOZ_LIB_DIR/mozilla/plugins:$MOZ_DIST_BIN/plugins
+ MOZ_PLUGIN_PATH=$MOZ_LIB_DIR/mozilla/plugins-wrapped:$MOZ_DIST_BIN/plugins-wrapped
fi
export MOZ_PLUGIN_PATH
@@ -135,6 +135,9 @@
# OK, here's where all the real work gets done
+# configure plug-ins
+/usr/bin/firefox-plugin-config
+
# check to see if there's an already running instance or not
ALREADY_RUNNING=`check_running`
Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- firefox.spec 18 Jul 2007 15:01:13 -0000 1.186
+++ firefox.spec 31 Jul 2007 10:50:12 -0000 1.187
@@ -6,13 +6,16 @@
%define cairo_version 0.5
%define builddir %{_builddir}/mozilla
%define build_devel_package 1
+%define plugin_config_version 1.1
+%define plugin_config_name plugin-config-%{plugin_config_version}
+%define plugin_config_binary plugin-configuration
%define official_branding 1
Summary: Mozilla Firefox Web browser.
Name: firefox
Version: 2.0.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL
Group: Applications/Internet
@@ -22,6 +25,7 @@
%define tarball firefox-2.0rc3-source.tar.bz2
%endif
Source0: %{tarball}
+Source1: %{plugin_config_name}.tar.gz
Source2: firefox-langpacks-%{version}-20070718.tar.bz2
Source10: firefox-mozconfig
Source11: firefox-mozconfig-branded
@@ -30,6 +34,7 @@
Source21: firefox.sh.in
Source22: firefox.png
Source23: firefox.1
+Source24: firefox-plugin-config.sh.in
Source50: firefox-xremote-client.sh.in
Source100: find-external-requires
Source101: add-gecko-provides.in
@@ -141,7 +146,7 @@
#---------------------------------------------------------------------
%prep
-%setup -q -n mozilla
+%setup -q -n mozilla -a 1
%patch1 -p1 -b .link-layout
#%patch3 -p1
#%patch4 -p1
@@ -215,11 +220,18 @@
export MAKE="gmake %{moz_make_flags}"
make -f client.mk build
+#Build plugin configuration utility
+pushd %{plugin_config_name}
+./configure --prefix=/usr CFLAGS="$RPM_OPT_FLAGS"
+make
+popd
+
#---------------------------------------------------------------------
%install
%{__rm} -rf $RPM_BUILD_ROOT
+
DESTDIR=$RPM_BUILD_ROOT make install
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
@@ -272,6 +284,7 @@
# own mozilla plugin dir (#135050)
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins-wrapped
# Install langpacks
%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions
@@ -345,6 +358,23 @@
touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
+# Install plugin-config utility
+pushd %{plugin_config_name}
+DESTDIR=$RPM_BUILD_ROOT make install
+
+cd $RPM_BUILD_ROOT/usr/bin
+mv %{plugin_config_binary} $RPM_BUILD_ROOT%{mozappdir}
+
+cd $RPM_BUILD_ROOT/usr/doc
+mv plugin-config $RPM_BUILD_ROOT%{mozappdir}
+popd
+
+# set up the firefox plugin configuration script
+%{__cat} %{SOURCE24} | %{__sed} -e 's,FIREFOX_VERSION,%{version},g' > \
+ $RPM_BUILD_ROOT%{_bindir}/firefox-plugin-config
+%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox-plugin-config
+
+
#---------------------------------------------------------------------
%clean
@@ -354,6 +384,7 @@
%post
update-desktop-database %{_datadir}/applications
+%{mozappdir}/%{plugin_config_binary} -i -f -q > /dev/null 2>&1
%postun
update-desktop-database %{_datadir}/applications
@@ -365,9 +396,11 @@
%{__rm} -rf %{mozappdir}/extensions
fi
+
%files
%defattr(-,root,root,-)
%{_bindir}/firefox
+%{_bindir}/firefox-plugin-config
%exclude %{_bindir}/firefox-config
%{_mandir}/man1/*
%{_datadir}/applications/mozilla-%{name}.desktop
@@ -402,6 +435,8 @@
%{mozappdir}/mozilla-xremote-client
%{mozappdir}/run-mozilla.sh
%{mozappdir}/regxpcom
+%{mozappdir}/%{plugin_config_binary}
+%{mozappdir}/plugin-config/*
# XXX See if these are needed still
%{mozappdir}/updater*
@@ -427,6 +462,9 @@
#---------------------------------------------------------------------
%changelog
+* Mon Jul 23 2007 Martin Stransky <stransky at redhat.com> 2.0.0.5-3
+- added nspluginwrapper support
+
* Wed Jul 18 2007 Kai Engert <kengert at redhat.com> - 2.0.0.5-2
- Update to 2.0.0.5
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources 18 Jul 2007 15:01:13 -0000 1.39
+++ sources 31 Jul 2007 10:50:12 -0000 1.40
@@ -1,2 +1,3 @@
5a6ca3e4ac3ebc335d473cd3f682a916 firefox-2.0.0.5-source.tar.bz2
0d24292fcd40f85b3ed64bb1ed2e006e firefox-langpacks-2.0.0.5-20070718.tar.bz2
+92d71693f1d9d77c0a4d2fcc63de17b2 plugin-config-1.1.tar.gz
More information about the fedora-extras-commits
mailing list