- browser plugins v2 unleashed

Changed files:
    browser-plugins.spec -> 1.22

diff --git a/browser-plugins.spec b/browser-plugins.spec
index 7d5628e741213a92e8827e9739848091693c0c45..ede0b2cb0626607bd9a83ea120a9743e0e934b06 100644 (file)
--- a/browser-plugins.spec
+++ b/browser-plugins.spec
@@ -14,20 +14,19 @@
 # - skipstone
 Summary:       Base package for web browser plugins
 Summary(pl):   Podstawowy pakiet dla wtyczek przegl±darek WWW
 # - skipstone
 Summary:       Base package for web browser plugins
 Summary(pl):   Podstawowy pakiet dla wtyczek przegl±darek WWW

-# TODO: to be renamed to actual package name when package is finished
-Name:          browser-plugins2
+Name:          browser-plugins

 Version:       2.0
 Version:       2.0

-Release:       0.11
+Release:       1

 License:       GPL
 Group:         Base
 License:       GPL
 Group:         Base

-Source0:       browser-plugins.README
-Source1:       browser-plugins-update.sh
+BuildRequires: rpmbuild(macros) >= 1.356
+Source0:       %{name}.README
+Source1:       %{name}-update.sh
+Requires:      filesystem >= 2.0-1.2

 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-%define                _sysconfdir     /etc/browser-plugins
-# TODO: to be moved to rpm-build-macros
-%define                update_browser_plugins /usr/sbin/update-browser-plugins
+%define                _sysconfdir     %{_browserpluginsconfdir}

 
 %description
 This package provides base directory for browser plugins complying to
 
 %description
 This package provides base directory for browser plugins complying to


@@ -54,39 +53,23 @@ Przegl
 cp -a %{SOURCE0} README
 cp -a %{SOURCE1} update-browser-plugins
 
 cp -a %{SOURCE0} README
 cp -a %{SOURCE1} update-browser-plugins
 

-cat > blacklist <<'EOF'
-# The format is shell globs at base dir of plugindir
-EOF
-

 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{blacklist,browsers}.d,%{_sbindir}}
 install update-browser-plugins $RPM_BUILD_ROOT%{_sbindir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{blacklist,browsers}.d,%{_sbindir}}
 install update-browser-plugins $RPM_BUILD_ROOT%{_sbindir}
 

-# TODO: to be moved to browser packages
-for browser in opera firefox mozilla mozilla-firefox mozilla-firefox-bin; do
-       for arch in i386 x86_64; do
-               cp -a blacklist $RPM_BUILD_ROOT%{_sysconfdir}/blacklist.d/$browser.$arch.blacklist
-       done
-done
-cat <<'EOF'>> $RPM_BUILD_ROOT%{_sysconfdir}/blacklist.d/opera.i386.blacklist
-# opera has no use of .xpt files.
-*.xpt
-EOF
-

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%if 0
-# TODO: to be enabled if tested enough

 %post
 %update_browser_plugins
 %post
 %update_browser_plugins

-%endif
+
+# we don't need postin script as all browsers depend on this package and
+# therefore this package should be last one to go from system.

 
 %files
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/browsers.d
 %dir %{_sysconfdir}/blacklist.d
 
 %files
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/browsers.d
 %dir %{_sysconfdir}/blacklist.d

-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/blacklist.d/*.blacklist

 %attr(755,root,root) %{_sbindir}/update-browser-plugins
 %attr(755,root,root) %{_sbindir}/update-browser-plugins