rpms/kdepim/F-12 kdepim-4.4.0-install-headers.patch, NONE, 1.1 kdepim.spec, 1.248, 1.249
Kevin Kofler
kkofler at fedoraproject.org
Sat Feb 13 21:11:52 UTC 2010
Author: kkofler
Update of /cvs/pkgs/rpms/kdepim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21035/F-12
Modified Files:
kdepim.spec
Added Files:
kdepim-4.4.0-install-headers.patch
Log Message:
Sync from devel:
* Sat Feb 13 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-4
- ship -devel package again, kopete-cryptography needs it to build (#564406)
kdepim-4.4.0-install-headers.patch:
kleopatra/libkleopatraclient/CMakeLists.txt | 4 +
kleopatra/libkleopatraclient/core/CMakeLists.txt | 9 +++
kleopatra/libkleopatraclient/gui/CMakeLists.txt | 7 ++
libkleo/CMakeLists.txt | 56 +++++++++++++++++++++++
libkpgp/CMakeLists.txt | 9 +++
5 files changed, 85 insertions(+)
--- NEW FILE kdepim-4.4.0-install-headers.patch ---
Index: libkleo/CMakeLists.txt
===================================================================
--- libkleo/CMakeLists.txt (revision 1072331)
+++ libkleo/CMakeLists.txt (revision 1072330)
@@ -117,4 +117,60 @@
set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS})
+install( FILES
+ kleo/cryptplug.h
+ kleo/cryptplugfactory.h
+ kleo/cryptplugwrapper.h
+ kleo/cryptplugwrapperlist.h
+ 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
+ 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/backendconfigwidget.h
+ ui/dnattributeorderconfigwidget.h
+ ui/cryptoconfigmodule.h
+ ui/cryptoconfigdialog.h
+ ui/directoryserviceswidget.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel)
+
install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc )
Index: kleopatra/libkleopatraclient/gui/CMakeLists.txt
===================================================================
--- kleopatra/libkleopatraclient/gui/CMakeLists.txt (revision 1072331)
+++ kleopatra/libkleopatraclient/gui/CMakeLists.txt (revision 1072330)
@@ -19,4 +19,11 @@
TARGETS kleopatraclientgui
DESTINATION ${LIB_INSTALL_DIR}
)
+
+install(
+ FILES
+ certificaterequester.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui
+ )
+
Index: kleopatra/libkleopatraclient/core/CMakeLists.txt
===================================================================
--- kleopatra/libkleopatraclient/core/CMakeLists.txt (revision 1072331)
+++ kleopatra/libkleopatraclient/core/CMakeLists.txt (revision 1072330)
@@ -38,3 +38,12 @@
)
+install(
+ FILES
+ initialization.h
+ command.h
+ selectcertificatecommand.h
+ signencryptfilescommand.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core
+ )
+
Index: kleopatra/libkleopatraclient/CMakeLists.txt
===================================================================
--- kleopatra/libkleopatraclient/CMakeLists.txt (revision 1072331)
+++ kleopatra/libkleopatraclient/CMakeLists.txt (revision 1072330)
@@ -6,3 +6,7 @@
add_subdirectory( tests )
+install(
+ FILES kleopatraclient_export.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient
+ )
Index: libkpgp/CMakeLists.txt
===================================================================
--- libkpgp/CMakeLists.txt (revision 1072331)
+++ libkpgp/CMakeLists.txt (revision 1072330)
@@ -34,3 +34,12 @@
install(FILES kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
install(PROGRAMS 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 )
+
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-12/kdepim.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- kdepim.spec 10 Feb 2010 16:21:31 -0000 1.248
+++ kdepim.spec 13 Feb 2010 21:11:52 -0000 1.249
@@ -1,9 +1,11 @@
+# at least kopete-cryptography needs kdepim-devel to build
+%define devel 1
Name: kdepim
Summary: KDE PIM (Personal Information Manager) applications
Epoch: 6
Version: 4.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
Group: Applications/Productivity
@@ -11,6 +13,11 @@ URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?devel}
+# revert http://websvn.kde.org/?view=revision&revision=1072331
+Patch0: kdepim-4.4.0-install-headers.patch
+%endif
+
# http://bugzilla.redhat.com/show_bug.cgi?id=496988
Patch1: kdepim-4.3.1-kmail-saveAttachments.patch
@@ -96,6 +103,9 @@ Obsoletes: kdepim-devel < 6:4.3.95-1
%prep
%setup -q -n kdepim-%{version}%{?alphatag}
+%if 0%{?devel}
+%patch0 -p0 -b .install-headers
+%endif
%patch1 -p0 -b .kmail-saveAttachments
%patch100 -p1 -b .kontact-startup
@@ -221,6 +231,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Feb 13 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-4
+- ship -devel package again, kopete-cryptography needs it to build (#564406)
+
* Tue Feb 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.0-3
- drop BR: gnokii-devel (not used)
- drop var-tracking patch (gcc fixed)
More information about the scm-commits
mailing list