Merge pull request #20 from ccdc-opensource/tkpatch_update_remove_files

Update build_conquest_python.py (NO_JIRA)

Author: jasonccole

build_conquest_python.py

@@ -181,17 +181,15 @@ def source_archives(self):
     def extract_source_archives(self):
         super().extract_source_archives()
         # Remove packages we don't want to build
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'sqlite3.34.0')
-        shutil.rmtree(self.main_source_directory_path / 'pkgs' / 'tdbc1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcmysql1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcodbc1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcpostgres1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcsqlite3-1.1.2')
+        sp = Path(self.main_source_directory_path / 'pkgs')
+        
+        sqlite_path = sp.glob('sqlite*')
+        for file in sqlite_path:
+            shutil.rmtree(file)
+
+        tbc_path = sp.glob('tdbc*')
+        for file in tbc_path:
+            shutil.rmtree(file)
 
     @property
     def main_source_directory_path(self):
@@ -509,12 +507,12 @@ def arguments_to_configuration_script(self):
 
 class JpegPackage(InstallInConquestPythonBaseMixin, AutoconfMixin, NoArchiveMixin, Package):
     name = 'jpeg'
-    version = '9e'
+    version = '9f'
 
     @property
     def source_archives(self):
         return {
-            f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v9e.tar.gz'
+            f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v{self.version}.tar.gz'
         }