From 4b72968beb3a185ba297e90a32bb8e1d04f66e67c654a884ab1e6027f9e71830 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 13 Dec 2011 17:13:54 +0000
Subject: [PATCH] Accepting request 96479 from
 home:coolo:branches:openSUSE:Factory

- the untranslated-desktop-file check is obsolete, in factory
  all .desktop files are trimmed and marked - in all other projects
  (including devel projects) %suse_update_desktop_file won't touch
  the files for translation only

OBS-URL: https://build.opensuse.org/request/show/96479
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=79
---
 DesktopTranslationCheck.py | 48 --------------------------------------
 rpmlint.changes            |  8 +++++++
 rpmlint.spec               | 13 ++++-------
 3 files changed, 13 insertions(+), 56 deletions(-)
 delete mode 100644 DesktopTranslationCheck.py

diff --git a/DesktopTranslationCheck.py b/DesktopTranslationCheck.py
deleted file mode 100644
index c738f6c..0000000
--- a/DesktopTranslationCheck.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# vim:sw=4:et
-#---------------------------------------------------------------
-# Module          : rpmlint
-# File            : DesktopTranslationCheck.py
-# Author          : Dirk Mueller
-# Purpose         : Check for untranslated desktop files
-#---------------------------------------------------------------
-
-from Filter import *
-import AbstractCheck
-import rpm
-import re
-import commands
-import Config
-
-desktop_re=re.compile('(services|applets)/.*\.desktop$')
-
-class DesktopCheck(AbstractCheck.AbstractFilesCheck):
-    def __init__(self):
-        AbstractCheck.AbstractFilesCheck.__init__(self, "DesktopTranslationCheck", ".*\.desktop$")
-
-    def check_file(self, pkg, filename):
-        if pkg.isSource() or filename in pkg.ghostFiles():
-            return
-
-        try:
-            f = open(pkg.dirName() + '/' + filename)
-        except Exception, e:
-            printWarning(pkg, "read-error", e)
-            return 0
-
-        found_desktop_group=False
-        for line in f:
-            if line.startswith('X-SuSE-translate='):
-                return
-            if line.startswith('[Desktop Entry]'):
-                found_desktop_group=True
-        if found_desktop_group:
-            printWarning(pkg, "untranslated-desktop-file", filename)
-
-check=DesktopCheck()
-
-if Config.info:
-    addDetails(
-'untranslated-desktop-file',
-"""Your desktop file hasn't been handled by %suse_update_desktop_file
-Please use it to make the desktop file translate-able by Novell translations."""
-)
diff --git a/rpmlint.changes b/rpmlint.changes
index 17cf2d8..ac273e4 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Dec 13 14:31:28 UTC 2011 - coolo@suse.com
+
+- the untranslated-desktop-file check is obsolete, in factory 
+  all .desktop files are trimmed and marked - in all other projects
+  (including devel projects) %suse_update_desktop_file won't touch
+  the files for translation only
+
 -------------------------------------------------------------------
 Mon Dec  5 15:57:28 CET 2011 - dmueller@suse.de
 
diff --git a/rpmlint.spec b/rpmlint.spec
index 3da8edb..0402aad 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -15,19 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 #!BuildIgnore: rpmlint-mini
 
 Name:           rpmlint
-BuildRequires:  rpm-python xz
+BuildRequires:  rpm-python
+BuildRequires:  xz
 Summary:        Rpm correctness checker
+License:        GPL-2.0+
+Group:          System/Packages
 Version:        1.3
-Release:        4
+Release:        0
 Source0:        http://rpmlint.zarb.org/download/rpmlint-%{version}.tar.xz
 Source1:        config
 Source1001:     config.in
-Source2:        DesktopTranslationCheck.py
 Source3:        DuplicatesCheck.py
 Source4:        CheckBuildRoot.py
 Source5:        CheckExecDocs.py
@@ -53,8 +53,6 @@ Source24:       pie.config
 Source25:       licenses.config
 Source100:      syntax-validator.py
 Url:            http://rpmlint.zarb.org/
-License:        GPL-2.0+
-Group:          System/Packages
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       rpm-python, /usr/bin/readelf, file, findutils, cpio, bash
 Requires:       desktop-file-utils
@@ -208,7 +206,6 @@ Authors:
 %patch89
 %patch90 -p1
 cp -p %{SOURCE1} .
-cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
 cp -p %{SOURCE4} .
 cp -p %{SOURCE5} .