From 16934624d6707179aa23d72fabbab86bffc535c9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Apr 12 2016 23:26:22 +0000
Subject: fix build, kde-l10n-sr conflicts


---

diff --git a/kde-l10n.spec b/kde-l10n.spec
index 79ee28a..4adb21d 100644
--- a/kde-l10n.spec
+++ b/kde-l10n.spec
@@ -989,8 +989,9 @@ done
 for i in $(cat %{SOURCE1000}) ; do
   if [ -d "%{name}-$i-%{version}" ]; then
   pushd %{name}-$i-%{version}
-  for j in . *@* ; do
-    if [ -d $j ] ; then
+  for jj in 4/. 4/${i}/${i}@* ; do
+    j=$(basename ${jj})
+    if [ -d 4/${i}/${j} ] ; then
       # skip kdewebdev for now, because we're still shipping kdewebdev 3 due to Quanta
       sed -i -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' 4/$i/$j/messages/CMakeLists.txt
       if [ -e 4/$i/$j/docs/CMakeLists.txt ] ; then
@@ -1067,17 +1068,22 @@ for i in $(cat %{SOURCE1000}) ; do
 
     fi
   done
+  popd
   fi
 done
 
+
 %build
 for i in $(cat %{SOURCE1000}) ; do
+ if [ -d "%{name}-$i-%{version}" ]; then
+ pushd %{name}-$i-%{version}
   mkdir %{_target_platform}
   pushd %{_target_platform}
-  %{cmake_kde4} -DKDE_INSTALL_DATADIR:PATH=%{_kf5_datadir} ..
-  popd
-  make %{?_smp_mflags} -C %{_target_platform}
+  %{cmake_kde4} .. -DKDE_INSTALL_DATADIR:PATH=%{_kf5_datadir}
+  make %{?_smp_mflags}
   popd
+ popd
+ fi
 done
 
 
@@ -1801,7 +1807,9 @@ rm -rfv %{buildroot}%{_datadir}/locale/*/LC_SCRIPTS/ki18n5/
 
 %changelog
 * Tue Apr 12 2016 Rex Dieter <rdieter@fedoraproject.org> - 15.12.3-5
-- omit ksnapshot docs (#1325629), move patching to %%prep
+- move patching to %%prep
+- omit ksnapshot docs (#1325629)
+- kde-l10n-sr conflicts (#1326434)
 
 * Mon Apr 11 2016 Rex Dieter <rdieter@fedoraproject.org> - 15.12.3-4
 - omit kcm_activities.mo (#1325724)