commit openstack-suse for openSUSE:Factory

29 Apr 2013

Hello community,

here is the log from the commit of package openstack-suse for openSUSE:Factory checked in at 2013-04-29 14:13:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-suse (Old)
 and      /work/SRC/openSUSE:Factory/.openstack-suse.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openstack-suse", Maintainer is ""

Changes:
--------
New Changes file:

--- /dev/null	2013-04-05 00:01:41.916011506 +0200
+++ /work/SRC/openSUSE:Factory/.openstack-suse.new/openstack-suse.changes	2013-04-29 14:13:58.000000000 +0200
@@ -0,0 +1,33 @@
+-------------------------------------------------------------------
+Mon Mar 18 18:35:36 UTC 2013 - dmueller@suse.com
+
+- copy PKG-INFO as well for nova testsuite 
+
+-------------------------------------------------------------------
+Mon Feb 25 13:00:25 UTC 2013 - saschpe@suse.de
+
+- Expand openstack_test_package_install macro to include horizon-specific
+  files
+
+-------------------------------------------------------------------
+Fri Feb 22 10:14:46 UTC 2013 - saschpe@suse.de
+
+- Renamed to openstack-suse to avoid confusion with upstream openstack-common
+
+-------------------------------------------------------------------
+Fri Jan 25 10:48:00 UTC 2013 - saschpe@suse.de
+
+- (Build)Require sudo in the openstack-commons-sudo package
+- Only create /etc/sudoers.d on SLE_11_SP2
+
+-------------------------------------------------------------------
+Fri Jan 25 07:45:53 UTC 2013 - saschpe@suse.de
+
+- Install /etc/sudoers.d on SLE
+- Added rpmlintrc
+
+-------------------------------------------------------------------
+Thu Jan 24 16:41:47 UTC 2013 - saschpe@suse.de
+
+- Initial version
+

New:
----
  macros.openstack
  openstack-skeleton.init
  openstack-suse.changes
  openstack-suse.spec
  rpmlintrc

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openstack-suse.spec ++++++
#
# spec file for package openstack-suse
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


Name:           openstack-suse
Version:        2013.11
Release:        0
Summary:        OpenStack SUSE
License:        Apache-2.0
Group:          Development/Libraries/Python
Url:            https://www.suse.com/products/suse-cloud/
Source1:        macros.openstack
Source2:        openstack-skeleton.init
Requires:       %{name}-sudo = %{version}
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildArch:      noarch
Requires:       openstack-suse-macros = %{version}
Requires:       openstack-suse-sudo = %{version}
#NOTE(saschpe): We don't provide openstack-common here to not
#               collide with upstream, sorry:
#Provides:       openstack-common = %%{version}
#Obsoletes:      openstack-common < %%{version}

%description
This packages pulls in various other utility packages that are mainly useful
for OpenStack packaging. Some are even only used at build-time.

%package macros
Summary:        OpenStack SUSE - RPM Macros
Group:          Development/Libraries/Python
Provides:       openstack-macros = %{version}
Obsoletes:      openstack-macros < %{version}
Provides:       openstack-common-macros = %{version}
Obsoletes:      openstack-common-macros < %{version}

%description macros
This package provides OpenStack RPM macros. You need it to build OpenStack
packages.

%package sudo
Summary:        OpenStack SUSE - Sudo Support
Group:          Development/Libraries/Python
# For directory ownership:
BuildRequires:  sudo
Requires:       sudo
Provides:       openstack-common-sudo = %{version}
Obsoletes:      openstack-common-sudo < %{version}

%description sudo
OpenStack packages install sudo configuration files for rootwrap binaries
in /etc/sudoers.d. This directory is disabled by default, thus this package
enables it in /etc/sudoers.

%prep

%build

%install
# Make the base package non-empty for now:
echo "OpenStack SUSE" > README

# Macros sub-package
install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.openstack
install -D -m755 %{SOURCE2} %{buildroot}%{_initddir}/openstack-skeleton

# Sudo sub-package, SLES sudo doesn't own /etc/sudoers.d, openSUSE-12.2 and later does:
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
install -d %{buildroot}%{_sysconfdir}/sudoers.d
%endif

# SLE_11_SP2 sudo package doesn't include this directory:
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%post sudo
if ! grep -qE "^#includedir /etc/sudoers.d" /etc/sudoers ; then
echo "#includedir /etc/sudoers.d" >> /etc/sudoers
fi

%postun sudo
sed -i "/^includedir \/etc\/sudoers\.d/d" /etc/sudoers
%endif

