From 2fc3c9c40b02b81f44b2f6b777e39ffd8143ffb7 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 18 Feb 2022 16:46:03 +0100 Subject: [PATCH] Source build tarball and requirements removed --- fedora/SPECS/polemarch.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec index 06ad094..571f7c3 100644 --- a/fedora/SPECS/polemarch.spec +++ b/fedora/SPECS/polemarch.spec @@ -31,21 +31,14 @@ Vendor: VST Consulting License: AGPL-3+ AutoReq: No AutoProv: No -Source0: %name.tgz +# compiled binary tree: +Source0: %name-bin-%{version}.tar.gz Source1: %name-settings Source2: %name.service Source3: %name.tmpfiles.conf -# compiled binary tree: -Source10: %name-bin-%{version}.tar.gz # Note: these two packages must not be installed by distribution (fedora): python3-pyyaml, python3-blockdiag-devel # Build fails, if these two packages are installed! -BuildRequires: python3, openssl-devel, libyaml-devel, python3-mysql -BuildRequires: python3-sphinxcontrib-blockdiag, python3-virtualenv, openldap-devel -BuildRequires: python3-amqp, python3-vine, python3-billiard, python3-celery, python3-kombu -BuildRequires: python3-redis, python3-Cython, python3-django-timezone-field, python3-markdown2 -BuildRequires: python3-netaddr, python3-ldap, python3-smmap -#BuildRequires: nodejs-has-yarn, yarnpkg, nodejs >= 10.0 Requires: python3, openssl-devel, libxcrypt-compat Requires: python3-virtualenv, python3-mysql, python3-PyMySQL Requires: git @@ -63,7 +56,6 @@ Polemarch is service for orchestration infrastructure by ansible. Simply WEB gui for orchestration infrastructure by ansible playbooks. %prep -%setup -q -n %name %install #/usr/bin/make BUILD_DIR=%{buildroot} @@ -74,7 +66,7 @@ Simply WEB gui for orchestration infrastructure by ansible playbooks. # cd /root/rpmbuild/BUILDROOT/polemarch # tar czf ~/rpmbuild/SOURCES/polemarch-bin-1.7.3.tgz . # don't forget to replace version and release number! -tar xzf %{S:10} -C %{buildroot} +tar xzf %{S:0} -C %{buildroot} install -D %{S:1} %{buildroot}%{_sysconfdir}/%{namebase}/settings.ini install -D %{S:1} %{buildroot}%{_sysconfdir}/%{namebase}/settings.ini.template # fix for fedora rundir config: