diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | doc/RELEASE.md | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7609376..8a41214 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,7 +251,6 @@ configure_file( # Custom target to build mscp as a src.rpm in docker. set(RPMBUILDCONTAINER mscp-build-srpm) -set(SRPMFILE mscp-${MSCP_VERSION}-1.el9.src.rpm) execute_process( COMMAND ${CMAKE_SOURCE_DIR}/scripts/install-build-deps.sh --dont-install --platform Linux-rocky @@ -261,14 +260,13 @@ execute_process( add_custom_target(build-srpm COMMENT "Build mscp src.rpm inside a container" WORKING_DIRECTORY ${mscp_SOURCE_DIR} - BYPRODUCTS ${CMAKE_BINARY_DIR}/${SRPMFILE} COMMAND ${CE} build --build-arg REQUIREDPKGS=${REQUIREDPKGS_RPM} --build-arg MSCP_VERSION=${MSCP_VERSION} -t ${RPMBUILDCONTAINER} -f Dockerfile/build-srpm.Dockerfile . COMMAND ${CE} run --rm -v ${CMAKE_BINARY_DIR}:/out ${RPMBUILDCONTAINER} - cp /root/rpmbuild/SRPMS/${SRPMFILE} /out/) + bash -c "cp /root/rpmbuild/SRPMS/mscp-*.src.rpm /out/") ### single-binary-build-related definitions diff --git a/doc/RELEASE.md b/doc/RELEASE.md index 61cf47c..f1af47a 100644 --- a/doc/RELEASE.md +++ b/doc/RELEASE.md @@ -22,10 +22,12 @@ mscp_0.1.4_source.build mscp_0.1.4_source.changes ### To publush mscp in launchpad PPA: -1. write changes in `debian/changelog` at main branch (the date command needed here is `date -R`) +1. write changes in `debian/changelog` at main branch (the date + command needed here is `date -R`) 2. switch to `ppa-focal` or `ppa-jammy` branch 3. rebase to the `main` branch and modify `debian/changes`: - * change `UNRELEASED` to the release name (`focal` or `jammy`). + * change `mscp (X.X.X) UNRELEASED;` to `mscp (X.X.X-1~RELEASENAME) RELEASENAME;` + where `RELEASENAME` is `focal` or `jammy`. 4. run `make build-deb` at the build directory and `cd debbuild` 5. sign the files with `debsign -k [GPGKEYID] mscp_X.X.X~X_source.changes` 5. upload the files with `dput ppa:upaa/mscp mscp_X.X.X~X_source.changes` |