From c2ef5b34f49e0c1566571dc44c8c7dc2d88acabf Mon Sep 17 00:00:00 2001 From: "T.J. Yang" Date: Wed, 31 May 2023 10:16:03 -0500 Subject: [PATCH 1/3] should b 755 mode --- release.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 release.sh diff --git a/release.sh b/release.sh old mode 100644 new mode 100755 From 287f710801cfb7fffedfaaa823147eecc319f3a4 Mon Sep 17 00:00:00 2001 From: "T.J. Yang" Date: Wed, 31 May 2023 12:44:44 -0500 Subject: [PATCH 2/3] remove '' after sed -i --- release.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/release.sh b/release.sh index 99aebcbc..3894d1a0 100755 --- a/release.sh +++ b/release.sh @@ -64,12 +64,15 @@ update_version_number() { echo "Current version is: ${current_version}" read -p "New version number: " new_version echo + echo "### Updating python2Makefile" + sedy -i "s/^VERSION.*=.*/VERSION = ${new_version}/" Makefile + echo "### Updating Makefile" - sed -i '' "s/^VERSION.*=.*/VERSION = ${new_version}/" Makefile + sed -i "s/^VERSION.*=.*/VERSION = ${new_version}/" Makefile echo "### Updating ${project_name}/__init__.py" - sed -i '' "s/^__version__.*/__version__ = '${new_version}'/" ${project_name}/__init__.py + sed -i "s/^__version__.*/__version__ = '${new_version}'/" ${project_name}/__init__.py echo "### Updating ${project_name}.spec" - sed -i '' "s/^Version: ${current_version}/Version: ${new_version}/" ${project_name}.spec + sed -i "s/^Version: ${current_version}/Version: ${new_version}/" ${project_name}.spec echo "### Updating rel-eng/packages/${project_name}" echo "${new_version}-${current_release} /" > rel-eng/packages/${project_name} } @@ -80,9 +83,9 @@ update_release_number() { read -p "New release number: " new_release echo echo "### Updating Makefile" - sed -i '' "s/^RELEASE.*=.*/RELEASE = ${new_release}/" Makefile + sed -i "s/^RELEASE.*=.*/RELEASE = ${new_release}/" Makefile echo "### Updating ${project_name}.spec" - sed -i '' "s/^%define release ${current_release}/%define release ${new_release}/" ${project_name}.spec + sed -i "s/^%define release ${current_release}/%define release ${new_release}/" ${project_name}.spec echo "### Updating rel-eng/packages/${project_name}" #echo "${new_version}-${current_release} /" > rel-eng/packages/${project_name} echo "${new_version}-${new_release} /" > rel-eng/packages/${project_name} From 83b64a8462dd1f07f7b749f49a301568a4136487 Mon Sep 17 00:00:00 2001 From: "T.J. Yang" Date: Thu, 1 Jun 2023 04:58:35 -0500 Subject: [PATCH 3/3] release.sh and updated to point to python3 dependecy --- adagios.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/adagios.spec b/adagios.spec index a60a8d38..0f764b5b 100644 --- a/adagios.spec +++ b/adagios.spec @@ -7,7 +7,7 @@ %define release 1 Name: adagios -Version: 1.6.6 +Version: 2.0.1 Release: %{release}%{?dist} Summary: Web Based Nagios Configuration Group: Applications/Internet @@ -18,21 +18,21 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Prefix: %{_prefix} -BuildRequires: python2-devel -BuildRequires: python-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools Requires: pynag > 0.9.1 Requires: httpd -Requires: mod_wsgi +Requires: python3-mod_wsgi Requires: sudo -Requires: python-simplejson +Requires: python3-simplejson %if 0%{?rhel} == 6 Requires: python-django # Force django upgrade Conflicts: Django < 1.4.0 %else -Requires: python2-django16 +Requires: python3-django %endif %description @@ -68,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc README.md +#%doc README.md %{python_sitelib}/* %{_localstatedir}/lib/adagios/contrib/* %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/adagios.conf