SPECS (AC-branch): kdenetwork.spec - merged changes from HEAD

[glen]

Author: glen                         Date: Tue Oct 10 16:57:13 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged changes from HEAD

---- Files affected:
SPECS:
   kdenetwork.spec (1.212.2.16 -> 1.212.2.17) 

---- Diffs:

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.212.2.16 SPECS/kdenetwork.spec:1.212.2.17
--- SPECS/kdenetwork.spec:1.212.2.16	Thu Oct  5 23:45:30 2006
+++ SPECS/kdenetwork.spec	Tue Oct 10 18:57:08 2006
@@ -1,5 +1,7 @@
 # $Revision$, $Date$
 # TODO
+# - fix kopete-tool-{avdeviceconfig,smpppdcs} summaries/descriptions (copy-pastos!)
+# - what about non-applied libgadu patch?
 # - fix or kill skype support
 # - kill internal libgadu copy
 #
@@ -34,7 +36,7 @@
 Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-use_sendmail.patch
-Patch2:		%{name}-libgadu.patch
+#Patch2:		%{name}-libgadu.patch
 Patch3:		%{name}-kopete-qca-tls.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -581,18 +583,17 @@
 Wtyczka Kopete podkreślająca wybrane teksty.
 
 %package kopete-tool-latex
-Summary:	A latex plugin for Kopete
-Summary(pl):	Wtyczka Kopete renderująca tekst w formacie latexu
+Summary:	A LaTeX plugin for Kopete
+Summary(pl):	Wtyczka Kopete renderująca tekst w formacie LaTeXa
 Group:		X11/Applications/Networking
 Requires:	%{name}-kopete = %{epoch}:%{version}-%{release}
-Conflicts:	%{name}-kopete < 10:3.4.89-1
+Conflicts:	kdenetwork-kopete < 10:3.4.89-1
 
 %description kopete-tool-latex
-A latex plugin for Kopete.
+A LaTeX plugin for Kopete.
 
 %description kopete-tool-latex -l pl
-Wtyczka Kopete renderująca tekst w formacie latexu.
-
+Wtyczka Kopete renderująca tekst w formacie LaTeXa.
 
 %package kopete-tool-history
 Summary:	A history plugin for Kopete
@@ -1744,6 +1745,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212.2.17  2006/10/10 16:57:08  glen
+- merged changes from HEAD
+
 Revision 1.212.2.16  2006/10/05 21:45:30  glen
 - fix kopete files
 - add meanwhile bcond for kopete
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdenetwork.spec?r1=1.212.2.16&r2=1.212.2.17&f=u