Update CHANGELOG for the upcoming v1.3

Fix the packaging process to use git describe as a reference Move the generated packages in the build directory, and fix the release and version format in the .spec Refactor and cleanup the .gitlab-ci file Move minimum version to PHP8.0
2026-01-17 10:08:05 +00:00 · 2022-11-14 16:17:24 +01:00 · 2022-11-14 16:17:24 +01:00 · 68b4f1df7f
commit 68b4f1df7f
parent 4292277037
12 changed files with 805 additions and 548 deletions
--- a/.gitlab-ci-files/deploy.yml
+++ b/.gitlab-ci-files/deploy.yml
@ -0,0 +1,43 @@
+centos7-deploy:
+  extends: .deploy
+  script:
+    - ./deploy_packages.sh centos
+  needs:
+    - centos7-package
+    - centos7-test
+
+rocky8-deploy:
+  extends: .deploy
+  script:
+    - ./deploy_packages.sh rockylinux
+  needs:
+    - rocky8-package
+    - rocky8-test
+
+debian11-deploy:
+  extends: .deploy
+  script:
+    - ./deploy_packages.sh debian bullseye
+  needs:
+    - debian11-package
+    - debian11-test
+
+.deploy:
+  stage: deploy
+  tags: ["docker"]
+  only:
+    refs:
+      - master
+
+  before_script:
+    - eval $(ssh-agent -s)
+    - echo "$DEPLOY_USER_KEY" | tr -d '\r' | ssh-add - > /dev/null
+    - mkdir -p ~/.ssh && chmod 700 ~/.ssh
+    - echo "$DEPLOY_SERVER_HOST_KEY" >> ~/.ssh/known_hosts
+    - |
+      curl -o deploy_packages.sh --header "PRIVATE-TOKEN: ${TOOLS_REPOSITORY_TOKEN}" https://gitlab.linphone.org/api/v4/projects/368/repository/files/deploy_packages.sh/raw
+    - chmod +x deploy_packages.sh
+
+  after_script:
+    - rm -rf ~/.ssh || true
+    - rm -rf deploy_packages.sh || true
--- a/.gitlab-ci-files/package.yml
+++ b/.gitlab-ci-files/package.yml
@ -0,0 +1,31 @@
+centos7-package:
+  extends: .package
+  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos7-php:$CENTOS_7_IMAGE_VERSION
+  script:
+    - make rpm-el7
+
+rocky8-package:
+  extends: .package
+  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php:$ROCKY_8_IMAGE_VERSION
+  script:
+    - make rpm
+
+debian11-package:
+  extends: .package
+  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11-php:$DEBIAN_11_IMAGE_VERSION
+  script:
+    - make deb
+
+.package:
+  tags: ["docker"]
+
+  stage: package
+  artifacts:
+    paths:
+      - build/*
+    when: always
+    expire_in: 1 day
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}
+    paths:
+      - flexiapi/vendor/
--- a/.gitlab-ci-files/test.yml
+++ b/.gitlab-ci-files/test.yml
@ -0,0 +1,55 @@
+centos7-test:
+  extends: .test
+  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos7-php:$CENTOS_7_IMAGE_VERSION
+  needs:
+    - centos7-package
+  script:
+    - yum -y localinstall build/*.rpm
+    - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
+    - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+    - php composer-setup.php
+    - php -r "unlink('composer-setup.php');"
+    - php composer.phar install
+    - vendor/bin/phpcs
+    - vendor/bin/phpmd . ansi phpmd.xml
+    - php artisan key:generate
+    - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
+
+rocky8-test:
+  extends: .test
+  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php:$ROCKY_8_IMAGE_VERSION
+  needs:
+    - rocky8-package
+  script:
+    - yum -y localinstall build/*.rpm
+    - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
+    - composer install
+    - vendor/bin/phpcs
+    - vendor/bin/phpmd . ansi phpmd.xml
+    - php artisan key:generate
+    - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
+
+debian11-test:
+  extends: .test
+  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11-php:$DEBIAN_11_IMAGE_VERSION
+  needs:
+    - debian11-package
+  script:
+    - pwd
+    - apt install -y ./build/*.deb
+    - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
+    - composer install --dev
+    - vendor/bin/phpcs
+    - vendor/bin/phpmd . ansi phpmd.xml
+    - php artisan key:generate
+    - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
+
+.test:
+  tags: ["docker"]
+  stage: test
+  artifacts:
+    paths:
+      - $CI_PROJECT_DIR/flexiapi_phpunit.log
+      - flexiapi/storage/logs/
+    when: always
+    expire_in: 1 day
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,206 +1,14 @@
-#################################################
-# Base configuration
-#################################################
+variables:
+  CENTOS_7_IMAGE_VERSION: 20221212_php803
+  ROCKY_8_IMAGE_VERSION: 20221212_php80
+  DEBIAN_11_IMAGE_VERSION: 20221212_php82
+
+include:
+  - '.gitlab-ci-files/package.yml'
+  - '.gitlab-ci-files/test.yml'
+  - '.gitlab-ci-files/deploy.yml'
+
 stages:
  - package
  - test
  - deploy
-
-.rpm:
-  tags: ["docker"]
-
-  stage: package
-  script:
-    - make rpm-dev
-  artifacts:
-    paths:
-      - rpmbuild/x86_64/*.rpm
-    when: always
-    expire_in: 1 year
-  cache:
-    key: ${CI_COMMIT_REF_SLUG}
-    paths:
-      - flexiapi/vendor/
-
-centos7-rpm:
-  extends: .rpm
-  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos7-php
-
-rocky8-rpm:
-  extends: .rpm
-  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php:2022_10_18_fix_centos_eol_repository
-
-centos7-rpm-test:
-  tags: ["docker"]
-  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos7-php
-  needs:
-    - centos7-rpm
-
-  stage: test
-  script:
-    - yum -y localinstall rpmbuild/x86_64/*.rpm
-    - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
-    - scl enable rh-php73 "vendor/bin/phpcs"
-    - scl enable rh-php73 "vendor/bin/phpmd . ansi phpmd.xml"
-    - scl enable rh-php73 "php artisan key:generate"
-    - scl enable rh-php73 "vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log"
-  artifacts:
-    paths:
-      - $CI_PROJECT_DIR/flexiapi_phpunit.log
-      - flexiapi/storage/logs/
-    when: always
-    expire_in: 1 day
-
-rocky8-rpm-test:
-  tags: ["docker"]
-  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php:2022_10_18_fix_centos_eol_repository
-  needs:
-    - rocky8-rpm
-
-  stage: test
-  script:
-    - yum -y localinstall rpmbuild/x86_64/*.rpm
-    - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
-    - vendor/bin/phpcs
-    - vendor/bin/phpmd . ansi phpmd.xml
-    - php artisan key:generate
-    - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
-  artifacts:
-    paths:
-      - $CI_PROJECT_DIR/flexiapi_phpunit.log
-      - flexiapi/storage/logs/
-    when: always
-    expire_in: 1 day
-
-debian11-deb-test:
-  tags: ["docker"]
-  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11-php:20221029_belledone_apt_repository
-  needs:
-    - debian11-deb
-
-  stage: test
-  script:
-    - sudo -s apt update
-    - sudo -s apt -y install bc-flexisip-account-manager
-    - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
-    - vendor/bin/phpcs
-    - vendor/bin/phpmd . ansi phpmd.xml
-    - php artisan key:generate
-    - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
-  artifacts:
-    paths:
-      - $CI_PROJECT_DIR/flexiapi_phpunit.log
-      - flexiapi/storage/logs/
-    when: always
-    expire_in: 1 day
-
-.package-deploy:
-  before_script:
-    - if ! [ -z ${SCP_PRIVATE_KEY+x} ]; then eval $(ssh-agent -s); fi
-    - if ! [ -z ${SCP_PRIVATE_KEY+x} ]; then echo "$SCP_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null; fi
-  stage: deploy
-
-.rpm-deploy:
-  script:
-    - cd rpmbuild/x86_64
-    - rsync -e "ssh -o StrictHostKeyChecking=no" -pr . $DEPLOY_SERVER:$DEPLOY_DIRECTORY_STATE;
-      ssh $DEPLOY_SERVER "chmod a+r $DEPLOY_DIRECTORY_STATE/*.rpm && createrepo_c --update $DEPLOY_DIRECTORY_STATE/.";
-  only:
-    refs:
-      - master
-    changes:
-      - flexisip-account-manager.spec
-
-  extends:
-    - .package-deploy
-
-.centos7-rpm-deploy:
-  extends: .rpm-deploy
-  tags: ["docker-centos7"]
-
-  needs:
-    - centos7-rpm
-
-centos7-rpm-deploy-stable:
-  extends: .centos7-rpm-deploy
-  variables:
-    DEPLOY_DIRECTORY_STATE: $CENTOS7_DEPLOY_DIRECTORY_STABLE
-
-centos7-rpm-deploy-alpha:
-  extends: .centos7-rpm-deploy
-  variables:
-    DEPLOY_DIRECTORY_STATE: $CENTOS7_DEPLOY_DIRECTORY_ALPHA
-
-.rocky8-rpm-deploy:
-  extends: .rpm-deploy
-  tags: ["docker"]
-  needs:
-    - rocky8-rpm
-
-# rocky8-rpm-deploy-stable:
-#   extends: .rocky8-rpm-deploy
-#   variables:
-#      DEPLOY_DIRECTORY_STATE: $CENTOS8_DEPLOY_DIRECTORY_STABLE
-
-rocky8-rpm-deploy-alpha:
-  extends: .rocky8-rpm-deploy
-  variables:
-    DEPLOY_DIRECTORY_STATE: $CENTOS8_DEPLOY_DIRECTORY_ALPHA
-
-debian11-deb:
-  tags: ["docker"]
-  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11-php:20220413_flexiapi_packaging
-
-  stage: package
-  script:
-    - make deb-dev
-  artifacts:
-    paths:
-      - ./*.deb
-    when: always
-    expire_in: 1 year
-  cache:
-    key: ${CI_COMMIT_REF_SLUG}
-    paths:
-      - flexiapi/vendor/
-
-.debian11-deploy:
-  extends: .package-deploy
-  tags: ["docker"]
-  image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11-php:20220413_flexiapi_packaging
-  needs:
-    - debian11-deb
-  variables:
-    RELEASE: bullseye
-    FREIGHT_PATH: $DEBIAN_FREIGHT_CONF_PATH
-  only:
-    refs:
-      - master
-    changes:
-      - flexisip-account-manager.spec
-
-  before_script:
-    - eval $(ssh-agent -s)
-    - echo "$DEPLOY_USER_KEY" | tr -d '\r' | ssh-add - > /dev/null
-    - mkdir -p ~/.ssh && chmod 700 ~/.ssh
-    - echo "$DEPLOY_SERVER_HOST_KEY" >> ~/.ssh/known_hosts
-  script:
-    - id=$(cat /dev/urandom | tr -dc '[:alnum:]' | fold -w 10 | head -n 1) || true
-    - tmpdir="$MAKE_REPO_TMP/tmp-$id" || true
-    - rsync_dest="$DEPLOY_SERVER:$tmpdir/"
-    - echo ">>> Pushing packages into '$rsync_dest'"
-    - rsync -rv *.deb $rsync_dest
-    - ssh $DEPLOY_SERVER "echo \">>>> Making repository with Freight\";  (freight add --conf=$FREIGHT_PATH $tmpdir/*.deb apt/$RELEASE/$BRANCH && freight cache --conf=$FREIGHT_PATH apt/$RELEASE) || exit 1; echo \">>>> Removing '$tmpdir'\"; rm -r $tmpdir"
-
-  after_script:
-    - rm -rf ~/.ssh || true
-
-debian11-stable-deploy:
-  extends: .debian11-deploy
-  variables:
-    BRANCH: stable
-
-debian11-alpha-deploy:
-  extends: .debian11-deploy
-  variables:
-    BRANCH: alpha
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,12 @@
 # Flexisip Account Manager Changelog

+v1.3
+----
+- Fix #58 Fix the packaging process to use git describe as a reference
+- Fix #58 Move the generated packages in the build directory, and fix the release and version format in the .spec
+- Fix #58 Refactor and cleanup the .gitlab-ci file
+- Move the minimum PHP version to 8.0
+
 v1.2
 ----

--- a/64
+++ b/64
@ -1,5 +1,27 @@
-$(eval GIT_DESCRIBE = $(shell sh -c "git describe"))
 OUTPUT_DIR = ${CURDIR}
+GIT_DESCRIBE = $(shell sh -c "git describe --long" 2>/dev/null)
+
+DESCRIBE_PARTS = $(subst -, ,$(GIT_DESCRIBE))
+VERSION_TAG = $(word 1,$(DESCRIBE_PARTS))
+STATUS_TAG = $(word 2,$(DESCRIBE_PARTS))
+STATUS_DISTANCE_TAG = $(word 3,$(DESCRIBE_PARTS))
+COMMIT_HASH_TAG = $(word 4,$(DESCRIBE_PARTS))
+CLEAN_COMMIT_HASH_TAG = $(COMMIT_HASH_TAG:g%=%)
+
+package-semvers:
+	mkdir -p build
+	cp flexisip-account-manager.spec flexisip-account-manager.spec.run
+	sed -i 's/MAKE_FILE_VERSION_SEARCH/$(VERSION_TAG)/g' $(CURDIR)/flexisip-account-manager.spec.run
+
+ifneq (,$(filter alpha beta,$(STATUS_TAG)))
+	sed -i 's/MAKE_FILE_BUILD_NUMBER_SEARCH/0.$(STATUS_TAG).$(STATUS_DISTANCE_TAG)+$(CLEAN_COMMIT_HASH_TAG)/g' $(CURDIR)/flexisip-account-manager.spec.run
+else
+	sed -i 's/MAKE_FILE_BUILD_NUMBER_SEARCH/1/g' $(CURDIR)/flexisip-account-manager.spec.run
+endif
+
+cleanup-package-semvers:
+	rm flexisip-account-manager.spec.run
+
 prepare:
 	cd flexiapi && php composer.phar install --no-dev

@ -31,7 +53,7 @@ package-common:
 	cp xmlrpc/README.md $(OUTPUT_DIR)/flexisip-account-manager/
 	cp -R httpd/ $(OUTPUT_DIR)/flexisip-account-manager/
 	cp -R cron/ $(OUTPUT_DIR)/flexisip-account-manager/
-	cp flexisip-account-manager.spec $(OUTPUT_DIR)/rpmbuild/SPECS/
+	cp flexisip-account-manager.spec.run $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec

 	tar cvf flexisip-account-manager.tar.gz -C $(OUTPUT_DIR) flexisip-account-manager
 	mv flexisip-account-manager.tar.gz $(OUTPUT_DIR)/rpmbuild/SOURCES/flexisip-account-manager.tar.gz
@ -40,26 +62,42 @@ package-end-common:
 	rm -rf $(OUTPUT_DIR)/flexisip-account-manager
 	rm -rf $(OUTPUT_DIR)/rpmbuild/SPECS $(OUTPUT_DIR)/rpmbuild/SOURCES $(OUTPUT_DIR)/rpmbuild/SRPMS $(OUTPUT_DIR)/rpmbuild/BUILD $(OUTPUT_DIR)/rpmbuild/BUILDROOT

+rpm-el7-only:
+	rpmbuild -v -bb --define 'dist .el7' --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec
+	@echo "📦✅ RPM Package Created"
+
+	mv rpmbuild/*/*.rpm build/.
+	rm -r rpmbuild
+
 rpm-only:
