Compare commits

...

No commits in common. "c8" and "c8s" have entirely different histories.
c8 ... c8s

3 changed files with 6 additions and 37 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/ClusterLabs-resource-agents-e711383f.tar.gz
SOURCES/SAPHanaSR-6281418.tar.gz
SOURCES/SAPHanaSR-d1dde99.tar.gz

View File

@ -1,2 +1,2 @@
0358e1cb7fe86b2105bd2646cbe86f3c0273844a SOURCES/ClusterLabs-resource-agents-e711383f.tar.gz
8d25b08bed4b158d83a2884588a345374efdb500 SOURCES/SAPHanaSR-6281418.tar.gz
442679403d1287835841d70c5bef208a330c2c11 SOURCES/SAPHanaSR-d1dde99.tar.gz

View File

@ -23,12 +23,12 @@
%global upstream_version e711383f
%global saphana_prefix SAPHanaSR
%global saphana_version 6281418
%global saphana_version d1dde99
Name: resource-agents-sap-hana
Summary: SAP HANA cluster resource agents
Epoch: 1
Version: 0.162.1
Version: 0.154.0
Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+
URL: https://github.com/SUSE/SAPHanaSR
@ -72,8 +72,6 @@ sed -i -e '/ ocf_heartbeat_SAPInstance.7 \\/a\
# change provider company
sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{saphana_version}/srHook/SAPHanaSR.py
#%patch0 -p1
%build
if [ ! -f configure ]; then
./autogen.sh
@ -102,9 +100,8 @@ make install DESTDIR=%{buildroot}
find %{buildroot}/usr/lib/ocf ! -type d ! -iname "SAPHana*" -exec rm {} \;
find %{buildroot}/%{_mandir} -type f ! -iname "*SAPHana*" -exec rm {} \;
mkdir -p %{buildroot}/%{_datadir}/SAPHanaSR/srHook
cp -r %{saphana_prefix}-%{saphana_version}/srHook/global.ini %{buildroot}/%{_datadir}/SAPHanaSR/srHook
cp -r %{saphana_prefix}-%{saphana_version}/srHook/SAPHanaSR.py %{buildroot}/%{_datadir}/SAPHanaSR/srHook
mkdir %{buildroot}/%{_datadir}/SAPHanaSR
cp -r %{saphana_prefix}-%{saphana_version}/srHook %{buildroot}/%{_datadir}/SAPHanaSR
## tree fixup
# remove docs (there is only one and they should come from doc sections in files)
@ -130,34 +127,6 @@ rm -rf %{buildroot}
%exclude /usr/src
%changelog
* Mon Mar 20 2023 Janine Fuchs <jfuchs@redhat.com> - 0.162.1-2
- Rebase to SAPHanaSR 0.162.1 upstream release.
Resolves: rhbz#2165668
* Thu Feb 3 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-7
- SAPHana/SAPHanaTopology: follow OCF standard for version and OCF
version in metadata
Resolves: rhbz#2050205
* Tue Feb 1 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-6
- SAPHana/SAPHanaTopology: add systemd support
Resolves: rhbz#2026273
* Tue Nov 30 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-4
- SAPHana/SAPHanaTopology: remove HANA_CALL_TIMEOUT parameter from
metadata
Resolves: rhbz#2026727
* Thu Jul 22 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-3
- SAPHana: use actual_mode from global.ini and fallback to mode when
it's not set
Resolves: rhbz#1855885
* Fri Feb 14 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-2
- Rebase to SAPHanaSR 0.154.0 upstream release.