Update charon.spec and pyproject.toml with version update

Author: ligangty

charon.spec

@@ -64,6 +64,23 @@ export LANG=en_US.UTF-8 LANGUAGE=en_US.en LC_ALL=en_US.UTF-8
 
 
 %changelog
+* Fri Jun 27 2025 Gang Li <[email protected]>
+- 1.4.0 release
+- Add RADAS signature support
+
+* Mon Jun 23 2025 Gang Li <[email protected]>
+- 1.3.4 release
+- Fix the sorting problem of index page items
+
+* Mon Dec 16 2024 Gang Li <[email protected]>
+- 1.3.3 release
+- Fix npm del error when deleting a package which has overlapped name with others
+- Some code refinement
+
+* Thu Jul 11 2024 Gang Li <[email protected]>
+- 1.3.2 release
+- Some updates in the Containerfile.
+
 * Tue May 7 2024 Gang Li <[email protected]>
 - 1.3.1 release
 - Add checksum refresh command: refresh checksum files for maven artifacts

pyproject.toml

@@ -4,11 +4,7 @@ requires = ["setuptools", "setuptools-scm"]
 
 [project]
 name = "charon"
-<<<<<<< HEAD
-version = "1.3.4"
-=======
 version = "1.4.0"
->>>>>>> 821599b (Update project version to 1.4.0)
 authors = [
   {name = "RedHat EXD SPMM"},
 ]