-	rpmbuild -v -bb --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec
-	@echo "== RPM Package Created =="
+	rpmbuild -v -bb --define 'dist .el8' --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec
+	@echo "📦✅ RPM Package Created"
+
+	@echo "🧹 Cleanup"
+	mv rpmbuild/*/*.rpm build/.
+	rm -r rpmbuild

 deb-only:
 	rpmbuild -v -bb --with deb --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmfilename tmp.rpm" --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec
-	fakeroot alien -g --scripts $(OUTPUT_DIR)/rpmbuild/tmp.rpm
+	fakeroot alien -g -k --scripts $(OUTPUT_DIR)/rpmbuild/tmp.rpm
 	rm -r $(OUTPUT_DIR)/rpmbuild
 	rm -rf $(OUTPUT_DIR)/*.orig
-	sed -i 's/Depends:.*/Depends: $${shlibs:Depends}, php, php-xmlrpc, php-pdo, php-gd, php-mysqlnd, php-mbstring, php-sqlite3/g' $(OUTPUT_DIR)/bc-flexisip-account-manager*/debian/control
-	cd `ls -rt $(OUTPUT_DIR) | tail -1` && dpkg-buildpackage --no-sign
-	@echo "== DEB Package Created =="
+	sed -i 's/Depends:.*/Depends: $${shlibs:Depends}, php, php-xml, php-pdo, php-gd, php-mysql, php-mbstring, php-sqlite3/g' $(OUTPUT_DIR)/bc-flexisip-account-manager*/debian/control

