update rpm spec to fix rpm build

* CLOUDBLD-3153

Signed-off-by: Harsh Modi <[email protected]>

Author: hjmodi

charon.spec

@@ -1,89 +1,97 @@
-%global binaries_py_version %{python3_version}
 %global owner Commonjava
-%global project charon
+%global modulename charon
+
+%global charon_version 1.1.2
+%global sdist_tar_name %{modulename}-%{charon_version}
+
+%global python3_pkgversion 3
+
+# Remove brp-python-bytecompile from os_install_post
+%global __os_install_post /usr/lib/rpm/brp-compress \
+  %{!?__debug_package:/usr/lib/rpm/brp-strip %{__strip}} \
+  /usr/lib/rpm/brp-strip-static-archive %{__strip} \
+  /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} \
+  /usr/lib/rpm/brp-python-hardlink
+
+Name:     %{modulename}
+Summary:  Charon CLI
+Version:  %{charon_version}
+Release:  1%{?dist}
+URL:      https://github.com/%{owner}/%{modulename}
+Source0:  %{url}/archive/%{charon_version}.tar.gz
+Provides: %{modulename} = %{version}-%{release}
+
+Group:    Development/Tools
+License:  APLv2
+
+# Build Requirements
+BuildArch: x86_64
+
+BuildRequires: python%{python3_pkgversion}-setuptools
+BuildRequires: python%{python3_pkgversion}-devel
+
+Requires: python%{python3_pkgversion}-boto3
+Requires: python%{python3_pkgversion}-botocore
+Requires: python%{python3_pkgversion}-jinja2
+Requires: python%{python3_pkgversion}-markupsafe
+Requires: python%{python3_pkgversion}-dateutil
+Requires: python%{python3_pkgversion}-six
+Requires: python%{python3_pkgversion}-jmespath
+Requires: python%{python3_pkgversion}-urllib3
+Requires: python%{python3_pkgversion}-s3transfer
+Requires: python%{python3_pkgversion}-click
+Requires: python%{python3_pkgversion}-requests
+Requires: python%{python3_pkgversion}-idna
+Requires: python%{python3_pkgversion}-chardet
+Requires: python%{python3_pkgversion}-cryptography
+Requires: python%{python3_pkgversion}-cffi
+Requires: python%{python3_pkgversion}-pycparser
+Requires: python%{python3_pkgversion}-certifi
+Requires: python%{python3_pkgversion}-pyOpenSSL
+Requires: python%{python3_pkgversion}-ruamel-yaml
+Requires: python%{python3_pkgversion}-defusedxml
+Requires: python%{python3_pkgversion}-semantic-version
+Requires: python%{python3_pkgversion}-subresource-integrity
+Requires: python%{python3_pkgversion}-jsonschema
+Requires: python%{python3_pkgversion}-importlib-metadata
+Requires: python%{python3_pkgversion}-zipp
+Requires: python%{python3_pkgversion}-attrs
+Requires: python%{python3_pkgversion}-pyrsistent
 
-Name:           %{project}
-Version:        1.0.0
-Release:        1%{?dist}
-
-Summary:        Charon CLI
-Group:          Development/Tools
-License:        APLv2
-URL:            https://github.com/%{owner}/%{project}
-Source0:        https://github.com/%{owner}/%{project}/archive/%{version}.tar.gz
-
-BuildArch:      noarch
-
-Requires:       python3-charon = %{version}-%{release}
-Requires:       git >= 1.7.10
-
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 
 %description
 Simple Python tool with command line interface for charon init,
 upload, delete, gen and ls functions.
 
-%package -n python3-charon
-Summary:        Python 3 CHARON library
-Group:          Development/Tools
-License:        APLv2
-Requires:       python3-requests
-Requires:       python3-setuptools
-Requires:       python3-rpm
-%{?python_provide:%python_provide python3-charon}
-
-%description -n python3-charon
-Simple Python 3 library for CHARON functions.
-
 %prep
-%setup -q
+%autosetup -p1 -n %{sdist_tar_name}
 
 %build
+# Disable debuginfo packages
+%define _enable_debug_package 0
+%define debug_package %{nil}
 %py3_build
 
 
 %install
+export LANG=en_US.UTF-8 LANGUAGE=en_US.en LC_ALL=en_US.UTF-8
 %py3_install
-mv %{buildroot}%{_bindir}/charon %{buildroot}%{_bindir}/charon-%{python3_version}
-ln -s %{_bindir}/charon-%{python3_version} %{buildroot}%{_bindir}/charon-3
-
-ln -s %{_bindir}/charon-%{binaries_py_version} %{buildroot}%{_bindir}/charon
-
-# ship charon in form of tarball so it can be installed within build image
-mkdir -p %{buildroot}/%{_datadir}/%{name}/
-cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/charon.tar.gz
-
-# setup docs
-#mkdir -p %{buildroot}%{_mandir}/man1
-#cp -a docs/manpage/charon.1 %{buildroot}%{_mandir}/man1/
 
 
 %files
+%defattr(-,root,root)
 %doc README.md
-#%{_mandir}/man1/charon.1*
+%{_bindir}/%{modulename}*
+%{python3_sitelib}/*
 %{!?_licensedir:%global license %doc}
 %license LICENSE
-%{_bindir}/charon
-
-%files -n python3-charon
-%doc README.md
-%{!?_licensedir:%global license %doc}
-%license LICENSE
-%{_bindir}/charon-%{python3_version}
-%{_bindir}/charon-3
-#%{_mandir}/man1/charon.1*
-%dir %{python3_sitelib}/charon
-%dir %{python3_sitelib}/charon/__pycache__
-%{python3_sitelib}/charon/*.*
-%{python3_sitelib}/charon/cmd
-%{python3_sitelib}/charon/pkgs
-%{python3_sitelib}/charon/utils
-%{python3_sitelib}/charon/__pycache__/*.py*
-%{python3_sitelib}/charon_*.egg-info
-%dir %{_datadir}/%{name}
-# ship charon in form of tarball so it can be installed within build image
-%{_datadir}/%{name}/charon.tar.gz
 
 
 %changelog
+* Tue Sep 20 2022 Harsh Modi <[email protected]>
+- 1.1.2 release
+- add configuration schema and validation
+- allow specifying multiple target buckets
+
+* Thu Aug 25 2022 Harsh Modi <[email protected]>
+- 1.1.1 release