From 328ef49a47e8ee2ecb0e4d6e43d185fb3aa85665 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Tue, 26 Aug 2014 19:38:10 +0200 Subject: [PATCH] - added the kdepim-4.11.90-install_kleopatra_headers.patch from Fedora - this patch lets build kde4-kopete with kleopatra support - rel 2 --- kde4-kdepim.spec | 7 +- ...im-4.11.90-install_kleopatra_headers.patch | 121 ++++++++++++++++++ 2 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 kdepim-4.11.90-install_kleopatra_headers.patch diff --git a/kde4-kdepim.spec b/kde4-kdepim.spec index 2c686f6..a0ca4a2 100644 --- a/kde4-kdepim.spec +++ b/kde4-kdepim.spec @@ -12,11 +12,12 @@ Summary(ru.UTF-8): Персональный планировщик (PIM) для Summary(uk.UTF-8): Персональный планувальник (PIM) для KDE Name: kde4-kdepim Version: 4.14.0 -Release: 1 +Release: 2 License: GPL Group: X11/Applications Source0: http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz # Source0-md5: 8ca97d2769f24afda2515c4bbc9873c3 +Patch0: kdepim-4.11.90-install_kleopatra_headers.patch Patch100: %{name}-branch.diff # http://mirrors.ludost.net/gentoo/distfiles/kleopatra-4.4.3-assuan2.patch.bz2 URL: http://www.kde.org/ @@ -644,6 +645,7 @@ libksieve, libmimelib. %prep %setup -q -n %{orgname}-%{version} +%patch0 -p1 #%patch100 -p1 %build @@ -1076,6 +1078,9 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) +%{_includedir}/kleo +%{_includedir}/kpgp +%{_includedir}/libkleopatraclient %attr(755,root,root) %{_libdir}/libakonadi_next.so #%attr(755,root,root) %{_libdir}/libakregatorinterfaces.so %attr(755,root,root) %{_libdir}/libcalendarsupport.so diff --git a/kdepim-4.11.90-install_kleopatra_headers.patch b/kdepim-4.11.90-install_kleopatra_headers.patch new file mode 100644 index 0000000..ab5fce5 --- /dev/null +++ b/kdepim-4.11.90-install_kleopatra_headers.patch @@ -0,0 +1,121 @@ +diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt +--- kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt 2013-11-16 13:17:30.289810575 -0600 +@@ -6,3 +6,7 @@ add_subdirectory(gui) + + add_subdirectory(tests) + ++install( ++ FILES kleopatraclient_export.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient ++ ) +diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt +--- kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 +@@ -72,3 +72,13 @@ else() + endif() + + install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS}) ++ ++install( ++ FILES ++ initialization.h ++ command.h ++ selectcertificatecommand.h ++ signencryptfilescommand.h ++ decryptverifyfilescommand.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core ++ ) +diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt +--- kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 +@@ -16,3 +16,9 @@ set_target_properties(kleopatraclientgui + ) + + install(TARGETS kleopatraclientgui ${INSTALL_TARGETS_DEFAULT_ARGS}) ++ ++install( ++ FILES ++ certificaterequester.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui ++ ) +diff -up kdepim-4.11.90/libkleo/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/libkleo/CMakeLists.txt +--- kdepim-4.11.90/libkleo/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/libkleo/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 +@@ -121,3 +121,61 @@ install ( FILES libkleopatrarc-win32.des + else () + install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc ) + endif () ++ ++install( FILES ++ kleo/kleo_export.h ++ kleo/enum.h ++ kleo/oidmap.h ++ kleo/cryptobackend.h ++ kleo/cryptobackendfactory.h ++ kleo/cryptoconfig.h ++ kleo/dn.h ++ kleo/job.h ++ kleo/keylistjob.h ++ kleo/keygenerationjob.h ++ kleo/abstractimportjob.h ++ kleo/importjob.h ++ kleo/importfromkeyserverjob.h ++ kleo/exportjob.h ++ kleo/changeexpiryjob.h ++ kleo/changeownertrustjob.h ++ kleo/downloadjob.h ++ kleo/deletejob.h ++ kleo/encryptjob.h ++ kleo/decryptjob.h ++ kleo/signjob.h ++ kleo/specialjob.h ++ kleo/verifydetachedjob.h ++ kleo/verifyopaquejob.h ++ kleo/decryptverifyjob.h ++ kleo/signencryptjob.h ++ kleo/signkeyjob.h ++ kleo/adduseridjob.h ++ kleo/refreshkeysjob.h ++ kleo/multideletejob.h ++ kleo/hierarchicalkeylistjob.h ++ kleo/keyfilter.h ++ kleo/keyfiltermanager.h ++ kleo/changepasswdjob.h ++ kleo/checksumdefinition.h ++ kleo/exception.h ++ kleo/kconfigbasedkeyfilter.h ++ kleo/listallkeysjob.h ++ kleo/stl_util.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel) ++ ++install ( FILES ++ ui/kdhorizontalline.h ++ ui/messagebox.h ++ ui/progressbar.h ++ ui/progressdialog.h ++ ui/keylistview.h ++ ui/keyselectiondialog.h ++ ui/keyrequester.h ++ ui/keyapprovaldialog.h ++ ui/dnattributeorderconfigwidget.h ++ ui/cryptoconfigmodule.h ++ ui/cryptoconfigdialog.h ++ ui/directoryserviceswidget.h ++ ui/filenamerequester.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel) +diff -up kdepim-4.11.90/libkpgp/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/libkpgp/CMakeLists.txt +--- kdepim-4.11.90/libkpgp/CMakeLists.txt.install_kleopatra_headers 2013-11-16 13:17:30.290810557 -0600 ++++ kdepim-4.11.90/libkpgp/CMakeLists.txt 2013-11-16 13:20:55.258111864 -0600 +@@ -35,3 +35,11 @@ add_subdirectory( tests ) + install(FILES kconf_update/kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) + install(PROGRAMS kconf_update/kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) + ++install(FILES ++ kpgp.h ++ kpgpbase.h ++ kpgpblock.h ++ kpgpkey.h ++ kpgpui.h ++ libkpgp_export.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel ) -- 2.44.0