%files macros
%defattr(-,root,root)
%{_sysconfdir}/rpm/macros.openstack
%{_initddir}/openstack-skeleton

%files sudo
%defattr(-,root,root)
# SLE_11_SP2 sudo package doesn't create this directory, thus we have to own it:
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%dir %attr(0750, root, root) %{_sysconfdir}/sudoers.d
%endif

%changelog
++++++ macros.openstack ++++++
# Macros for building OpenStack RPMs.
#
# Copyright: (c) 2012 SUSE Linux Products GmbH

# Cleanup unnecessary files, avoid usage of 'git' to generate timestamps and
# do not use intersphinx module, it requires internet access and fix 
# non-executable scripts in Python module paths (sitelib/sitearch):
%openstack_cleanup_prep() \
find . -name "*.placeholder" -delete -print \
find . -name "*.git*" -delete -print \
sed -i -e "s|html_last_updated_fmt = .*|html_last_updated_fmt = '%{version}'|" doc/source/conf.py || : \
sed -i -e "s|'sphinx.ext.intersphinx',\\?||" doc/source/conf.py || : \
find %{component} -type f -exec sed -i "s|^#!.*||" {} \\; \
sed -i -e "/^\\[testenv\\]/ a\\sitepackages = True" tox.ini \
# We use obs-service-git_tarballs, thus we don't need to depend on python-setuptools-git: \
sed -i -e "s|'setuptools[-_]git.*'||" setup.py \
%nil


# If you only want to build man-pages, this macro is better than
# 'setup.py build_sphinx': it's slow and will generate errors. Instead,
# directly call sphinx-build on a copy of the man pages sources (to
# avoid having other docs to build)
%openstack_sphinx_build_manpages_only() \
mkdir doc/source-man \
cp -a doc/source/{conf.py,man} doc/source-man/ \
sphinx-build -b man doc/source-man/ doc/build/man/ \
rm -r doc/source-man doc/build/man/.doctrees \
%nil


# Installing init scripts is always done the same way. Arguments:
#  1) daemon name (lowercase, e.g. 'api' for 'nova-api')
#
# Flags:
#  -d Description
#  -s Should-Start/Stop LSB header content (optional, e.g 'rabbitmq-server postgresql')
%openstack_init_script_install(:d:s:) \
%define desc %{-d*}%{!-d:OpenStack} (%1) \
%define should %{-s*}%{!-s: } \
mkdir -p %{buildroot}%{_sbindir} \
tmp=$(mktemp) \
cat /etc/init.d/openstack-skeleton | sed -e "s/__COMPONENT__/%{component}/g" -e "s/__DAEMON__/%1/g" -e "s/__DESC__/%desc/g" > $tmp \
sed -i -e "s/__SHOULD__/%should/" $tmp \
install -D -m 755 $tmp %{buildroot}%{_initddir}/openstack-%{component}-%1 \
ln -s ../..%{_initddir}/openstack-%{component}-%1 %{buildroot}%{_sbindir}/rcopenstack-%{component}-%1 \
%nil


# Installing a test package is always done the same way:
%openstack_test_package_install() \
install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}-test \
# Some packages differ here, try to install as much as possible: \
cp -av README.md README.rst PKG-INFO .testr.conf .*tests bin etc examples manage.py openstack_dashboard run_tests.* setup.cfg setup.py smoketests static test tests tools tox.ini %{buildroot}%{_localstatedir}/lib/%{name}-test || : \
rm -rf %{buildroot}%{_localstatedir}/lib/%{name}-test/%{component} \
ln -s %{python_sitelib}/%{component} %{buildroot}%{_localstatedir}/lib/%{name}-test/%{component} \
%nil


# To generate self-signed certificates to be used in (demo) setups 
# with Apache2, you can use the following set of macros:

#NOTE: This one can't really be used in practice, the "build" script doesn't know this
#      macro, it would have to be put into the PrjConf, which doesn't seem worth it:
%openstack_apache_ssl_cert_requires() \
Requires(post): apache2-utils \
Requires(post): openssl \
Requires(post): sysconfig \
%nil

%openstack_apache_ssl_cert_install() \
install -d %{buildroot}%{_sysconfdir}/apache2/ssl.{crt,csr,key} \
install -d %{buildroot}/srv/www/htdocs \
touch %{buildroot}%{_sysconfdir}/apache2/ssl.key/%{name}-{ca,server}.key \
touch %{buildroot}%{_sysconfdir}/apache2/ssl.csr/%{name}-server.csr \
touch %{buildroot}%{_sysconfdir}/apache2/ssl.crt/%{name}-{ca,server}.crt \
%nil