-	# Cleanup
+	cd `ls -rt $(OUTPUT_DIR) | tail -1` && dpkg-buildpackage --no-sign
+	@echo "📦✅ DEB Package Created"
+
+	@echo "🧹 Cleanup"
 	ls -d */ | cut -f1 -d'/' | grep bc-flexisip-account-manager | xargs rm -rf
 	ls bc-flexisip-account-manager* | grep -v deb | xargs rm

-rpm: prepare package-common rpm-only package-end-common
-rpm-dev: prepare-dev package-common rpm-only package-end-common
-deb: prepare package-common deb-only package-end-common
-deb-dev: prepare-dev package-common deb-only package-end-common
+	mv *.deb build/.
+
+rpm-el7: prepare package-semvers package-common rpm-el7-only cleanup-package-semvers package-end-common
+rpm: prepare package-semvers package-common rpm-only cleanup-package-semvers package-end-common
+rpm-dev-el7: prepare-dev package-semvers package-common rpm-el7-only cleanup-package-semvers package-end-common
+rpm-dev: prepare-dev package-semvers package-common rpm-only cleanup-package-semvers package-end-common
+deb: prepare package-semvers package-common deb-only cleanup-package-semvers package-end-common
+deb-dev: prepare-dev package-semvers package-common deb-only cleanup-package-semvers package-end-common

 .PHONY: rpm
