[kdepim] Revert "fix build"

Sun Dec 23 22:14:12 UTC 2012

commit 28235858d1585b8124342bb43d38a5193462fbf7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Dec 23 15:26:37 2012 -0600

    Revert "fix build"
    
    This reverts commit f218a54248ab829d78004cc0efa24e24bac97a96.

 .gitignore                          |    1 -
 kdepim-4.5.85-install-headers.patch |  123 +++++++++++++++++++++++++++++++++++
 kdepim.spec                         |   18 +++--
 sources                             |    2 +-
 4 files changed, 135 insertions(+), 9 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 1457c04..4f1a3d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /kdepim-4.8.5.tar.xz
 /kdepim-4.9.4.tar.xz
 /kdepim-4.9.90.tar.xz
-/kdepim-4.9.95.tar.xz
diff --git a/kdepim-4.5.85-install-headers.patch b/kdepim-4.5.85-install-headers.patch
new file mode 100644
index 0000000..5612757
--- /dev/null
+++ b/kdepim-4.5.85-install-headers.patch
@@ -0,0 +1,123 @@
+diff -ur kdepim-4.5.85/kleopatra/libkleopatraclient/CMakeLists.txt kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/CMakeLists.txt
+--- kdepim-4.5.85/kleopatra/libkleopatraclient/CMakeLists.txt	2010-01-27 01:22:34.000000000 +0100
++++ kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/CMakeLists.txt	2010-12-08 14:40:45.000000000 +0100
+@@ -6,3 +6,7 @@
+ 
+ add_subdirectory( tests )
+ 
++install(
++  FILES kleopatraclient_export.h
++  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient
++  )
+diff -ur kdepim-4.5.85/kleopatra/libkleopatraclient/core/CMakeLists.txt kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/core/CMakeLists.txt
+--- kdepim-4.5.85/kleopatra/libkleopatraclient/core/CMakeLists.txt	2010-11-19 11:51:51.000000000 +0100
++++ kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/core/CMakeLists.txt	2010-12-08 14:42:12.000000000 +0100
+@@ -55,4 +55,12 @@
+   DESTINATION ${LIB_INSTALL_DIR}
+   )
+   
+-
++install(
++  FILES
++    initialization.h
++    command.h
++    selectcertificatecommand.h
++    signencryptfilescommand.h
++    decryptverifyfilescommand.h
++  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core
++  )
+diff -ur kdepim-4.5.85/kleopatra/libkleopatraclient/gui/CMakeLists.txt kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/gui/CMakeLists.txt
+--- kdepim-4.5.85/kleopatra/libkleopatraclient/gui/CMakeLists.txt	2010-07-29 11:58:45.000000000 +0200
++++ kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/gui/CMakeLists.txt	2010-12-08 14:42:41.000000000 +0100
+@@ -20,3 +20,8 @@
+   DESTINATION ${LIB_INSTALL_DIR}
+   )
+ 
++install(
++  FILES
++    certificaterequester.h
++  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui
++  )
+diff -ur kdepim-4.5.85/libkleo/CMakeLists.txt kdepim-4.5.85-install-headers/libkleo/CMakeLists.txt
+--- kdepim-4.5.85/libkleo/CMakeLists.txt	2010-12-01 23:23:12.000000000 +0100
++++ kdepim-4.5.85-install-headers/libkleo/CMakeLists.txt	2010-12-08 15:22:00.000000000 +0100
+@@ -112,6 +112,64 @@
+ set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
++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)
++
+ if ( WIN32 )
+ install ( FILES libkleopatrarc-win32.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc )
+ else ( WIN32 )
+diff -ur kdepim-4.5.85/libkpgp/CMakeLists.txt kdepim-4.5.85-install-headers/libkpgp/CMakeLists.txt
+--- kdepim-4.5.85/libkpgp/CMakeLists.txt	2010-07-29 11:59:00.000000000 +0200
++++ kdepim-4.5.85-install-headers/libkpgp/CMakeLists.txt	2010-12-08 14:43:33.000000000 +0100
+@@ -35,3 +35,11 @@
+ 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 )
diff --git a/kdepim.spec b/kdepim.spec
index 353fa88..013209b 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -1,7 +1,7 @@
 Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   7
-Version: 4.9.95
+Version: 4.9.90
 Release: 1%{?dist}
 
 License: GPLv2
@@ -14,6 +14,11 @@ URL:     http://www.kde.org/
 %endif
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+# revert http://websvn.kde.org/?view=revision&revision=1072331 (rebased to 4.6)
+Patch0:  kdepim-4.5.85-install-headers.patch
+
+## upstream patches
+
 Provides: kdepim4 = %{version}-%{release}
 
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -53,11 +58,11 @@ BuildRequires: zlib-devel
 # TODO: patch to use gpg2 (unconditionally or as in addition to gpg)
 Requires: gnupg
 %if 0%{?fedora}
-Requires: pinentry-gui
 ##Optional bits
-#Requires: spambayes
+Requires: pinentry-gui
+Requires: spambayes
 #Requires: spamassassin
-#Requires: bogofilter
+#{?fedora:Requires: bogofilter}
 %endif
 
 %description
@@ -87,6 +92,8 @@ Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %prep
 %setup -q -n kdepim-%{version}%{?pre}
 
+%patch0 -p1 -b .install-headers
+
 
 %build
 mkdir -p %{_target_platform}
@@ -204,9 +211,6 @@ fi
 
 
 %changelog
-* Thu Dec 20 2012 Rex Dieter <rdieter at fedoraproject.org> - 7:4.9.95-1
-- 4.9.95
-
 * Tue Dec 04 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.90-1
 - 4.9.90
 
diff --git a/sources b/sources
index 8c5f6a9..87e4b55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd985cf3c31bd16f8394514ef70fa5cc  kdepim-4.9.95.tar.xz
+ed9b299d6843708638f9c7805ff308a5  kdepim-4.9.90.tar.xz
