fixup! rpm: merge packages and use build script

.circleci/config.yml

@@ -181,41 +181,41 @@ jobs:
       - get-rpm-repo
       - clone-toolchain
       - shallow-clone:
-          ref: merge-packages
+          ref: master
           dir: cheerp-internal
           remote: [email protected]:leaningtech/cheerp-internal.git
       - set-up-rpm-workspace
       - run:
           name: Setup tarball
           command: |
             cp -r cheerp-compiler/rpmbuild ~
-            mv cheerp-compiler "cheerp-test-$VERSION_NO"
-            tar -czvf "cheerp-test_$VERSION_NO.orig.tar.gz" \
-              "cheerp-test-$VERSION_NO/clang" \
-              "cheerp-test-$VERSION_NO/llvm" \
-              "cheerp-test-$VERSION_NO/cmake" \
-              "cheerp-test-$VERSION_NO/compiler-rt" \
-              "cheerp-test-$VERSION_NO/libcxx" \
-              "cheerp-test-$VERSION_NO/libcxxabi" \
-              "cheerp-test-$VERSION_NO/runtimes" \
-              "cheerp-test-$VERSION_NO/third-party" \
-              "cheerp-test-$VERSION_NO/cheerp-libs" \
-              "cheerp-test-$VERSION_NO/cheerp-musl" \
-              "cheerp-test-$VERSION_NO/cheerp-utils" \
-              "cheerp-test-$VERSION_NO/debian"
+            mv cheerp-compiler "cheerp-core-$VERSION_NO"
+            tar -czvf "cheerp-core_$VERSION_NO.orig.tar.gz" \
+              "cheerp-core-$VERSION_NO/clang" \
+              "cheerp-core-$VERSION_NO/llvm" \
+              "cheerp-core-$VERSION_NO/cmake" \
+              "cheerp-core-$VERSION_NO/compiler-rt" \
+              "cheerp-core-$VERSION_NO/libcxx" \
+              "cheerp-core-$VERSION_NO/libcxxabi" \
+              "cheerp-core-$VERSION_NO/runtimes" \
+              "cheerp-core-$VERSION_NO/third-party" \
+              "cheerp-core-$VERSION_NO/cheerp-libs" \
+              "cheerp-core-$VERSION_NO/cheerp-musl" \
+              "cheerp-core-$VERSION_NO/cheerp-utils" \
+              "cheerp-core-$VERSION_NO/debian"
             mkdir ~/rpmbuild/SOURCES
-            mv -v "cheerp-test_$VERSION_NO.orig.tar.gz" ~/rpmbuild/SOURCES
+            mv -v "cheerp-core_$VERSION_NO.orig.tar.gz" ~/rpmbuild/SOURCES
       - run:
           name: Build cheerp-toolchain
           working_directory: ~
           command: |
-            sed -i "s/Version: .*/Version: $VERSION_NO/" ~/rpmbuild/SPECS/cheerp-test.spec
-            rpmbuild -ba ~/rpmbuild/SPECS/cheerp-test.spec
-            rpm --addsign ~/rpmbuild/RPMS/x86_64/cheerp-test-$VERSION_NO-1.el9.x86_64.rpm
+            sed -i "s/Version: .*/Version: $VERSION_NO/" ~/rpmbuild/SPECS/cheerp-core.spec
+            rpmbuild -ba ~/rpmbuild/SPECS/cheerp-core.spec
+            rpm --addsign ~/rpmbuild/RPMS/x86_64/cheerp-core-$VERSION_NO-1.el9.x86_64.rpm
       - run:
           name: Deploy rpm package
           command: |
-            cp ~/rpmbuild/RPMS/x86_64/cheerp-test-$VERSION_NO-1.el9.x86_64.rpm "$REPO_DIR/$CHAN"
+            cp ~/rpmbuild/RPMS/x86_64/cheerp-core-$VERSION_NO-1.el9.x86_64.rpm "$REPO_DIR/$CHAN"
             . ~/project/cheerp-internal/tools/releasing/rpm_utils.sh
             repo_update
       - when:

rpmbuild/SPECS/cheerp-test.spec → rpmbuild/SPECS/cheerp-core.spec

@@ -1,4 +1,4 @@
-Name: cheerp-test
+Name: cheerp-core
 Version: 3.0
 Release: 1%{?dist}
 Summary: A C++ compiler for the web