From c6c5c99aa89dfb8cc13b04be2bcf701b0113d4e7 Mon Sep 17 00:00:00 2001
From: zhangy1317 <zhangy1317@chinaunicom.cn>
Date: Mon, 17 May 2021 15:26:18 +0800
Subject: [PATCH] add spec and macros for python2 version

---
 macros.openstack-common    |  3 +--
 macros.openstack-openEuler |  6 +++++-
 openstack-macros.spec      | 12 +++++-------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/macros.openstack-common b/macros.openstack-common
index 109bdd9..115f8e2 100644
--- a/macros.openstack-common
+++ b/macros.openstack-common
@@ -1,5 +1,4 @@
 # Macros for building OpenStack RPMs.
-#
 
 #
 # OpenStack macros
@@ -16,7 +15,7 @@
 install -d -m 755 %{buildroot}/%{openstack_test_package_dir} \
 # Some packages differ here, try to install as much as possible: \
 cp -av \\\
-       README.md README.rst PKG-INFO .testr.conf .stestr.conf .*tests bin \\\
+       README.md README.rst PKG-INFO .testr.conf .*tests bin \\\
        etc examples run_tests.* setup.cfg setup.py \\\
        smoketests static test tests tools tox.ini \\\
    %{buildroot}/%{openstack_test_package_dir} || : \
diff --git a/macros.openstack-openEuler b/macros.openstack-openEuler
index 837263c..6542d52 100644
--- a/macros.openstack-openEuler
+++ b/macros.openstack-openEuler
@@ -1,4 +1,4 @@
-# OpenEuler macros
+# openEuler macros
 
 # Create given user with given group (to be used as %pre scriptlet for
 # openstack related daemons). Also migrates away from openstack- prefixed
@@ -66,5 +66,9 @@ sed -i "s/%{2}/%{1}_tests/g" $tempest_egg_path/PKG-INFO \
 %apache_user apache
 %apache_group apache
 
+
+#
+# ext_man is used by the singlespec macro but is not defined on Fedora
+#
 %ext_info .gz
 %ext_man .gz
diff --git a/openstack-macros.spec b/openstack-macros.spec
index b0389db..c4f5e45 100644
--- a/openstack-macros.spec
+++ b/openstack-macros.spec
@@ -1,8 +1,8 @@
 Name:           openstack-macros
-Version:        2021.1.5
-Release:        0%{?dist}
+Version:        2018.1.2
+Release:        0
 Summary:        OpenStack Packaging - RPM Macros
-License:        ASL 2.0
+License:        Apache-2.0
 Group:          Development/Libraries/Python
 URL:            https://wiki.openstack.org/wiki/Rpm-packaging
 Source1:        macros.openstack-common
@@ -21,12 +21,10 @@ packages.
 install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-common
 install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-openEuler
 
-
 %files
 %{_sysconfdir}/rpm/macros.openstack-common
 %{_sysconfdir}/rpm/macros.openstack-openEuler
 
 %changelog
-* Tue Jan 5 2021 joechan1988 <joseph.chn1988@gmail.com> - 2021.1.5
-- Added openEuler macros
-
+* Mon May 17 2021 openstack-sig <openstack@openeuler.org>
+- Package Spec generated
-- 
Gitee