Hello community,
here is the log from the commit of package openstack-macros for
openSUSE:Factory checked in at 2017-02-21 13:38:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-macros (Old)
and /work/SRC/openSUSE:Factory/.openstack-macros.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-macros"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-macros/openstack-macros.changes
2016-10-23 12:52:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openstack-macros.new/openstack-macros.changes
2017-02-21 13:38:55.381007406 +0100
@@ -1,0 +2,18 @@
+Fri Feb 10 13:42:44 UTC 2017 - tbecht...@suse.com
+
+- Update to version 2017.1:
+ * Add macros to handle -test packages
+ * Add py_req_cleanup macro to openstack-macros
+ * Add openstack_pre_user_group_create macro
+ * Added tempest plugin entrypoint macro
+ * Add missing unversioned %py* macros
+ * Obsoletes/Provides rdo-rpm-macros
+ * Improved entrypoint macro for tempest plugin
+
+-------------------------------------------------------------------
+Fri Dec 23 12:48:47 UTC 2016 - tbecht...@suse.com
+
+- Update to version 2016.2:
+ * Add py_req_cleanup macro to openstack-macros
+
+-------------------------------------------------------------------
Old:
----
openstack-macros-2016.2.tar.bz2
New:
----
openstack-macros-2017.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-macros.spec ++++++
--- /var/tmp/diff_new_pack.xcidkr/_old 2017-02-21 13:38:55.800948165 +0100
+++ /var/tmp/diff_new_pack.xcidkr/_new 2017-02-21 13:38:55.804947600 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openstack-macros
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%global rdo 1
%endif
Name: openstack-macros
-Version: 2016.2
+Version: 2017.1
Release: 0
Summary: OpenStack Packaging - RPM Macros
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.xcidkr/_old 2017-02-21 13:38:55.836943086 +0100
+++ /var/tmp/diff_new_pack.xcidkr/_new 2017-02-21 13:38:55.840942522 +0100
@@ -7,13 +7,13 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">openstack-macros</param>
- <param name="revision">stable/newton</param>
- <param name="version">2016.2</param>
+ <param name="revision">stable/ocata</param>
+ <param name="version">2017.1</param>
<param name="changesgenerate">enable</param>
<param name="subdir">openstack/openstack-macros</param>
</service>
<service name="recompress" mode="disabled">
- <param name="file">openstack-macros-2016.2.tar</param>
+ <param name="file">openstack-macros-2017.1.tar</param>
<param name="compression">bz2</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.xcidkr/_old 2017-02-21 13:38:55.860939701 +0100
+++ /var/tmp/diff_new_pack.xcidkr/_new 2017-02-21 13:38:55.860939701 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">g...@github.com:openstack/rpm-packaging.git</param>
- <param
name="changesrevision">95b7ff810d4bf10b4c495de0706d440f1d06c522</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">efbba0619459d435fb1a4615a42abd1fec0f1b6c</param></service></servicedata>
\ No newline at end of file
++++++ openstack-macros-2016.2.tar.bz2 -> openstack-macros-2017.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openstack-macros-2016.2/macros.openstack-common
new/openstack-macros-2017.1/macros.openstack-common
--- old/openstack-macros-2016.2/macros.openstack-common 2016-10-20
22:05:06.000000000 +0200
+++ new/openstack-macros-2017.1/macros.openstack-common 2017-02-09
11:37:55.000000000 +0100
@@ -7,6 +7,12 @@
%py_setup setup.py
+%py_shbang_opts -s
+
+%py_build() %{expand:\
+CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} build
--executable="%{__python2} %{py_shbang_opts}" %{?1}\
+}
+
%py2_shbang_opts -s
%py2_build() %{expand:\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openstack-macros-2016.2/macros.openstack-rdo
new/openstack-macros-2017.1/macros.openstack-rdo
--- old/openstack-macros-2016.2/macros.openstack-rdo 2016-10-20
22:05:06.000000000 +0200
+++ new/openstack-macros-2017.1/macros.openstack-rdo 2017-02-09
11:37:55.000000000 +0100
@@ -1 +1,90 @@
# RDO macros
+
+# Create given user with given group (to be used as %pre scriptlet for
+# openstack related daemons). Also migrates away from openstack- prefixed
+# users/group if it exists
+# Optional:
+# -u userid to pick
+# -g groupid to pick
+# -s shell to pick
+# Example: openstack_pre_user_group_create keystone keystone
+%openstack_pre_user_group_create(u:g:s:) \
+ getent group %2 >/dev/null || { \
+ groupadd -r %2 $oldg \
+ } \
+ getent passwd %1 >/dev/null || { \
+ useradd -r -g %2 %{-u:-u %{-u*}} -d %{_sharedstatedir}/%1 %{-s:-s
%{-s*}}%{!-s: -s /sbin/nologin} -c "OpenStack %1 Daemon" %1 \
+ } \
+%nil
+
+
+%py_req_cleanup rm -rf *requirements.txt
+
+# Create a fake tempest plugin entry point which will
+# resides under %{python2_sitelib}/%{service}_tests.egg-info.
+# The prefix is %py2_entrypoint %{modulename} %{service}
+# where service is the name of the openstack-service or the modulename
+# It should used under %install section
+# the generated %{python2_sitelib}/%{service}_tests.egg-info
+# will go under %files section of tempest plugin subpackage
+# Example: %py2_entrypoint %{modulename} %{service}
+# In most of the cases %{service} is same as %{modulename}
+# but in case of neutron plugins it is different
+# like servicename is neutron-lbaas and modulename is neutron_lbass
+%py2_entrypoint() \
+egg_path=%{buildroot}%{python2_sitelib}/%{1}-*.egg-info \
+tempest_egg_path=%{buildroot}%{python2_sitelib}/%{1}_tests.egg-info \
+mkdir $tempest_egg_path \
+grep "tempest\\|Tempest" %{1}.egg-info/entry_points.txt
>$tempest_egg_path/entry_points.txt \
+sed -i "/tempest\\|Tempest/d" $egg_path/entry_points.txt \
+cp -r $egg_path/PKG-INFO $tempest_egg_path \
+sed -i "s/%{2}/%{1}_tests/g" $tempest_egg_path/PKG-INFO \
+%nil
+
+
+# compat macros with Fedora
+%python_provide() %{lua:\
+ function string.starts(String,Start)\
+ return string.sub(String,1,string.len(Start))==Start\
+ end\
+ str = rpm.expand("%{?1:%{1}}");\
+ vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}")
+ if (string.starts(str, "python2-")) then\
+ print("Provides: python-");\
+ print(string.sub(str,9,string.len(str)));\
+ print(" = ");\
+ print(vr);\
+ --Obsoleting the previous default python package\
+ print("\\nObsoletes: python-");\
+ print(string.sub(str,9,string.len(str)));\
+ print(" < ");\
+ print(vr);\
+ elseif (string.starts(str, "python3-")) then\
+ --No unversioned provides as python3 is not default\
+ elseif (string.starts(str, "pypy-")) then\
+ --No unversioned provides as pypy is not default\
+ elseif (string.starts(str, "pypy3-")) then\
+ --No unversioned provides as pypy is not default\
+ elseif (string.starts(str, "python-")) then\
+ --Providing the current default python\
+ print("Provides: python2-");\
+ print(string.sub(str,8,string.len(str)));\
+ print(" = ");\
+ print(vr);\
+ else\
+ print("ERROR: ");\
+ print(str);\
+ print("not recognized.");\
+ end\
+}
+
+#
+# Missing systemd macros in EL7 (taken from systemd under GPL 2.1+)
+#
+%sysctl_apply() \
+/usr/lib/systemd/systemd-sysctl %{?*} >/dev/null 2>&1 || : \
+%{nil}
+
+%binfmt_apply() \
+/usr/lib/systemd/systemd-binfmt %{?*} >/dev/null 2>&1 || : \
+%{nil}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openstack-macros-2016.2/macros.openstack-suse
new/openstack-macros-2017.1/macros.openstack-suse
--- old/openstack-macros-2016.2/macros.openstack-suse 2016-10-20
22:05:06.000000000 +0200
+++ new/openstack-macros-2017.1/macros.openstack-suse 2017-02-09
11:37:55.000000000 +0100
@@ -9,3 +9,57 @@
%python2_sitearch %(%{__python2} -c "from distutils.sysconfig import
get_python_lib; print(get_python_lib(1))")
# Make %license work like %doc for now - discussion started with openSUSE
%_defaultlicensedir %_defaultdocdir
+
+%py_req_cleanup true
+
+# Create given user with given group (to be used as %pre scriptlet for
+# openstack related daemons). Also migrates away from openstack- prefixed
+# users/group if it exists
+# Optional:
+# -u userid to pick
+# -g groupid to pick
+# -s shell to pick
+# Example: openstack_pre_user_group_create keystone keystone
+%openstack_pre_user_group_create(u:g:s:) \
+ # Migrate away from old openstack- prefix \
+ oldu=$(getent passwd openstack-%1 |cut -d: -f3) || : \
+ [ -n "$oldu" ] && { \
+ oldu="-o -u $oldu" \
+ userdel openstack-%1 \
+ } \
+ getent group %2 >/dev/null || { \
+ # Migrate away from old openstack- prefix \
+ oldg=$(getent group openstack-%2 |cut -d: -f3) || : \
+ [ -n "$oldg" ] && oldg="-o -g $oldg" \
+ [ -n "$oldg" ] && groupdel openstack-%2 || : \
+ [ -z "$oldg" ] && oldg="%{-g:-g %{-g*}}" \
+ groupadd -r %2 $oldg \
+ } \
+ [ -z "$oldu" ] && oldu="%{-u:-u %{-u*}}" \
+ getent passwd %1 >/dev/null || { \
+ useradd -r -g %2 $oldu -d %{_localstatedir}/lib/%1 %{-s:-s
%{-s*}}%{!-s: -s /sbin/nologin} -c "OpenStack %1 Daemon" %1 \
+ } \
+%nil
+
+# Create a fake tempest plugin entry point which will
+# resides under %{python2_sitelib}/%{service}_tests.egg-info.
+# The prefix is %py2_entrypoint %{modulename} %{service}
+# where service is the name of the openstack-service or the modulename
+# It should used under %install section
+# the generated %{python2_sitelib}/%{service}_tests.egg-info
+# will go under %files section of tempest plugin subpackage
+# Example: %py2_entrypoint %{modulename} %{service}
+# In most of the cases %{service} is same as %{modulename}
+# but in case of neutron plugins it is different
+# like servicename is neutron-lbaas and modulename is neutron_lbass
+%py2_entrypoint() \
+egg_path=%{buildroot}%{python2_sitelib}/%{1}-*.egg-info \
+tempest_egg_path=%{buildroot}%{python2_sitelib}/%{1}_tests.egg-info \
+mkdir $tempest_egg_path \
+grep "tempest\\|Tempest" %{1}.egg-info/entry_points.txt
>$tempest_egg_path/entry_points.txt \
+sed -i "/tempest\\|Tempest/d" $egg_path/entry_points.txt \
+cp -r $egg_path/PKG-INFO $tempest_egg_path \
+sed -i "s/%{2}/%{1}_tests/g" $tempest_egg_path/PKG-INFO \
+%nil
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openstack-macros-2016.2/openstack-macros.spec.j2
new/openstack-macros-2017.1/openstack-macros.spec.j2
--- old/openstack-macros-2016.2/openstack-macros.spec.j2 2016-10-20
22:05:06.000000000 +0200
+++ new/openstack-macros-2017.1/openstack-macros.spec.j2 2017-02-09
11:37:55.000000000 +0100
@@ -2,7 +2,7 @@
%global rdo 1
%endif
Name: openstack-macros
-Version: 2016.2
+Version: 2017.1.5
Release: 0
Summary: OpenStack Packaging - RPM Macros
License: {{ license('Apache-2.0') }}
@@ -12,6 +12,12 @@
Source1: macros.openstack-suse
Source2: macros.openstack-rdo
BuildArch: noarch
+%if 0%{?rdo}
+Obsoletes: rdo-rpm-macros <= 1-3
+# Fake NVR to avoid dealing with epochs
+# just bump release field
+Provides: rdo-rpm-macros = 1-4
+%endif
%description
This package provides OpenStack RPM macros. You need it to build OpenStack
