Changes to rpm build helper (#1228)

data/rpm_templates/artifacts.spec

@@ -17,6 +17,8 @@ Packager: Forensic artifacts <[email protected]>
 Url: https://github.com/ForensicArtifacts/artifacts
 BuildRequires: python3-devel, python3-setuptools
 
+%{{?python_disable_dependency_generator}}
+
 %description
 A free, community-sourced, machine-readable knowledge base of forensic artifacts that the world can use both as an information source and within other tools.
 

data/rpm_templates/plaso.spec

@@ -17,6 +17,8 @@ Packager: Log2Timeline maintainers <[email protected]>
 Url: https://github.com/log2timeline/plaso
 BuildRequires: python3-devel, python3-setuptools
 
+%{{?python_disable_dependency_generator}}
+
 %description
 Plaso (log2timeline) is a framework to create super timelines. Its purpose is to extract timestamps from various files found on typical computer systems and aggregate them.
 

l2tdevtools/build_helpers/rpm.py

@@ -199,25 +199,6 @@ def _GetFilenameSafeProjectInformation(self, source_helper_object):
 
     return project_name, project_version
 
-  def _GetSetupPySpecFilePath(self, source_helper_object, source_directory):
-    """Retrieves the path of the setup.py generated .spec file.
-
-    Args:
-      source_helper_object (SourceHelper): source helper.
-      source_directory (str): name of the source directory.
-
-    Returns:
-      str: path of the setup.py generated .spec file.
-    """
-    if self._project_definition.setup_name:
-      setup_name = self._project_definition.setup_name
-    else:
-      setup_name = source_helper_object.project_name
-
-    spec_filename = '{0:s}.spec'.format(setup_name)
-
-    return os.path.join(source_directory, 'dist', spec_filename)
-
   def _MoveFilesToCurrentDirectory(self, filenames_glob):
     """Moves files into the current directory.
 
@@ -461,17 +442,14 @@ def _GenerateSpecFile(
     if project_name.startswith('python-'):
       project_name = project_name[7:]
 
-    input_file_path = self._GetSetupPySpecFilePath(
-        source_helper_object, source_directory)
-
     spec_filename = '{0:s}.spec'.format(project_name)
     output_file_path = os.path.join(self._rpmbuild_specs_path, spec_filename)
 
     try:
       result = spec_file_generator.Generate(
           self._project_definition, source_directory, source_package_filename,
-          project_name, project_version, input_file_path, output_file_path)
-    except FileNotFoundError:
+          project_name, project_version, output_file_path)
+    except (FileNotFoundError, TypeError):
       result = False
 
     if not result:
@@ -739,17 +717,14 @@ def _GenerateSpecFile(
     if project_name.startswith('python-'):
       project_name = project_name[7:]
 
-    input_file_path = self._GetSetupPySpecFilePath(
-        source_helper_object, source_directory)
-
     spec_filename = '{0:s}.spec'.format(project_name)
     output_file_path = os.path.join(self._rpmbuild_specs_path, spec_filename)
 
     try:
       result = spec_file_generator.Generate(
           self._project_definition, source_directory, source_package_filename,
-          project_name, project_version, input_file_path, output_file_path)
-    except FileNotFoundError:
+          project_name, project_version, output_file_path)
+    except (FileNotFoundError, TypeError):
       result = False
 
     if not result:

l2tdevtools/dpkg_files.py

@@ -527,8 +527,8 @@ def _GenerateRulesFile(self, dpkg_path):
     if self._project_definition.build_system == 'configure_make':
       self._GenerateConfigureMakeRulesFile(dpkg_path)
 
-    elif self._project_definition.build_system in ('pyproject', 'setup_py'):
-      self._GenerateSetupPyRulesFile(dpkg_path)
+    else:
+      self._GeneratePyProjectRulesFile(dpkg_path)
 
     filename = os.path.join(dpkg_path, 'rules')
     stat_info = os.stat(filename)
@@ -563,7 +563,7 @@ def _GenerateConfigureMakeRulesFile(self, dpkg_path):
         self._project_definition.dpkg_template_rules,
         self._RULES_TEMPLATE_CONFIGURE_MAKE, template_values, output_filename)
 
-  def _GenerateSetupPyRulesFile(self, dpkg_path):
+  def _GeneratePyProjectRulesFile(self, dpkg_path):
     """Generates the dpkg build rules file.
 
     Args:

l2tdevtools/helpers/project.py

@@ -55,6 +55,7 @@ class ProjectHelper(cli.CLIHelper):
       'vstools',
       'winevt-kb',
       'winreg-kb',
+      'winshl-kb',
       'winsps-kb'])
 
   def __init__(self, project_path):