File tempoary_whitelist.patch of Package rpmlint-backports

Overview Repositories Revisions Requests Users Attributes Meta

File tempoary_whitelist.patch of Package rpmlint-backports (Revision ea26df2c4da6eee2f79e9c983aa5196a)

Currently displaying revision ea26df2c4da6eee2f79e9c983aa5196a , Show latest

--- a/rpmlint/BackportsPolicyChecks-15.config
+++ b/rpmlint/BackportsPolicyChecks-15.config
@@ -208,6 +208,10 @@ setOption('BackportsIgnoreConflicts', (
     'gnome-bluetooth-1',
     'libgnome-bluetooth13',
     'typelib-1_0-GnomeBluetooth-1_0',
+# protobuf is not a ABI compatible package, provide protobuf21 for the backward compatibility
+    'protobuf21-devel',
+    'python3-protobuf21',
+    're2-10-devel',
 ))
 
 # Set this option to ignore conflicts to /etc/alternatives files or links
@@ -219,6 +223,7 @@ setOption('BackportsIgnoreConflicts', (
 setOption('BackportsIgnoreAlternatives', (
     '/etc/alternatives/cairosvg',
     '/etc/alternatives/clusterdb',
+    '/etc/alternatives/cpuinfo',
     '/etc/alternatives/createdb',
     '/etc/alternatives/createrepo',
     '/etc/alternatives/createrepo.8.gz',
@@ -229,6 +234,7 @@ setOption('BackportsIgnoreAlternatives',
     '/etc/alternatives/dropdb',
     '/etc/alternatives/dropuser',
     '/etc/alternatives/ecpg',
+    '/etc/alternatives/faker',
     '/etc/alternatives/ftp',
     '/etc/alternatives/ftp.1.gz',
     '/etc/alternatives/go',
@@ -268,7 +274,11 @@ setOption('BackportsIgnoreAlternatives',
     '/etc/alternatives/postgresql',
     '/etc/alternatives/postmaster',
     '/etc/alternatives/psql',
+    '/etc/alternatives/py.test-benchmark',
+    '/etc/alternatives/pytest-benchmark',
     '/etc/alternatives/pybind11-config',
+    '/etc/alternatives/qr',
+    '/etc/alternatives/qr.1.gz',
     '/etc/alternatives/rails',
     '/etc/alternatives/rails.ruby2.5',
     '/etc/alternatives/rake',
@@ -283,6 +293,7 @@ setOption('BackportsIgnoreAlternatives',
     '/etc/alternatives/thor',
     '/etc/alternatives/thor.ruby2.5',
     '/etc/alternatives/tqdm',
+    '/etc/alternatives/twine',
     '/etc/alternatives/usr-bin-ksh',
     '/etc/alternatives/vacuumdb',
     '/etc/alternatives/vacuumlo',
@@ -468,6 +479,24 @@ setOption('BackportsIgnoreFileConflicts'
         ['/usr/bin/tqdm'],
     'python3-pyftpdlib':
         ['/usr/bin/ftpbench'],
+    # whitelist protobuf file conflicts, protobuf-devel has a Conflicts to
+    # protobuf21-devel
+    'protobuf21-devel':
+        ['/usr/bin/protoc',
+         '@/usr/include/google/protobuf/.*',
+         '/usr/lib64/libprotobuf-lite.so',
+         '/usr/lib64/libprotobuf.so',
+         '/usr/lib64/libprotoc.so',
+         '/usr/lib64/pkgconfig/protobuf-lite.pc',
+         '/usr/lib64/pkgconfig/protobuf.pc',
+         '/usr/share/vim/site/syntax/proto.vim'],
+    'python3-qrcode':
+        ['/usr/bin/qr'],
+    're2-10-devel':
+        ['@/usr/include/re2/.*',
+         '@/usr/lib64/cmake/re2/.*',
+         '/usr/lib64/libre2.so',
+         '/usr/lib64/pkgconfig/re2.pc'],
 })
 
 # Set this option to forbid any files that might not be tracked in the SLE
--- a/rpmlint/BackportsPolicyChecks.py
+++ b/rpmlint/BackportsPolicyChecks.py
@@ -22,7 +22,6 @@ DB_IMPORT_FAILED = 'BackportsDB_import_f
 policy = 'SUSE_Backports_policy-{}'.format
 PKG_CONFLICT = policy('SLE_conflict')
 NO_KMODS = policy('no_kernel_modules')
-RM_PYTHON_CONFLICT = policy('remove_python_conflict')
 NO_FORBIDDEN_FILES = policy('no_forbidden_files')
 
 # Ignored policies
@@ -137,11 +136,6 @@ class BackportsPolicyChecks(AbstractChec
             self._check_source(pkg)
             return
 
-        if pkg.name in self.pkgnames and pkg.name.startswith('python') and pkg.name not in IGNORE_CONFLICTS:
-            os.remove(pkg.filename)
-            printInfo(pkg, RM_PYTHON_CONFLICT, ' - Removing the package.')
-            return
-
         if pkg.name in self.pkgnames:
             if pkg.name in IGNORE_CONFLICTS:
                 printInfo(pkg, IGNORE_PKG_CONFLICT,
@@ -156,7 +150,6 @@ class BackportsPolicyChecks(AbstractChec
         conflicts = {}
         ignore_conflicts = {}
         ignore_alternatives = {}
-        remove_python_conflicts = {}
         forbidden_files = []
         for fname, pkgfile in pkg.files().items():
             tocheck = [fname]
@@ -209,13 +202,6 @@ class BackportsPolicyChecks(AbstractChec
                         ignore_alternatives.setdefault(package, set()).add(fname)
                     continue
 
-                # Handle python 2/3 conflicts when the package name has been
-                # changed and not caught with the same package name check.
-                if pkg.name.startswith('python') and pkg.name not in IGNORE_CONFLICTS:
-                    os.remove(pkg.filename)
-                    printInfo(pkg, RM_PYTHON_CONFLICT, ' - Removing the package.')
-                    return
-
                 for package in conflict:
                     conflicts.setdefault(package, set()).add(fname)
 
@@ -231,10 +217,6 @@ class BackportsPolicyChecks(AbstractChec
         if error:
             printError(pkg, PKG_CONFLICT, error)
 
-        error = self.process_conflicts(remove_python_conflicts)
-        if error:
-            printError(pkg, RM_PYTHON_CONFLICT, error)
-
         if forbidden_files:
             printError(pkg, NO_FORBIDDEN_FILES, '\n' + '\n'.join(forbidden_files))
 
@@ -276,18 +258,12 @@ Backports project."""
 no_kernel_modules_msg = """The package contains kernel modules. By policy kernel
 modules are prohibited in the openSUSE:Backports projects."""
 
-rm_python_conflict_msg = """The package is a python package that conflicts with
-a same package provided by SLE. Removing the package from the build set for
-the case that we want to provide the "other half" of a python singlespec
-build."""
-
 forbidden_files_msg = """The package contains some files that are flagged
 as forbidden in the Backports project."""
 
 if Config.info:
     addDetails(PKG_CONFLICT, package_conflict_msg,
                NO_KMODS, no_kernel_modules_msg,
-               RM_PYTHON_CONFLICT, rm_python_conflict_msg,
                NO_FORBIDDEN_FILES, forbidden_files_msg,
                DB_IMPORT_FAILED, db_import_failed_msg,
                IGNORE_PKG_CONFLICT, ignore_package_conflict_msg,
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ xdgconfigdir=/etc/xdg
 BACKPORTS=12
 
 all:
-	cd rpmlint; python -O -m py_compile *.py
+	cd rpmlint; python3 -O -m py_compile *.py
 	cd tool; python3 setup.py build '--executable=/usr/bin/python3 -s'
 
 test:

Places

File tempoary_whitelist.patch of Package rpmlint-backports (Revision ea26df2c4da6eee2f79e9c983aa5196a)

Places