[kdepim] 4.9.95
Rex Dieter
rdieter at fedoraproject.org
Sun Dec 23 22:14:17 UTC 2012
commit 8c22a5c916afcf611feb6026b668f597e5cfce34
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sun Dec 23 16:14:21 2012 -0600
4.9.95
update to 4.9.95 (again), preserving -devel subpkg and
rebase install_headers.patch
.gitignore | 2 +-
...rs.patch => kdepim-4.9.95-install_headers.patch | 55 ++++++++++----------
kdepim.spec | 12 +++--
sources | 2 +-
4 files changed, 37 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f1a3d7..90d017a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +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.9.95-install_headers.patch
similarity index 57%
rename from kdepim-4.5.85-install-headers.patch
rename to kdepim-4.9.95-install_headers.patch
index 5612757..7f85caa 100644
--- a/kdepim-4.5.85-install-headers.patch
+++ b/kdepim-4.9.95-install_headers.patch
@@ -1,22 +1,22 @@
-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 @@
+diff -up kdepim-4.9.95/kleopatra/libkleopatraclient/CMakeLists.txt.install-headers kdepim-4.9.95/kleopatra/libkleopatraclient/CMakeLists.txt
+--- kdepim-4.9.95/kleopatra/libkleopatraclient/CMakeLists.txt.install-headers 2012-12-17 08:59:44.000000000 -0600
++++ kdepim-4.9.95/kleopatra/libkleopatraclient/CMakeLists.txt 2012-12-23 15:39:43.179789520 -0600
+@@ -6,3 +6,7 @@ add_subdirectory(gui)
- add_subdirectory( tests )
+ 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}
- )
-
--
+diff -up kdepim-4.9.95/kleopatra/libkleopatraclient/core/CMakeLists.txt.install-headers kdepim-4.9.95/kleopatra/libkleopatraclient/core/CMakeLists.txt
+--- kdepim-4.9.95/kleopatra/libkleopatraclient/core/CMakeLists.txt.install-headers 2012-12-17 08:59:44.000000000 -0600
++++ kdepim-4.9.95/kleopatra/libkleopatraclient/core/CMakeLists.txt 2012-12-23 15:40:21.725318920 -0600
+@@ -72,3 +72,13 @@ else(WINCE)
+ endif()
+
+ install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS})
++
+install(
+ FILES
+ initialization.h
@@ -26,22 +26,23 @@ diff -ur kdepim-4.5.85/kleopatra/libkleopatraclient/core/CMakeLists.txt kdepim-4
+ 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}
- )
+diff -up kdepim-4.9.95/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install-headers kdepim-4.9.95/kleopatra/libkleopatraclient/gui/CMakeLists.txt
+--- kdepim-4.9.95/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install-headers 2012-12-17 08:59:44.000000000 -0600
++++ kdepim-4.9.95/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2012-12-23 15:40:45.286032483 -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 -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 @@
+diff -up kdepim-4.9.95/libkleo/CMakeLists.txt.install-headers kdepim-4.9.95/libkleo/CMakeLists.txt
+--- kdepim-4.9.95/libkleo/CMakeLists.txt.install-headers 2012-12-17 08:59:44.000000000 -0600
++++ kdepim-4.9.95/libkleo/CMakeLists.txt 2012-12-23 15:27:21.303870886 -0600
+@@ -112,6 +112,64 @@ endif(WIN32)
set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -106,10 +107,10 @@ diff -ur kdepim-4.5.85/libkleo/CMakeLists.txt kdepim-4.5.85-install-headers/libk
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 @@
+diff -up kdepim-4.9.95/libkpgp/CMakeLists.txt.install-headers kdepim-4.9.95/libkpgp/CMakeLists.txt
+--- kdepim-4.9.95/libkpgp/CMakeLists.txt.install-headers 2012-12-17 08:59:44.000000000 -0600
++++ kdepim-4.9.95/libkpgp/CMakeLists.txt 2012-12-23 15:27:21.303870886 -0600
+@@ -33,3 +33,11 @@ add_subdirectory( tests )
install(FILES kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
install(PROGRAMS kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
diff --git a/kdepim.spec b/kdepim.spec
index 013209b..73d5c0b 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -1,8 +1,8 @@
Name: kdepim
Summary: KDE PIM (Personal Information Manager) applications
Epoch: 7
-Version: 4.9.90
-Release: 1%{?dist}
+Version: 4.9.95
+Release: 2%{?dist}
License: GPLv2
URL: http://www.kde.org/
@@ -15,7 +15,7 @@ URL: http://www.kde.org/
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
+Patch0: kdepim-4.9.95-install_headers.patch
## upstream patches
@@ -92,7 +92,7 @@ Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%prep
%setup -q -n kdepim-%{version}%{?pre}
-%patch0 -p1 -b .install-headers
+%patch0 -p1 -b .install_headers
%build
@@ -162,7 +162,6 @@ fi
%{_kde4_appsdir}/kdepimwidgets/
%{_kde4_appsdir}/kjots/
%{_kde4_appsdir}/kleopatra/
-%{_kde4_appsdir}/kmail/
%{_kde4_appsdir}/kmail2/
%{_kde4_appsdir}/kmailcvt/
%{_kde4_appsdir}/knode/
@@ -211,6 +210,9 @@ fi
%changelog
+* Sun Dec 23 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.95-2
+- 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 87e4b55..8c5f6a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed9b299d6843708638f9c7805ff308a5 kdepim-4.9.90.tar.xz
+dd985cf3c31bd16f8394514ef70fa5cc kdepim-4.9.95.tar.xz
More information about the scm-commits
mailing list