SPECS (AC-branch): kdebase.spec - browser plugins v2; rel 2

[glen]

Author: glen                         Date: Mon Jan 29 23:44:08 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- browser plugins v2; rel 2

---- Files affected:
SPECS:
   kdebase.spec (1.491.2.25 -> 1.491.2.26) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.491.2.25 SPECS/kdebase.spec:1.491.2.26
--- SPECS/kdebase.spec:1.491.2.25	Mon Jan 29 01:03:23 2007
+++ SPECS/kdebase.spec	Tue Jan 30 00:44:03 2007
@@ -28,7 +28,7 @@
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
 Version:	3.5.6
-Release:	1
+Release:	2
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -114,7 +114,7 @@
 %{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
 %{?with_apidocs:BuildRequires:	qt-doc}
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.356
 BuildRequires:	sed >= 4.0
 #BuildRequires:	unsermake >= 040511
 BuildRequires:	xcursor-devel >= 1.1.0
@@ -1160,8 +1160,13 @@
 	$RPM_BUILD_ROOT%{_libdir}/kde3/plugins/konqueror \
 	$RPM_BUILD_ROOT%{_datadir}/apps/kate/{scripts,plugins}
 
+%browser_plugins_add_browser konqueror -p %{_libdir}/kde3/plugins/konqueror -b <<'EOF'
+# konqueror does not work
+npwrapper.libflashplayer.so
+EOF
+
 if [ -d "$RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs" ] ; then
-mv -f $RPM_BUILD_ROOT{%{_kdedocdir}/en/%{name}-%{version}-apidocs,%{_kdedocdir}/en/%{name}-apidocs}
+	mv -f $RPM_BUILD_ROOT{%{_kdedocdir}/en/%{name}-%{version}-apidocs,%{_kdedocdir}/en/%{name}-apidocs}
 fi
 
 # Drop generated Xsession file (we have own one)
@@ -1409,6 +1414,14 @@
 	/sbin/chkconfig --del kdm
 fi
 
+%post -n konqueror
+%update_browser_plugins
+
+%postun -n konqueror
+if [ "$1" = 0 ]; then
+	%update_browser_plugins
+fi
+
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/*.h
@@ -1595,7 +1608,7 @@
 %{_iconsdir}/[!l]*/*/apps/bell.png
 %{_iconsdir}/*/*/apps/key_bindings.png
 
-%files core  -f core.lang
+%files core -f core.lang
 %defattr(644,root,root,755)
 %lang(en) %dir %{_kdedocdir}/en/kcontrol
 %lang(en) %{_kdedocdir}/en/kcontrol/common
@@ -2519,6 +2532,11 @@
 
 %files -n konqueror -f konqueror.lang
 %defattr(644,root,root,755)
+
+# browser plugins v2
+%{_browserpluginsconfdir}/browsers.d/konqueror.*
+%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/konqueror.*.blacklist
+
 %attr(755,root,root) %{_bindir}/appletproxy
 %attr(755,root,root) %{_bindir}/extensionproxy
 %attr(755,root,root) %{_bindir}/keditbookmarks
@@ -2815,6 +2833,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.491.2.26  2007/01/29 23:44:03  glen
+- browser plugins v2; rel 2
+
 Revision 1.491.2.25  2007/01/29 00:03:23  glen
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.491.2.25&r2=1.491.2.26&f=u