rpms/kopete-cryptography/F-11 kopete-cryptography-1.3.0-kde4.1.3-prevent-chat-session-destroyed.patch, NONE, 1.1 kopete-cryptography.spec, 1.7, 1.8

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kopete-cryptography/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30255/F-11

Modified Files:
	kopete-cryptography.spec 
Added Files:
	kopete-cryptography-1.3.0-kde4.1.3-prevent-chat-session-destroyed.patch 
Log Message:
* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.0-9
- 1.3.0-kde4.2.3
- cleanup docdir/HTML ownership
- sync from F-10 branch


kopete-cryptography-1.3.0-kde4.1.3-prevent-chat-session-destroyed.patch:

--- NEW FILE kopete-cryptography-1.3.0-kde4.1.3-prevent-chat-session-destroyed.patch ---
diff -up kopete-cryptography-1.3.0-kde4.1.3/cryptographyplugin.cpp.prevent-chat-session-destroyed kopete-cryptography-1.3.0-kde4.1.3/cryptographyplugin.cpp
--- kopete-cryptography-1.3.0-kde4.1.3/cryptographyplugin.cpp.prevent-chat-session-destroyed	2008-11-05 17:53:10.000000000 +0100
+++ kopete-cryptography-1.3.0-kde4.1.3/cryptographyplugin.cpp	2008-12-09 13:30:08.000000000 +0100
@@ -132,6 +132,9 @@ void CryptographyPlugin::slotIncomingMes
 	Kopete::Message msg = messageEvent->message();
 	QString body = msg.plainBody();
 
+	// don't let chat session deleted when processing message
+	msg.manager()->setCanBeDeleted( false );
+
 	if ( !body.startsWith ( QString::fromLatin1 ( "-----BEGIN PGP MESSAGE----" ) )
 	        || !body.contains ( QString::fromLatin1 ( "-----END PGP MESSAGE----" ) ) )
 		return;
@@ -264,6 +267,8 @@ void CryptographyPlugin::finalizeMessage
 
 	msg.setHtmlBody ( body );
 	msg.manager()->appendMessage ( msg );
+
+	msg.manager()->setCanBeDeleted( true );
 }
 
 // encrypt and or sign a message to be sent


Index: kopete-cryptography.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kopete-cryptography/F-11/kopete-cryptography.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- kopete-cryptography.spec	8 May 2009 15:07:33 -0000	1.7
+++ kopete-cryptography.spec	11 May 2009 15:14:28 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           kopete-cryptography
 Version:        %{pluginversion}
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Encrypts and signs messages in Kopete using the OpenPGP
 
 Group:          Applications/Internet
@@ -12,6 +12,9 @@ URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{kdeversion}/src/extragear/%{name}-%{pluginversion}-kde%{kdeversion}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstremable patches
+Patch50:        kopete-cryptography-1.3.0-kde4.1.3-prevent-chat-session-destroyed.patch
+
 BuildRequires:  kdelibs4-devel >= %{kdeversion} 
 BuildRequires:  kdenetwork-devel 
 BuildRequires:  kdepim-devel
@@ -22,7 +25,7 @@ BuildRequires:  gettext-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 # for kopete
-Requires: kdenetwork >= %{kdeversion}
+Requires: kdenetwork >= 7:%{kdeversion}
 
 %description
 Kopete cryptography plugin encrypts and signs messages using the OpenPGP
@@ -31,6 +34,8 @@ standard. It also handles incoming messa
 %prep
 %setup -q -n %{name}-%{pluginversion}-kde%{kdeversion}
 
+%patch50 -p1 -b .prevent-chat-session-destroyed
+
 
 %build
 mkdir -p %{_target_platform}
@@ -46,14 +51,16 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} 
-# HTML
-for lang_dir in %{buildroot}%{_docdir}/HTML/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) %doc %{_docdir}/HTML/$lang" >> %{name}.lang
+%find_lang %{name}
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
+  if [ -d ${lang_dir} ]; then
+    lang=$(basename ${lang_dir})
+    echo "%lang(${lang}) ${HTML_DIR}/${lang}/*/" >> %{name}.lang
   fi
 done
+fi
 
 
 %clean
@@ -71,26 +78,31 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.0-8
+* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.0-9
 - 1.3.0-kde4.2.3
-- +Requires: kdenetwork
+- cleanup docdir/HTML ownership
+- sync from F-10 branch
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Dec 11 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-8
+- requires correct version of kopete
 
-* Fri Jan 23 2009 Than Ngo <than at redhat.com> - 1.3.0-6
-- 4.2.0
+* Tue Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-6
+- prevent chat session destroyed patch
 
 * Tue Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-5
 - remove post and postun sections
+
 * Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.3.0-4
 - rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
 * Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-3
 - post and postun sections
 - install section cleanup
+
 * Mon Dec 01 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-2
 - buildroot macro usage consistency
 - make VERBOSE=1
 - owns kopete_cryptography directory
+
 * Thu Nov 27 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-1
 - initial package