rpms/firefox/devel firefox.sh.in, 1.21, 1.22 firefox.spec, 1.189, 1.190 sources, 1.41, 1.42

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4876

Modified Files:
	firefox.sh.in firefox.spec sources 
Log Message:
removed plugin configuration utility


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- firefox.sh.in	6 Aug 2007 10:33:33 -0000	1.21
+++ firefox.sh.in	7 Aug 2007 08:30:38 -0000	1.22
@@ -75,7 +75,7 @@
 ## Select the propper plugin dir
 ## Wrapped plug-ins are located in /lib/mozilla/plugins-wrapped
 ##
-if [ -x "$MOZ_LIB_DIR/nspluginwrapper/npviewer" ]
+if [ -x "/usr/bin/mozilla-plugin-config" ]
 then
   MOZ_PLUGIN_DIR="plugins-wrapped"
 else
@@ -147,9 +147,9 @@
 ##
 ## If plugins are wrapped, check them
 ##
-if [ -x "$MOZ_LIB_DIR/nspluginwrapper/npviewer" ]
+if [ -x "/usr/bin/mozilla-plugin-config" ]
 then
-  /usr/bin/firefox-plugin-config
+  /usr/bin/mozilla-plugin-config
 fi
 
 # check to see if there's an already running instance or not


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- firefox.spec	6 Aug 2007 10:33:33 -0000	1.189
+++ firefox.spec	7 Aug 2007 08:30:38 -0000	1.190
@@ -6,9 +6,6 @@
 %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
 
@@ -25,7 +22,6 @@
 %define tarball firefox-2.0rc3-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        %{plugin_config_name}.tar.gz
 Source2:        firefox-langpacks-%{version}-20070731.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -34,7 +30,6 @@
 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
@@ -147,7 +142,7 @@
 #---------------------------------------------------------------------
 
 %prep
-%setup -q -n mozilla -a 1
+%setup -q -n mozilla
 %patch1   -p1 -b .link-layout
 #%patch3  -p1
 #%patch4  -p1
@@ -222,12 +217,6 @@
 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
@@ -286,7 +275,6 @@
 
 # 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
@@ -360,23 +348,6 @@
 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
@@ -386,7 +357,6 @@
 
 %post
 update-desktop-database %{_datadir}/applications
-%{mozappdir}/%{plugin_config_binary} -i -f -q > /dev/null 2>&1
 
 %postun
 update-desktop-database %{_datadir}/applications
@@ -402,7 +372,6 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/firefox
-%{_bindir}/firefox-plugin-config
 %exclude %{_bindir}/firefox-config
 %{_mandir}/man1/*
 %{_datadir}/applications/mozilla-%{name}.desktop
@@ -437,8 +406,6 @@
 %{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*
 
@@ -466,6 +433,7 @@
 %changelog
 * Mon Aug 6 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-2
 - unwrapped plugins moved to the old location
+- removed plugin configuration utility
 
 * Sat Aug  4 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-1
 - Update to 2.0.0.6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	4 Aug 2007 19:37:08 -0000	1.41
+++ sources	7 Aug 2007 08:30:38 -0000	1.42
@@ -1,3 +1,2 @@
 73e1094a055496486b1ef685a6bc3960  firefox-langpacks-2.0.0.6-20070731.tar.bz2
 16fb252fb7b0371894f7101b88fd9076  firefox-2.0.0.6-source.tar.bz2
-92d71693f1d9d77c0a4d2fcc63de17b2  plugin-config-1.1.tar.gz