dbld: fix rpm packaging

Signed-off-by: László Várady <[email protected]>

.github/workflows/stable-release.yml

@@ -69,19 +69,10 @@ jobs:
     name: axosyslog-modules
     needs: find-draft-release-run
     runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.unpack_tag.outputs.group1 }}
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
 
-      - name: Regex matching
-        uses: kaisugi/[email protected]
-        id: unpack_tag
-        with:
-          text: ${{ github.ref }}
-          regex: 'refs/tags/axosyslog-(.*)'
-
       - name: Create AxoSyslog modules tarball
         working-directory: docker
         run: |
@@ -93,13 +84,6 @@ jobs:
           name: axosyslog-modules-tarball
           path: docker/python-modules.tar.gz
 
-  publish-packages:
-    uses: ./.github/workflows/axosyslog-packages.yml
-    needs: axosyslog-modules
-    with:
-      repo: axoflow/axosyslog
-      version: ${{ needs.axosyslog-modules.outputs.version }}
-
   publish-image:
     uses: ./.github/workflows/axosyslog-docker.yml
     needs: axosyslog-modules

dbld/build.manifest

@@ -42,4 +42,4 @@ ubuntu-lunar		python3
 ubuntu-mantic		python3
 
 fedora			python3
-almalinux		python3
+almalinux		python3,noriemann,nokafka,nomqtt,nojava

dbld/builddeps

@@ -114,12 +114,10 @@ function add_copr_repo {
     case "${OS_DISTRIBUTION}" in
         centos|almalinux)
             $YUM_INSTALL yum-plugin-copr
-            yum copr enable -y czanik/syslog-ng-githead
             yum config-manager --set-enabled powertools
             ;;
         fedora)
             $DNF_INSTALL -y dnf-plugins-core
-            dnf copr enable -y czanik/syslog-ng-githead
             ;;
     esac
 }

packaging/rhel/syslog-ng.spec

@@ -1,12 +1,13 @@
-Name: syslog-ng
+Name: axosyslog
 Version: 4.7.1
 Release: 2%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
 License: GPLv2+
-URL: http://www.balabit.com/network-security/syslog-ng
-Source0: https://github.com/syslog-ng/syslog-ng/releases/download/syslog-ng-%{version}/%{name}-%{version}.tar.gz
+URL: https://axoflow.com/docs/axosyslog-core/
+# TODO use %{name} after next release
+Source0: https://github.com/axoflow/axosyslog/releases/download/%{name}-%{version}/syslog-ng-%{version}.tar.gz
 Source1: syslog-ng.conf
 Source2: syslog-ng.logrotate
 Source3: syslog-ng.service
@@ -129,16 +130,18 @@ Requires: logrotate
 Requires: ivykis >= %{ivykis_ver}
 
 Provides: syslog
+Conflicts: syslog-ng
+Conflicts: syslog-ng-premium-edition
 
 # Fedora 17’s unified filesystem (/usr-move)
 Conflicts: filesystem < 3
 
 %if 0%{?rhel} != 7
-Recommends: syslog-ng-logrotate
+Recommends: axosyslog-logrotate
 %endif
 
 %description
-syslog-ng is an enhanced log daemon, supporting a wide range of input and
+AxoSyslog is an enhanced log daemon, supporting a wide range of input and
 output methods: syslog, unstructured text, message queues, databases (SQL
 and NoSQL alike) and more.