Hello community,
here is the log from the commit of package openstack-macros for openSUSE:Factory checked in at 2017-08-28 15:32:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-macros (Old)
and /work/SRC/openSUSE:Factory/.openstack-macros.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-macros"
Mon Aug 28 15:32:23 2017 rev:5 rq:518112 version:2017.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-macros/openstack-macros.changes 2017-04-11 09:46:16.591644574 +0200
+++ /work/SRC/openSUSE:Factory/.openstack-macros.new/openstack-macros.changes 2017-08-28 15:32:26.287925875 +0200
@@ -1,0 +2,15 @@
+Tue Aug 22 11:16:31 UTC 2017 - opensuse-packaging(a)opensuse.org
+
+- Update to version 2017.2:
+ * Add apache related macros
+ * Bump openstack-macros to include new Apache macros
+ * switch use of python_sitelib macro to python2_sitelib
+ * Added OpenStack Macros for fedora
+
+-------------------------------------------------------------------
+Thu Apr 06 11:17:24 UTC 2017 - tbechtold(a)suse.com
+
+- Update to version 2017.2:
+ * Bump openstack-macros to include new Apache macros
+
+-------------------------------------------------------------------
Old:
----
openstack-macros-2017.1.tar.bz2
New:
----
openstack-macros-2017.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-macros.spec ++++++
--- /var/tmp/diff_new_pack.axva8i/_old 2017-08-28 15:32:27.799713334 +0200
+++ /var/tmp/diff_new_pack.axva8i/_new 2017-08-28 15:32:27.835708273 +0200
@@ -20,7 +20,7 @@
%global rdo 1
%endif
Name: openstack-macros
-Version: 2017.1
+Version: 2017.2
Release: 0
Summary: OpenStack Packaging - RPM Macros
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.axva8i/_old 2017-08-28 15:32:28.015682971 +0200
+++ /var/tmp/diff_new_pack.axva8i/_new 2017-08-28 15:32:28.015682971 +0200
@@ -7,13 +7,13 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">openstack-macros</param>
- <param name="revision">stable/ocata</param>
- <param name="version">2017.1</param>
+ <param name="revision">stable/pike</param>
+ <param name="version">2017.2</param>
<param name="changesgenerate">enable</param>
<param name="subdir">openstack/openstack-macros</param>
</service>
<service name="recompress" mode="disabled">
- <param name="file">openstack-macros-2017.1.tar</param>
+ <param name="file">openstack-macros-2017.2.tar</param>
<param name="compression">bz2</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.axva8i/_old 2017-08-28 15:32:28.067675661 +0200
+++ /var/tmp/diff_new_pack.axva8i/_new 2017-08-28 15:32:28.071675099 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git@github.com:openstack/rpm-packaging.git</param>
- <param name="changesrevision">012c712ab8459abdab81b0250eb085c74a2cb344</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">773e227e95f47ac8e8ac298b5747ebb9b9a1580f</param></service></servicedata>
\ No newline at end of file
++++++ openstack-macros-2017.1.tar.bz2 -> openstack-macros-2017.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-macros-2017.1/macros.openstack-common new/openstack-macros-2017.2/macros.openstack-common
--- old/openstack-macros-2017.1/macros.openstack-common 2017-04-06 11:52:21.000000000 +0200
+++ new/openstack-macros-2017.2/macros.openstack-common 2017-08-17 17:33:49.000000000 +0200
@@ -43,5 +43,5 @@
smoketests static test tests tools tox.ini \\\
%{buildroot}/%{openstack_test_package_dir} || : \
rm -rf %{buildroot}/%{openstack_test_package_dir}/%1 \
-ln -s %{python_sitelib}/%1 %{buildroot}/%{openstack_test_package_dir}/%1 \
+ln -s %{python2_sitelib}/%1 %{buildroot}/%{openstack_test_package_dir}/%1 \
%nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-macros-2017.1/macros.openstack-fedora new/openstack-macros-2017.2/macros.openstack-fedora
--- old/openstack-macros-2017.1/macros.openstack-fedora 1970-01-01 01:00:00.000000000 +0100
+++ new/openstack-macros-2017.2/macros.openstack-fedora 2017-08-17 17:33:49.000000000 +0200
@@ -0,0 +1,65 @@
+# Fedora 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
+
+#
+# Macro for removing requirements.txt file
+#
+%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
+
+# Macro for creating a fake tempest plugin entrypoint
+# Usage: %py3_entrypoint %{modulename} %{service}
+%py3_entrypoint() \
+egg_path=%{buildroot}%{python3_sitelib}/%{1}-*.egg-info \
+tempest_egg_path=%{buildroot}%{python3_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
+
+#
+# Apache related macros
+#
+%apache_name httpd
+%apache_site_dir %{_sysconfdir}/%{apache_name}/conf.d/
+%apache_conf_dir %{_sysconfdir}/%{apache_name}/conf.d/
+%apache_user apache
+%apache_group apache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-macros-2017.1/openstack-macros.spec.j2 new/openstack-macros-2017.2/openstack-macros.spec.j2
--- old/openstack-macros-2017.1/openstack-macros.spec.j2 2017-04-06 11:52:21.000000000 +0200
+++ new/openstack-macros-2017.2/openstack-macros.spec.j2 2017-08-17 17:33:49.000000000 +0200
@@ -1,8 +1,8 @@
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel}
%global rdo 1
%endif
Name: openstack-macros
-Version: 2017.1.5
+Version: 2017.1.6
Release: 0
Summary: OpenStack Packaging - RPM Macros
License: {{ license('Apache-2.0') }}
@@ -11,6 +11,7 @@
Source0: macros.openstack-common
Source1: macros.openstack-suse
Source2: macros.openstack-rdo
+Source3: macros.openstack-fedora
BuildArch: noarch
%if 0%{?rdo}
Obsoletes: rdo-rpm-macros <= 1-3
@@ -35,6 +36,9 @@
%if 0%{?rdo}
install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-rdo
%endif
+%if 0%{?fedora}
+install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-fedora
+%endif
%files
%{_sysconfdir}/rpm/macros.openstack-common
@@ -44,6 +48,8 @@
%if 0%{?rdo}
%{_sysconfdir}/rpm/macros.openstack-rdo
%endif
+%if 0%{?fedora}
+%{_sysconfdir}/rpm/macros.openstack-fedora
+%endif
%changelog
-