Remove upstreamed patch for avoiding catalog conflicts with libkpeople

epel9
Dan Vrátil 10 years ago
parent 10cd83757a
commit f4fd609ddc

@ -17,9 +17,6 @@ URL: https://projects.kde.org/projects/frameworks/kpeople
%endif
Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
# use non-conflicting libkpeople5 translation catalog
Patch1: kpeople-catalog.patch
## Once ktp-kf5 stack is ready, can consider Obsoletes
#Obsoletes: libkpeople < 1.0
@ -54,15 +51,6 @@ developing applications that use %{name}.
%prep
%setup -q -n %{framework}-%{version}
%patch1 -p1 -b .catalog
for po in po/*/libkpeople.po ; do
pushd $(dirname $po)
mv libkpeople.po libkpeople5.po
popd
done
%build
mkdir %{_target_platform}
pushd %{_target_platform}

@ -1,12 +0,0 @@
diff -up kpeople-5.8.0/CMakeLists.txt.catalog kpeople-5.8.0/CMakeLists.txt
--- kpeople-5.8.0/CMakeLists.txt.catalog 2015-03-13 03:07:30.000000000 -0500
+++ kpeople-5.8.0/CMakeLists.txt 2015-04-07 16:42:40.806906451 -0500
@@ -30,7 +30,7 @@ include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
-add_definitions(-DTRANSLATION_DOMAIN=\"libkpeople\")
+add_definitions(-DTRANSLATION_DOMAIN=\"libkpeople5\")
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5People")
Loading…
Cancel
Save