rpms/kdenetwork/F-9 kdenetwork-4.1.96-system-libgadu.patch, NONE, 1.1 kdenetwork-4.2.0-handle-enc-message.patch, NONE, 1.1 kdenetwork.spec, 1.160, 1.161 sources, 1.61, 1.62 kdenetwork-4.1.3-handle-enc-message.patch, 1.1, NONE kdenetwork-4.1.4-system-libgadu.patch, 1.1, NONE
Lukas Tinkl
ltinkl at fedoraproject.org
Wed Jan 28 15:49:33 UTC 2009
- Previous message (by thread): rpms/iscsi-initiator-utils/devel open-iscsi-2.0-870.1-add-libiscsi.patch, NONE, 1.1 open-iscsi-2.0-870.1-no-exit.patch, NONE, 1.1 iscsi-initiator-utils.spec, 1.35, 1.36
- Next message (by thread): rpms/fbreader/EL-5 .cvsignore, 1.8, 1.9 fbreader.spec, 1.10, 1.11 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ltinkl
Update of /cvs/extras/rpms/kdenetwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14048
Modified Files:
kdenetwork.spec sources
Added Files:
kdenetwork-4.1.96-system-libgadu.patch
kdenetwork-4.2.0-handle-enc-message.patch
Removed Files:
kdenetwork-4.1.3-handle-enc-message.patch
kdenetwork-4.1.4-system-libgadu.patch
Log Message:
KDE 4.2.0
kdenetwork-4.1.96-system-libgadu.patch:
--- NEW FILE kdenetwork-4.1.96-system-libgadu.patch ---
Index: cmake/modules/FindLibgadu.cmake
===================================================================
--- cmake/modules/FindLibgadu.cmake (Revision 0)
+++ cmake/modules/FindLibgadu.cmake (Revision 909145)
@@ -0,0 +1,72 @@
+# - Try to find libgadu (Gadu Gadu protocol support library)
+# Once done this will define
+#
+# LIBGADU_FOUND - system has LIBGADU
+# LIBGADU_INCLUDE_DIR - the LIBGADU include directory
+# LIBGADU_LIBRARIES - the libraries needed to use LIBGADU
+# LIBGADU_DEFINITIONS - Compiler switches required for using LIBGADU
+#
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+
+# Copyright (c) 2008, Maciej Mrozowski, <reavertm at poczta.fm>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include (FindLibraryWithDebug)
+
+if (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+ # in cache already
+ set (LIBGADU_FOUND TRUE)
+
+else (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+ if (NOT WIN32)
+
+ find_package (PkgConfig)
+ pkg_check_modules (PC_LIBGADU libgadu)
+
+ # If pkgconfig found libgadu, get the full path to the library using find_library()
+ # but only in the path reported by pkgconfig.
+ # Otherwise do a normal search.
+ if (PC_LIBGADU_FOUND)
+
+ set (LIBGADU_DEFINITIONS ${PC_LIBGADU_CFLAGS})
+
+ if (PC_LIBGADU_INCLUDE_DIRS)
+ set (LIBGADU_INCLUDE_DIR ${PC_LIBGADU_INCLUDE_DIRS})
+ else (PC_LIBGADU_INCLUDE_DIRS)
+ find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+ endif (PC_LIBGADU_INCLUDE_DIRS)
+
+ find_library (LIBGADU_LIBRARIES NAMES gadu
+ PATHS
+ ${PC_LIBGADU_LIBDIR}
+ NO_DEFAULT_PATH
+ )
+
+ else (PC_LIBGADU_FOUND)
+
+ find_library (LIBGADU_LIBRARIES NAMES gadu)
+ find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+ endif (PC_LIBGADU_FOUND)
+
+ else (NOT WIN32)
+
+ find_library_with_debug (LIBGADU_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES gadu
+ )
+ find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+ endif (NOT WIN32)
+
+ include (FindPackageHandleStandardArgs)
+ find_package_handle_standard_args (LIBGADU DEFAULT_MSG LIBGADU_LIBRARIES LIBGADU_INCLUDE_DIR)
+
+ mark_as_advanced (LIBGADU_INCLUDE_DIR LIBGADU_LIBRARIES)
+
+endif (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
Index: kopete/protocols/gadu/CMakeLists.txt
===================================================================
--- kopete/protocols/gadu/CMakeLists.txt (Revision 909143)
+++ kopete/protocols/gadu/CMakeLists.txt (Revision 909145)
@@ -3,11 +3,8 @@
KDE4_NO_ENABLE_FINAL(kopete)
add_subdirectory( icons )
-add_subdirectory( libgadu )
-include_directories( ${KOPETE_INCLUDES}
-${CMAKE_CURRENT_SOURCE_DIR}/libgadu/
-${CMAKE_CURRENT_BINARY_DIR}/libgadu/
+include_directories( ${KOPETE_INCLUDES} ${LIBGADU_INCLUDE_DIRS} }
)
@@ -46,7 +43,7 @@
kde4_add_plugin(kopete_gadu ${kopete_gadu_PART_SRCS})
-target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} gadu_kopete kopete )
+target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${LIBGADU_LIBRARIES} kopete )
install(TARGETS kopete_gadu DESTINATION ${PLUGIN_INSTALL_DIR})
Index: kopete/protocols/CMakeLists.txt
===================================================================
--- kopete/protocols/CMakeLists.txt (Revision 909143)
+++ kopete/protocols/CMakeLists.txt (Revision 909145)
@@ -1,6 +1,3 @@
-macro_optional_find_package(OpenSSL)
-macro_log_feature(OPENSSL_FOUND "OpenSSL" "A toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols" "http://openssl.org" FALSE "" "Required for the Kopete Gadu-Gadu protocol.")
-
# On Solaris, some of the name resolution functions are in libnsl;
# this needs to be linked in if found. Copied from kdelibs.
check_library_exists(nsl gethostbyname "" HAVE_NSL_LIBRARY)
@@ -47,9 +44,9 @@
if(WITH_winpopup)
add_subdirectory( winpopup )
endif(WITH_winpopup)
- if(WITH_gadu AND OPENSSL_FOUND)
+ if(WITH_gadu AND LIBGADU_FOUND)
add_subdirectory( gadu )
- endif(WITH_gadu AND OPENSSL_FOUND)
+ endif(WITH_gadu AND LIBGADU_FOUND)
if(WITH_sms)
add_subdirectory( sms )
endif(WITH_sms)
Index: kopete/CMakeLists.txt
===================================================================
--- kopete/CMakeLists.txt (Revision 909143)
+++ kopete/CMakeLists.txt (Revision 909145)
@@ -37,6 +37,10 @@
macro_bool_to_01(LIBMEANWHILE_FOUND HAVE_LIBMEANWHILE)
macro_log_feature(LIBMEANWHILE_FOUND "libmeanwhile" "A library for protocol support for connection to Sametime servers" "http://meanwhile.sf.net" FALSE "" "Required for the Kopete Meanwhile protocol")
+macro_optional_find_package(Libgadu)
+macro_bool_to_01(LIBGADU_FOUND HAVE_LIBGADU)
+macro_log_feature(LIBGADU_FOUND "libgadu" "A library providing support for Gadu-Gadu protocol" "http://toxygen.net/libgadu/" FALSE "1.8.0" "Required for Kopete Gadu-Gadu protocol")
+
check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H)
check_include_files(stdint.h HAVE_STDINT_H)
check_include_files(inttypes.h HAVE_INTTYPES_H)
kdenetwork-4.2.0-handle-enc-message.patch:
--- NEW FILE kdenetwork-4.2.0-handle-enc-message.patch ---
diff -up kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp.handle-enc-message kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp
--- kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp.handle-enc-message 2008-11-19 11:19:43.000000000 +0100
+++ kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp 2009-01-26 14:12:35.000000000 +0100
@@ -51,6 +51,7 @@
#include "kopetechatsessionmanager.h"
#include "kopeteaccountmanager.h"
#include "kopetemetacontact.h"
+#include "kopetepluginmanager.h"
#include "jabberprotocol.h"
#include "jabberaccount.h"
#include "jabberclient.h"
@@ -392,9 +393,15 @@ void JabberContact::handleIncomingMessag
QString body = message.body ();
if( !message.xencrypted().isEmpty() )
{
- body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+ kDebug ( JABBER_DEBUG_GLOBAL ) << "Received encrypted message";
+ if (Kopete::PluginManager::self()->plugin("kopete_cryptography"))
+ {
+ kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded";
+ body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+ }
}
- else if( message.containsHTML() )
+
+ if( message.containsHTML() )
{
kDebug ( JABBER_DEBUG_GLOBAL ) << "Received a xHTML message";
newMessage = new Kopete::Message ( this, contactList );
diff -up kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp.handle-enc-message kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp
--- kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp.handle-enc-message 2008-10-09 11:48:21.000000000 +0200
+++ kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp 2009-01-26 14:12:35.000000000 +0100
@@ -32,6 +32,7 @@
#include "jabbergroupmembercontact.h"
#include "jabbercontactpool.h"
#include "kopetemetacontact.h"
+#include "kopetepluginmanager.h"
#include "xmpp_tasks.h"
/**
@@ -181,7 +182,11 @@ void JabberGroupContact::handleIncomingM
if( !message.xencrypted().isEmpty () )
{
- body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+ if (Kopete::PluginManager::self()->plugin("kopete_cryptography"))
+ {
+ kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded";
+ body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+ }
}
// locate the originating contact
Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kdenetwork.spec 12 Jan 2009 18:40:24 -0000 1.160
+++ kdenetwork.spec 28 Jan 2009 15:49:02 -0000 1.161
@@ -1,61 +1,52 @@
-# FIXME/TODO: needed BuildRequires
-# Decibel
-
Summary: K Desktop Environment - Network Applications
Name: kdenetwork
Epoch: 7
-Version: 4.1.4
+Version: 4.2.0
Release: 2%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.kde.org
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0: kdenetwork-4.1.3-handle-enc-message.patch
+Patch0: kdenetwork-4.2.0-handle-enc-message.patch
# build Kopete against the system libgadu (backported from 4.3)
# http://websvn.kde.org/?view=rev&revision=909144
# http://websvn.kde.org/?view=rev&revision=909145
-Patch100: kdenetwork-4.1.4-system-libgadu.patch
-
-# upstream patches
-
+Patch100: kdenetwork-4.1.96-system-libgadu.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: avahi-compat-libdns_sd-devel
BuildRequires: boost-devel
-BuildRequires: cmake
-# TODO
+# FIXME/TODO
#BuildRequires: decibel-devel
BuildRequires: giflib-devel
BuildRequires: glib2-devel
BuildRequires: gmp-devel
-BuildRequires: kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kdebase-workspace-devel >= %{version}
BuildRequires: libgadu-devel >= 1.8.0
BuildRequires: libidn-devel
+BuildRequires: libmsn-devel >= 4.0-0.4.beta2
BuildRequires: libotr-devel
BuildRequires: libvncserver-devel
BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: meanwhile-devel
BuildRequires: openldap-devel
BuildRequires: openslp-devel
+BuildRequires: ortp-devel
BuildRequires: pcre-devel
BuildRequires: qca2-devel
+BuildRequires: plasma-devel >= %{version}
BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel >= 2.0.97
+BuildRequires: speex-devel
BuildRequires: sqlite-devel
-# omit for now, save pulling in xmms-lib, gtk+ lib stack
-#BuildRequires: xmms-devel
-
+# FIXME/TODO: libnxcl-devel
# FIXME/TODO: are there other explicit Requires?
Requires(post): xdg-utils
Requires(postun): xdg-utils
-Requires: kdelibs4 >= %{version}
Requires: kdepimlibs >= %{version}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
# kopete/yahoo
Requires(hint): jasper
@@ -66,14 +57,15 @@
## krdc
Requires(hint): rdesktop
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < 7:4.0.0
+
+# kopete-bonjour review, https://bugzilla.redhat.com/451302
+Obsoletes: kopete-bonjour < 2
+Provides: kopete-bonjour = 2
-# FIXME/TODO: Taken from 3.5.8. review needed
%description
Networking applications, including:
* kget: downloader manager
-* kio_lan: lan browsing kio slave
-* knewsticker: RDF newsticker applet
* kopete: chat client
* kppp: dialer and front end for pppd
* krdc: a client for Desktop Sharing and other VNC servers
@@ -87,7 +79,7 @@
%package devel
Group: Development/Libraries
-Summary: Development files for %{name}
+Summary: Development files for %{name}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: kdelibs4-devel
%description devel
@@ -97,7 +89,7 @@
%prep
%setup -q
%patch0 -p1 -b .handle-enc-message
-%patch100 -p1 -b .system-libgadu
+%patch100 -p0 -b .system-libgadu
rm -rf kopete/protocols/gadu/libgadu/
%build
@@ -112,7 +104,7 @@
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%clean
@@ -120,10 +112,14 @@
%post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
%post libs -p /sbin/ldconfig
@@ -134,6 +130,7 @@
%defattr(-,root,root,-)
%doc COPYING README
%{_kde4_bindir}/*
+%{_kde4_appsdir}/kconf_update/*
%{_kde4_appsdir}/kget/
%{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
%{_kde4_appsdir}/kopete*
@@ -141,46 +138,77 @@
%{_kde4_appsdir}/krfb/
%{_kde4_appsdir}/krdc/
%{_kde4_appsdir}/remoteview/
+%{_kde4_appsdir}/desktoptheme/default/widgets/kget.svg
+%{_kde4_configdir}/kopeterc
%{_kde4_datadir}/applications/kde4/*
%{_kde4_datadir}/config.kcfg/*
%{_datadir}/dbus-1/interfaces/*
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_datadir}/sounds/*
-%{_kde4_docdir}/HTML/en/kget/
-%{_kde4_docdir}/HTML/en/knewsticker/
-%{_kde4_docdir}/HTML/en/kopete/
-%{_kde4_docdir}/HTML/en/kppp/
-%{_kde4_docdir}/HTML/en/krfb/
-%{_kde4_docdir}/HTML/en/krdc/
+%{_kde4_docdir}/HTML/en/*/
%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_configdir}/kopeterc
%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_appsdir}/kconf_update/*
-%{_kde4_appsdir}/desktoptheme/default/widgets/kget.svg
%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/libqgroupwise.so
%files libs
%defattr(-,root,root,-)
-%{_kde4_libdir}/libqgroupwise.so
%{_kde4_libdir}/lib*.so.*
%files devel
%defattr(-,root,root,-)
-%{_kde4_includedir}/*
+%{_kde4_includedir}/kopete/
%{_kde4_libdir}/lib*.so
%exclude %{_kde4_libdir}/libqgroupwise.so
%changelog
-* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
+* Mon Jan 26 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-2
+- fix kopete jabber protocol encrypted messages handling (#473412)
+
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
+- rebuild for new OpenSSL
+
+* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
- build against system libgadu (trivial patch backported from 4.3)
-* Fri Jan 9 2009 Lukáš Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
-* Wed Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.3-2
-- fix kopete jabber protocol encrypted message handling (#473412)
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+- BR: libmsn-devel
+
+* Thu Dec 11 2008 Rex Dieter <rdieter at fedoraproject.org> 7:4.1.80-7
+- Obsoletes/Provides: kopete-bonjour (#451302)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.1.80-6
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.1.80-5
+- add missing BR meanwhile-devel (#474592)
+- add missing BR ortp-devel and speex-devel (for Jingle protocol)
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 7:4.1.80-4
+- fix up %%description
+- versioned Obsoletes
+- scriptlets fixes
+- BR: plasma-devel
+
+* Fri Nov 28 2008 Lorenzo Villani <lvillani at binaryhelix.net> 7:4.1.80-3
+- fix build (updated file lists)
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> 7:4.1.72-1
+- 4.1.80
+- BR cmake 2.6
+- make install/fast
* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
- 4.1.3
@@ -279,7 +307,7 @@
- Obsoletes: -extras ...
- Requires: rdesktop (#420801), for krdc
- Requires: ppp , for kppp
-- Requires: jasper , for kopete
+- Requires: jasper , for kopete
* Wed Dec 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-4
- rebuild for changed _kde4_includedir
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources 9 Jan 2009 10:38:40 -0000 1.61
+++ sources 28 Jan 2009 15:49:02 -0000 1.62
@@ -1 +1 @@
-c67114c0e28a4e44f1466bf467a7b8dd kdenetwork-4.1.4.tar.bz2
+0ea1628e11d398fdf45276a35edd3cae kdenetwork-4.2.0.tar.bz2
--- kdenetwork-4.1.3-handle-enc-message.patch DELETED ---
--- kdenetwork-4.1.4-system-libgadu.patch DELETED ---
- Previous message (by thread): rpms/iscsi-initiator-utils/devel open-iscsi-2.0-870.1-add-libiscsi.patch, NONE, 1.1 open-iscsi-2.0-870.1-no-exit.patch, NONE, 1.1 iscsi-initiator-utils.spec, 1.35, 1.36
- Next message (by thread): rpms/fbreader/EL-5 .cvsignore, 1.8, 1.9 fbreader.spec, 1.10, 1.11 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list