SPECS: kdebase.spec - browser plugins v2; rel 8

[glen]

Author: glen                         Date: Tue Jan  9 23:42:54 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- browser plugins v2; rel 8

---- Files affected:
SPECS:
   kdebase.spec (1.555 -> 1.556) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.555 SPECS/kdebase.spec:1.556
--- SPECS/kdebase.spec:1.555	Mon Jan  8 11:28:56 2007
+++ SPECS/kdebase.spec	Wed Jan 10 00:42:48 2007
@@ -28,7 +28,7 @@
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
 Version:	3.5.5
-Release:	7
+Release:	8
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -110,6 +110,7 @@
 BuildRequires:	motif-devel
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 BuildRequires:	openssl-devel >= 0.9.7c
+BuildRequires:	rpmbuild(macros) >= 1.356
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
 %{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
@@ -1173,8 +1174,10 @@
 	$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
+
 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)
@@ -1205,7 +1208,7 @@
 	$RPM_BUILD_ROOT/etc/X11/kdm/faces/root.face.icon
 
 # konqueror/dirtree no longer supported
-rm $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
 
 # Workaround for gnome menu which maps all these to "Others" dir
 cd $RPM_BUILD_ROOT%{_desktopdir}/kde
@@ -1426,6 +1429,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
@@ -2382,6 +2393,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
@@ -2612,6 +2628,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.556  2007/01/09 23:42:48  glen
+- browser plugins v2; rel 8
+
 Revision 1.555  2007/01/08 10:28:56  pluto
 - patch for bug#124895 merged into branch.diff.
 - rebuild common-filemanagement with new openexr soname.
================================================================

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