#TODO: Parameterize so that one can set a custom domain, etc.
%openstack_apache_ssl_cert_post() \
if [ ! -s %{_sysconfdir}/apache2/ssl.csr/%{name}-server.csr ] ; then \
    (umask 377 ; /usr/bin/gensslcert -C %{name} -n %{name}.example.com) \
fi \
%nil

%openstack_apache_ssl_cert_files() \
%ghost %{_sysconfdir}/apache2/ssl.key/%{name}-*.key \
%ghost %{_sysconfdir}/apache2/ssl.csr/%{name}-server.csr \
%ghost %{_sysconfdir}/apache2/ssl.crt/%{name}-*.crt \
%nil
++++++ openstack-skeleton.init ++++++
#!/bin/sh

### BEGIN INIT INFO
# Provides:          openstack-__COMPONENT__-__DAEMON__
# Required-Start:    $network $remote_fs $syslog
# Required-Stop:     $remote_fs $syslog
# Should-Start:      __SHOULD__
# Should-Stop:       __SHOULD__
# Default-Start:     3 5
# Default-Stop:      0 1 2 6
# Short-Description: __DESC__
# Description:       __DESC__
### END INIT INFO

USER="openstack-__COMPONENT__"
FLAGFILE="/etc/__COMPONENT__/__COMPONENT__.conf"
LOGFILE="/var/log/__COMPONENT__/__DAEMON__.log"

[ -e "/etc/sysconfig/__COMPONENT__-__DAEMON__" ] && . "/etc/sysconfig/__COMPONENT__-__DAEMON__"
[ -e $LOGFILE ] || touch $LOGFILE && chown $USER. $LOGFILE

# Shell functions sourced from /etc/rc.status:
#      rc_check         check and set local and overall rc status
#      rc_status        check and set local and overall rc status
#      rc_status -v     be verbose in local rc status and clear it afterwards
#      rc_status -v -r  ditto and clear both the local and overall rc status
#      rc_status -s     display "skipped" and exit with status 3
#      rc_status -u     display "unused" and exit with status 3
#      rc_failed        set local and overall rc status to failed
#      rc_failed <num>  set local and overall rc status to <num>
#      rc_reset         clear both the local and overall rc status
#      rc_exit          exit appropriate to overall rc status
#      rc_active        checks whether a service is activated by symlinks
. /etc/rc.status

case "$1" in
    start)
	echo -n "Starting __COMPONENT__-__DAEMON__"
	startproc -s -u $USER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/__COMPONENT__-__DAEMON__ --flagfile=$FLAGFILE --logfile=$LOGFILE
        rc_status -v
        ;;
    stop)
	echo -n "Shutting down __COMPONENT__-__DAEMON__"
	killproc /usr/bin/__COMPONENT__-__DAEMON__
        rc_status -v
        ;;
    restart)
        $0 stop
	$0 start
	rc_status
        ;;
    reload)
        ;;
    status)
        echo -n "Checking __COMPONENT__-__DAEMON__"
	/sbin/checkproc /usr/bin/__COMPONENT__-__DAEMON__
	rc_status -v
        ;;
    condrestart|try-restart)
	if test "$1" = "condrestart"; then
		echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
	fi
	$0 status
	if test $? = 0; then
		$0 restart
	else
		rc_reset	# Not running is not a failure.
	fi
	rc_status
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}"
        exit 2
esac
exit $?
++++++ rpmlintrc ++++++
# RPM macros are not configuration:
addFilter("non-conffile-in-etc /etc/rpm/macros.openstack")
# The skeleton init script is just a skeleton, thus:
addFilter("non-conffile-in-etc /etc/init.d/openstack-skeleton")
addFilter("incoherent-init-script-name openstack-skeleton")
addFilter("suse-missing-rclink openstack-skeleton")
addFilter("init-script-without-%stop_on_removal-preun /etc/init.d/openstack-skeleton")
addFilter("init-script-without-%restart_on_update-postun /etc/init.d/openstack-skeleton")
addFilter("init-script-without-%insserv_cleanup-postun /etc/init.d/openstack-skeleton")
# NOTE(saschpe): Let's have an empty base package for now. We
#                reserve that as the chef-based openstack-quickstart replacement:
addFilter("openstack-suse-sudo.noarch: W: suse-filelist-empty")
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit openstack-suse for openSUSE:Factory

root＠hilbert.suse.de