--- a/docker/bc-dev-centos7-php.docker
+++ b/docker/bc-dev-centos7-php.docker
@ -1,10 +1,11 @@
 FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7
 USER root

+# Install Remi repository
+RUN yum install -y https://rpms.remirepo.net/enterprise/remi-release-7.rpm
+RUN yum-config-manager --enable remi-php80
+RUn yum -y update && yum -y upgrade
+
 # Install dependencies
 RUN yum -y install centos-release-scl.noarch sysvinit-tools
-RUN yum -y install composer.noarch rh-php73 rh-php73-php-mbstring
-RUN mkdir -p /usr/local/bin
-RUN echo -e "#!/usr/bin/bash\nsource scl_source enable rh-php73\nexec \"\$@\"\n" >> /usr/local/bin/entry-point.sh
-RUN chmod a+x  /usr/local/bin/entry-point.sh
-ENTRYPOINT ["/usr/local/bin/entry-point.sh"]
+RUN yum -y install php php-mbstring composer
--- a/docker/bc-dev-debian11-php.docker
+++ b/docker/bc-dev-debian11-php.docker
@ -1,9 +1,10 @@
 FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11:2022_10_13_update_docker_image
-
 MAINTAINER Peio Rigaux <peio.rigaux@belledonne-communications.com>
