SPECS (AC-branch): kdewebdev.spec - merge with HEAD

[glen]

Author: glen                         Date: Thu Feb 14 22:58:15 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge with HEAD

---- Files affected:
SPECS:
   kdewebdev.spec (1.65.2.8 -> 1.65.2.9) 

---- Diffs:

================================================================
Index: SPECS/kdewebdev.spec
diff -u SPECS/kdewebdev.spec:1.65.2.8 SPECS/kdewebdev.spec:1.65.2.9
--- SPECS/kdewebdev.spec:1.65.2.8	Thu Feb 14 23:55:09 2008
+++ SPECS/kdewebdev.spec	Thu Feb 14 23:58:09 2008
@@ -23,6 +23,7 @@
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-quanta.patch
 Patch2:		kde-ac260-lt.patch
+URL:		http://www.kde.org/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1.6.1
 BuildRequires:	kdelibs-devel >= %{_minlibsevr}
@@ -196,6 +197,7 @@
 
 %package kommander-executor
 Summary:	Kommander executor
+Summary(pl.UTF-8):	Wykonawca Kommandera
 Group:		X11/Applications
 Requires:	kdebase-core >= %{_minbasesevr}
 Conflicts:	kdewebdev-kommander < 2:3.5.6-2
@@ -203,11 +205,14 @@
 %description kommander-executor
 Executor of Kommander scripts.
 
+%description kommander-executor -l pl.UTF-8
+Wykonawca skryptów Kommandera.
+
 %package kommander-devel
 Summary:	Development files for kommander
 Summary(pl.UTF-8):	Nagłówki dla kommandera
 Group:		X11/Development/Libraries
-Requires:	%{name}-kommander = %{epoch}:%{version}-%{release}
+Requires:	%{name}-kommander-executor = %{epoch}:%{version}-%{release}
 Provides:	quanta-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	quanta-devel
 
@@ -336,6 +341,8 @@
 # unsupported
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/locolor
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+
 %find_lang kfilereplace	--with-kde
 %find_lang klinkstatus	--with-kde
 %find_lang kommander	--with-kde
@@ -347,13 +354,12 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	kommander	-p /sbin/ldconfig
-%postun	kommander	-p /sbin/ldconfig
+%post	kommander-executor -p /sbin/ldconfig
+%postun	kommander-executor -p /sbin/ldconfig
 
 %files kfilereplace -f kfilereplace.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kfilereplace
-%{_libdir}/kde3/libkfilereplacepart.la
 %attr(755,root,root) %{_libdir}/kde3/libkfilereplacepart.so
 %{_datadir}/apps/kfilereplace
 %{_datadir}/apps/kfilereplacepart
@@ -364,7 +370,6 @@
 %files kimagemapeditor
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kimagemapeditor
-%{_libdir}/kde3/libkimagemapeditor.la
 %attr(755,root,root) %{_libdir}/kde3/libkimagemapeditor.so
 %{_datadir}/apps/kimagemapeditor
 %{_datadir}/services/kimagemapeditorpart.desktop
@@ -374,7 +379,6 @@
 %files klinkstatus -f klinkstatus.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/klinkstatus
-%{_libdir}/kde3/libklinkstatuspart.la
 %attr(755,root,root) %{_libdir}/kde3/libklinkstatuspart.so
 %{_datadir}/apps/klinkstatus
 %{_datadir}/apps/klinkstatuspart
@@ -399,16 +403,16 @@
 %attr(755,root,root) %{_libdir}/libkommanderplugin.so.*.*.*
 %attr(755,root,root) %{_libdir}/libkommanderwidget.so.*.*.*
 %attr(755,root,root) %{_libdir}/libkommanderwidgets.so.*.*.*
-%{_libdir}/libkommanderplugin.la
-%{_libdir}/libkommanderwidget.la
-%{_libdir}/libkommanderwidgets.la
 %{_datadir}/applnk/.hidden/kmdr-executor.desktop
 
 %files kommander-devel
 %defattr(644,root,root,755)
-%{_libdir}/libkommanderplugin.so
-%{_libdir}/libkommanderwidget.so
-%{_libdir}/libkommanderwidgets.so
+%attr(755,root,root) %{_libdir}/libkommanderplugin.so
+%attr(755,root,root) %{_libdir}/libkommanderwidget.so
+%attr(755,root,root) %{_libdir}/libkommanderwidgets.so
+%{_libdir}/libkommanderplugin.la
+%{_libdir}/libkommanderwidget.la
+%{_libdir}/libkommanderwidgets.la
 %{_includedir}/kommanderfactory.h
 %{_includedir}/kommanderplugin.h
 %{_includedir}/kommanderwidget.h
@@ -418,7 +422,6 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kxsldbg
 %attr(755,root,root) %{_bindir}/xsldbg
-%{_libdir}/kde3/libkxsldbgpart.la
 %attr(755,root,root) %{_libdir}/kde3/libkxsldbgpart.so
 %{_datadir}/apps/kxsldbg
 %{_datadir}/apps/kxsldbgpart
@@ -429,9 +432,7 @@
 %files quanta -f quanta.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/quanta
-%{_libdir}/kde3/quantadebuggergubed.la
 %attr(755,root,root) %{_libdir}/kde3/quantadebuggergubed.so
-%{_libdir}/kde3/quantadebuggerdbgp.la
 %attr(755,root,root) %{_libdir}/kde3/quantadebuggerdbgp.so
 %{_datadir}/apps/kafkapart
 %{_datadir}/apps/quanta
@@ -450,6 +451,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65.2.9  2008-02-14 22:58:09  glen
+- merge with HEAD
+
 Revision 1.65.2.8  2008-02-14 22:55:09  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdewebdev.spec?r1=1.65.2.8&r2=1.65.2.9&f=u