[kde-l10n] drop kdepim pieces fix %%files Slovenian

Rex Dieter rdieter at fedoraproject.org
Thu Jun 30 20:27:12 UTC 2011


commit 0f9b923ce6c5e3254d7aa90ea765e5d5dcb21978
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 30 15:31:41 2011 -0500

    drop kdepim pieces
    fix %%files Slovenian

 kde-l10n.spec |   34 ----------------------------------
 sources       |    1 -
 2 files changed, 0 insertions(+), 35 deletions(-)
---
diff --git a/kde-l10n.spec b/kde-l10n.spec
index 799d86e..1cfdd40 100644
--- a/kde-l10n.spec
+++ b/kde-l10n.spec
@@ -1,10 +1,6 @@
 
 %define buildall 0
 
-%if 0%{?fedora} < 16
-%define kdepim44 1
-%endif
-
 Name: kde-l10n
 Version: 4.6.90
 Release: 1%{?dist}
@@ -74,8 +70,6 @@ Source80: ftp://ftp.kde.org/pub/src/unstable/%{version}/src/kde-l10n/%{name}-uk-
 Source81: ftp://ftp.kde.org/pub/src/unstable/%{version}/src/kde-l10n/%{name}-wa-%{version}.tar.bz2
 Source82: ftp://ftp.kde.org/pub/src/unstable/%{version}/src/kde-l10n/%{name}-zh_CN-%{version}.tar.bz2
 Source83: ftp://ftp.kde.org/pub/src/unstable/%{version}/src/kde-l10n/%{name}-zh_TW-%{version}.tar.bz2
-# copy from kde-l10n-4.4.5, it only contains kdepim translations
-Source500: kde-l10n-kdepim-4.4.5.tar.bz2
 Source1000: subdirs-kde-l10n
 
 
@@ -85,14 +79,6 @@ BuildRequires: gettext
 BuildRequires: kdelibs4-devel >= %{version} 
 
 Requires: kde-filesystem
-%if 0%{?kdepim44}
-#Conflicts: kdepim4 > 4.5.90
-#Conflicts: kdepim4-runtime > 4.5.90
-## or
-Conflicts: kde-l10n-kdepim > 4.5.90
-Conflicts: kde-l10n-kdepim-runtime > 4.5.90
-Provides:  kde-l10n-kdepim = 4.4.5-1
-%endif
 
 # klickety moved kde-i18n -> kde-l10n (#656523)
 Conflicts: kde-i18n < 1:3.5.10-13
@@ -791,17 +777,8 @@ done
 # upstream patches
 
 
-%if 0%{?kdepim44}
-bzip2 -dc %{SOURCE500} | tar -xf -
-%endif
-
-
 %build
 for i in $(cat %{SOURCE1000}) ; do
-  if [ -d "%{name}-$i-%{version}" -a -d "kde-l10n-4.4.5/kde-l10n-$i-4.4.5" ]; then
-    cp -a kde-l10n-4.4.5/kde-l10n-$i-4.4.5/* %{name}-$i-%{version}/
-    rm -rfv kde-l10n-4.4.5/kde-l10n-$i-4.4.5 
-  fi
   if [ -d "%{name}-$i-%{version}" ]; then
   pushd %{name}-$i-%{version}
   for j in . *@* ; do
@@ -811,14 +788,6 @@ for i in $(cat %{SOURCE1000}) ; do
       if [ -e $j/docs/CMakeLists.txt ] ; then
         sed -i -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' $j/docs/CMakeLists.txt
       fi
-%if !0%{?kdepim44}
-      # kdepim(-runtime) 4.6 includes its own translations, so blacklist
-      # kdepim-runtime translations included here by accident
-      sed -i -e 's/add_subdirectory( *kdepim-runtime *)/#add_subdirectory(kdepim-runtime)/g' $j/messages/CMakeLists.txt
-      if [ -e $j/docs/CMakeLists.txt ] ; then
-        sed -i -e 's/add_subdirectory( *kdepim-runtime *)/#add_subdirectory(kdepim-runtime)/g' $j/docs/CMakeLists.txt
-      fi
-%endif
       # remove lilo-config, conflicts with 3.5.10
       rm -f $j/messages/kdeadmin/kcmlilo.po
       if [ -e $j/docs/kdeadmin/CMakeLists.txt ] ; then
@@ -1436,9 +1405,6 @@ rm -rf %{buildroot}
 %lang(sl) %{_kde4_appsdir}/ktuberling/sounds/sl*
 %lang(sl) %{_kde4_appsdir}/khangman/sl.txt
 %lang(sl) %{_kde4_appsdir}/kvtml/sl/
-%lang(sl) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sl.xml
-%lang(sl) %{_kde4_appsdir}/kturtle/data/logokeywords.sl.xml
-%lang(sl) %{_kde4_appsdir}/kturtle/examples/sl/*.logo
 %lang(sl) %{_kde4_docdir}/HTML/sl/*
 
 %files Serbian
diff --git a/sources b/sources
index 999c3bb..06ae313 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-24952d788935fd32ffbe70e8e2bada1f  kde-l10n-kdepim-4.4.5.tar.bz2
 b370ffecfec8da16e894b70ef139138c  kde-l10n-ar-4.6.90.tar.bz2
 ae4f8f3c5279e21e00a63a03c2d15d0f  kde-l10n-bg-4.6.90.tar.bz2
 b83424af7b763c4c0029fa4c754093c0  kde-l10n-ca-4.6.90.tar.bz2


More information about the scm-commits mailing list