- local.* files are not handled. drop them

Changed files:
    browser-plugins.spec -> 1.20

diff --git a/browser-plugins.spec b/browser-plugins.spec
index f2c0b9e716f46c00453fe6bb0d8e4e2d2263da12..defd891f16b4ebbf37e40396494e9348b4bf376c 100644 (file)
--- a/browser-plugins.spec
+++ b/browser-plugins.spec
@@ -17,7 +17,7 @@ Summary(pl):  Podstawowy pakiet dla wtyczek przegl
 # TODO: to be renamed to actual package name when package is finished
 Name:          browser-plugins2
 Version:       2.0
 # TODO: to be renamed to actual package name when package is finished
 Name:          browser-plugins2
 Version:       2.0

-Release:       0.9
+Release:       0.10

 License:       GPL
 Group:         Base
 Source0:       browser-plugins.README
 License:       GPL
 Group:         Base
 Source0:       browser-plugins.README


@@ -54,9 +54,8 @@ Przegl
 cp -a %{SOURCE0} README
 cp -a %{SOURCE1} update-browser-plugins
 
 cp -a %{SOURCE0} README
 cp -a %{SOURCE1} update-browser-plugins
 

-cat > blacklist.local <<'EOF'
-# list your local overrides here
-# the format is shell globs at base dir of plugindir
+cat > blacklist <<'EOF'
+# The format is shell globs at base dir of plugindir

 EOF
 
 %install
 EOF
 
 %install


@@ -67,9 +66,13 @@ 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
 # 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.local $RPM_BUILD_ROOT%{_sysconfdir}/blacklist.d/local.$browser.$arch.blacklist
+               cp -a blacklist $RPM_BUILD_ROOT%{_sysconfdir}/blacklist.d/$browser.$arch.blacklist

        done
 done
        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