-
 USER root

+# Install Sury repository
+RUN curl -sSL https://packages.sury.org/php/README.txt | sudo bash -x
+
 # Install dependencies
 RUN apt update && apt -y install php php-xml php-curl composer rsync

--- a/docker/bc-dev-rocky8-php.docker
+++ b/docker/bc-dev-rocky8-php.docker
@ -1,8 +1,10 @@
 FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos8:2022_10_13_update_docker_image
 USER root

-# Install dependencies
+# Install Remi repository
+RUN dnf -y update
+RUN dnf -y install http://rpms.remirepo.net/enterprise/remi-release-8.5.rpm
+RUN dnf module enable php:remi-8.0 -y

-RUN yum -y install @php:7.3 php-mbstring
-RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer
-RUN mkdir -p /usr/local/bin
+# Install dependencies
+RUN dnf -y install php php-mbstring composer
--- a/flexiapi/composer.json
+++ b/flexiapi/composer.json
@ -8,7 +8,7 @@
    ],
    "license": "MIT",
    "require": {
-        "php": ">=7.3.0",
+        "php": ">=8.0",
        "anhskohbo/no-captcha": "^3.3",
        "doctrine/dbal": "^3.1",
        "endroid/qr-code": "^4.1",
@ -33,7 +33,7 @@
    },
    "config": {
        "platform": {
-            "php": "7.3"
+            "php": "8.0"
        },
        "optimize-autoloader": true,
        "preferred-install": "dist",
--- a/flexiapi/composer.lock
+++ b/flexiapi/composer.lock
--- a/flexisip-account-manager.spec
+++ b/flexisip-account-manager.spec
@ -1,14 +1,6 @@
 # -*- rpm-spec -*-
-#%define _prefix    @CMAKE_INSTALL_PREFIX@
-#%define pkg_prefix @BC_PACKAGE_NAME_PREFIX@

-# re-define some directories for older RPMBuild versions which don't. This messes up the doc/ dir
-# taken from https://fedoraproject.org/wiki/Packaging:RPMMacros?rd=Packaging/RPMMacros
-#%define _datarootdir       %{_prefix}/share
-#%define _datadir           %{_datarootdir}
-#%define _docdir            %{_datadir}/doc
-
-%define build_number 163
+%define build_number MAKE_FILE_BUILD_NUMBER_SEARCH
 %define var_dir /var/opt/belledonne-communications
 %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager

@ -21,9 +13,6 @@
 %define env_symlink_file %{opt_dir}/flexiapi/.env

 %bcond_with deb
-#%if %{build_number}
-#%define build_number_ext -%{build_number}
-#%endif

 %if %{with deb}
    %define web_user www-data
@ -33,27 +22,21 @@
 %endif

 Name:           bc-flexisip-account-manager
-Version:        1.2.0
+Version:        MAKE_FILE_VERSION_SEARCH
 Release:        %{build_number}%{?dist}
 Summary:        Web panel and a REST API to manage and handle Flexisip accounts related features. Only tested for Apache2.

 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.linphone.org
-#Source0:        %{name}-%{version}%{?build_number_ext}.tar.gz
 Source0:        flexisip-account-manager.tar.gz
-#BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-# dependencies

 #These are not indented because rpm cannot recognize "Requires" with spaces/tabs (???)

 %if "%{?dist}" == ".el7"
 Requires:       rh-php73-php rh-php73-php-gd rh-php73-php-xmlrpc rh-php73-php-pdo rh-php73-php-mysqlnd rh-php73-php-mbstring
 %define apache_conf_path /opt/rh/httpd24/root/etc/httpd/conf.d
-%endif
-
-%if "%{?dist}" == ".el8"
+%else
 Requires:       php php-gd php-xmlrpc php-pdo php-mysqlnd php-mbstring
 %define apache_conf_path /etc/httpd/conf.d
 %endif
@ -192,19 +175,3 @@ fi

 %clean
 rm -rf $RPM_BUILD_ROOT
-
-%changelog
-* Mon Oct 24 2022 Timothée Jaussoin <timothee.jaussoin@belledonne-communications.com>
- Release the 1.2 version, see CHANGELOG
-* Tue Oct 12 2021 Peio Rigaux <peio.rigaux@belledonne-communications.com>
- Adapted specfile to support Rocky Linux 8
-* Tue Sep 28 2021 Timothée Jaussoin <timothee.jaussoin@belledonne-communications.com>
- Install cron scripts
-* Sun Jan 5 2020 Timothée Jaussoin <timothee.jaussoin@belledonne-communications.com>
- Import and configure the new API package
-* Thu Jul 4 2019 Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
- New files layout
-* Fri Jun 28 2019 Johan Pascal <johan.pascal@belledonne-communications.com>
-
-* Fri May 18 2018 Matthieu TANON <matthieu.tanon@belledonne-communications.com>
- Initial RPM release.