rpms/kvirc/devel kvirc-cryptopp.patch, NONE, 1.1 kvirc.spec, 1.13, 1.14

[nucleo]

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29243

Modified Files:
	kvirc.spec 
Added Files:
	kvirc-cryptopp.patch 
Log Message:
don't use embeded cryptopp

kvirc-cryptopp.patch:
 CMakeLists.txt                |    2 ++
 src/modules/str/libkvistr.cpp |   14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE kvirc-cryptopp.patch ---
--- kvirc-4.0rc1/CMakeLists.txt	2009-09-09 21:57:09.000000000 +0300
+++ kvirc-4.0rc1/CMakeLists.txt	2009-10-29 01:56:49.000000000 +0200
@@ -811,6 +811,8 @@
 
 	# needed for Rijndael/AES replacement and friends
 	pkg_check_modules(CRYPTOPP libcrypto++>=5.0.0)
+	# for Fedora, per nucleo
+	pkg_check_modules(CRYPTOPP cryptopp>=5.0.0)
 	IF(CRYPTOPP_FOUND)
 		LIST(APPEND LIBS "-l${CRYPTOPP_LIBRARIES}")
 	ELSE()
--- kvirc-4.0rc1/src/modules/str/libkvistr.cpp	2009-09-09 21:57:01.000000000 +0300
+++ kvirc-4.0rc1/src/modules/str/libkvistr.cpp	2009-10-29 01:57:15.000000000 +0200
@@ -47,14 +47,14 @@
     // but we can ignore that and therefore silence the warnings.
     #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
     // Hashes (should cover most cases)
-    #include <crypto++/md2.h>
-    #include <crypto++/md4.h>
-    #include <crypto++/md5.h>
-    #include <crypto++/sha.h>
-    #include <crypto++/ripemd.h>
-    #include <crypto++/crc.h>
+    #include <cryptopp/md2.h>
+    #include <cryptopp/md4.h>
+    #include <cryptopp/md5.h>
+    #include <cryptopp/sha.h>
+    #include <cryptopp/ripemd.h>
+    #include <cryptopp/crc.h>
     // Encoding
-    #include <crypto++/hex.h>
+    #include <cryptopp/hex.h>
     // additional
     #include <string>
     // template function


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kvirc.spec	9 Sep 2009 21:05:26 -0000	1.13
+++ kvirc.spec	2 Nov 2009 23:53:25 -0000	1.14
@@ -3,16 +3,18 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.17.%{pre}%{?dist}
+Release:          0.18.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 Source0:          ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2
+Patch0:           kvirc-cryptopp.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    perl-ExtUtils-Embed dbus-devel
 BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
+BuildRequires:    cryptopp-devel
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -24,13 +26,14 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}-4.0%{pre}
+%patch0 -p1
 
 %build
 %{cmake}  \
 %ifarch %{ix86}
 -DWITH_ix86_ASM=ON \
 %endif
--DWANT_NO_EMBEDDED_CODE=OFF \
+-DWANT_NO_EMBEDDED_CODE=ON \
 -DWITHOUT_ESD=OFF \
 -DWITHOUT_OSS=OFF \
 -DWANT_COEXISTENCE=OFF \
@@ -126,6 +129,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Tue Nov  3 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.18.rc1
+- patch for using cryptopp includepath and pkgconfig file (rhbz#512761)
+- added BR cryptopp-devel and -DWANT_NO_EMBEDDED_CODE=ON
+
 * Wed Sep  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.17.rc1
 - disabled pyhton module, added -DWITHOUT_PYTHON=ON
 - removed BR python-devel