[kdepim] rebase patch, use %%find_lang
Rex Dieter
rdieter at fedoraproject.org
Sat Jun 29 14:50:53 UTC 2013
commit 701fd807e06c6c4ba0a89cd2b0d57d465526d22f
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Jun 29 09:50:29 2013 -0500
rebase patch, use %%find_lang
... kdepim-4.10.90-install_kleopatra_headers.patch | 45 +++++++++----------
kdepim.spec | 10 +++--
2 files changed, 27 insertions(+), 28 deletions(-)
---
diff --git a/kdepim-4.9.95-install_headers.patch b/kdepim-4.10.90-install_kleopatra_headers.patch
similarity index 57%
rename from kdepim-4.9.95-install_headers.patch
rename to kdepim-4.10.90-install_kleopatra_headers.patch
index 7f85caa..148b191 100644
--- a/kdepim-4.9.95-install_headers.patch
+++ b/kdepim-4.10.90-install_kleopatra_headers.patch
@@ -1,6 +1,6 @@
-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
+diff -up kdepim-4.10.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_headers kdepim-4.10.90/kleopatra/libkleopatraclient/CMakeLists.txt
+--- kdepim-4.10.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_headers 2013-05-28 14:24:58.000000000 -0500
++++ kdepim-4.10.90/kleopatra/libkleopatraclient/CMakeLists.txt 2013-06-29 09:43:49.986594136 -0500
@@ -6,3 +6,7 @@ add_subdirectory(gui)
add_subdirectory(tests)
@@ -9,10 +9,10 @@ diff -up kdepim-4.9.95/kleopatra/libkleopatraclient/CMakeLists.txt.install-heade
+ FILES kleopatraclient_export.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient
+ )
-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)
+diff -up kdepim-4.10.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_headers kdepim-4.10.90/kleopatra/libkleopatraclient/core/CMakeLists.txt
+--- kdepim-4.10.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_headers 2013-06-10 13:52:48.000000000 -0500
++++ kdepim-4.10.90/kleopatra/libkleopatraclient/core/CMakeLists.txt 2013-06-29 09:43:49.986594136 -0500
+@@ -72,3 +72,13 @@ else()
endif()
install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -26,9 +26,9 @@ diff -up kdepim-4.9.95/kleopatra/libkleopatraclient/core/CMakeLists.txt.install-
+ decryptverifyfilescommand.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core
+ )
-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
+diff -up kdepim-4.10.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_headers kdepim-4.10.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt
+--- kdepim-4.10.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_headers 2013-05-28 14:24:58.000000000 -0500
++++ kdepim-4.10.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2013-06-29 09:43:49.987594125 -0500
@@ -16,3 +16,9 @@ set_target_properties(kleopatraclientgui
)
@@ -39,13 +39,14 @@ diff -up kdepim-4.9.95/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install-h
+ certificaterequester.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui
+ )
-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})
-
+diff -up kdepim-4.10.90/libkleo/CMakeLists.txt.install_headers kdepim-4.10.90/libkleo/CMakeLists.txt
+--- kdepim-4.10.90/libkleo/CMakeLists.txt.install_headers 2013-06-29 09:43:49.987594125 -0500
++++ kdepim-4.10.90/libkleo/CMakeLists.txt 2013-06-29 09:47:42.854124610 -0500
+@@ -117,3 +117,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
@@ -103,13 +104,9 @@ diff -up kdepim-4.9.95/libkleo/CMakeLists.txt.install-headers kdepim-4.9.95/libk
+ 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 -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
+diff -up kdepim-4.10.90/libkpgp/CMakeLists.txt.install_headers kdepim-4.10.90/libkpgp/CMakeLists.txt
+--- kdepim-4.10.90/libkpgp/CMakeLists.txt.install_headers 2013-05-28 14:24:58.000000000 -0500
++++ kdepim-4.10.90/libkpgp/CMakeLists.txt 2013-06-29 09:43:49.988594115 -0500
@@ -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 6ba9590..8d51a66 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -15,7 +15,8 @@ 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.9.95-install_headers.patch
+# for kopete-cryptography (mostly)
+Patch0: kdepim-4.10.90-install_kleopatra_headers.patch
## upstream patches
@@ -91,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_kleopatra_headers
%build
@@ -110,6 +111,8 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%find_lang %{name} --with-kde --without-mo --all-name
+
# not sure where this is coming from... -- Rex
chrpath --list %{buildroot}%{_kde4_bindir}/kabc2mutt && \
chrpath --delete %{buildroot}%{_kde4_bindir}/kabc2mutt
@@ -139,7 +142,7 @@ if [ $1 -eq 0 ] ; then
update-desktop-database -q &> /dev/null ||:
fi
-%files
+%files -f %{name}.lang
%doc README
%doc COPYING
%{_kde4_bindir}/*
@@ -192,7 +195,6 @@ fi
%{_kde4_libexecdir}/kalarm_helper
%{_datadir}/dbus-1/system-services/org.kde.kalarmrtcwake.service
%{_datadir}/polkit-1/actions/org.kde.kalarmrtcwake.policy
-%{_kde4_docdir}/HTML/en/*
%{_mandir}/man*/*.gz
%post libs -p /sbin/ldconfig
More information about the scm-commits
mailing list