Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release.sh #680

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

release.sh #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2ef5b3
should b 755 mode
tjyang May 31, 2023
287f710
remove '' after sed -i
tjyang May 31, 2023
83b64a8
release.sh and updated to point to python3 dependecy
tjyang Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions adagios.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
13 changes: 8 additions & 5 deletions release.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
}
Expand All @@ -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}
Expand Down