[openlmi-scripts/epel7] rebased to 0.4.0
Michal Minar
miminar at fedoraproject.org
Fri Dec 12 15:22:42 UTC 2014
commit d986ecaeb27d3c7ee0ca18c797ad2ef6cd53f2c2
Author: Michal Minar <miminar at redhat.com>
Date: Thu Dec 11 08:46:11 2014 +0100
rebased to 0.4.0
New packages:
* locale
* realmd
* selinux
* sssd
Bundle all doc in doc package.
Signed-off-by: Michal Minar <miminar at redhat.com>
README-realmd.md | 2 +
README-selinux.md | 3 +
openlmi-scripts-0.3.0-doc_build.patch | 41 ----
...ipts-0.3.0-networking-fix-for-older-tools.patch | 18 --
openlmi-scripts-0.3.0-requirements.patch | 130 -----------
openlmi-scripts.spec | 239 ++++++++++++--------
...h => openlmi-tools-0.10.4-python-egg-name.patch | 4 +-
openlmi-tools-0.9.1-doc.patch | 109 ---------
openlmi-tools-0.9.1-setup.patch | 103 ---------
sources | 4 +-
10 files changed, 159 insertions(+), 494 deletions(-)
---
diff --git a/README-realmd.md b/README-realmd.md
new file mode 100644
index 0000000..569ff1f
--- /dev/null
+++ b/README-realmd.md
@@ -0,0 +1,2 @@
+Client library for OpenLMI Realmd provider allowing for joining or leaving AD
+or Kerberos domain.
diff --git a/README-selinux.md b/README-selinux.md
new file mode 100644
index 0000000..bd7a4dd
--- /dev/null
+++ b/README-selinux.md
@@ -0,0 +1,3 @@
+Client library for OpenLMI SELinux provider for displaying and adjusting
+current SELinux policy on a remote host with installed OpenLMI SELinux provider
+
diff --git a/openlmi-scripts.spec b/openlmi-scripts.spec
index d2b52a8..8389a85 100644
--- a/openlmi-scripts.spec
+++ b/openlmi-scripts.spec
@@ -1,13 +1,14 @@
-%global commit 7d0c44309714e5cef6a40f0f9a085d860b69ce0f
+%global commit cd65bf4f39bf3b7d99953974a8abd93aef5c9f2b
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commands account hardware journald logicalfile networking
-%global commands %{commands} powermanagement service software storage
+%global commands account hardware journald locale logicalfile networking
+%global commands %{commands} powermanagement realmd selinux service
+%global commands %{commands} software sssd storage
%global commands %{commands} system
-%global tools_version 0.9.1
+%global tools_version 0.10.4
Name: openlmi-scripts
-Version: 0.3.0
-Release: 2%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
Summary: Client-side python modules and command line utilities
License: GPLv2+
@@ -17,14 +18,10 @@ Source0: https://github.com/openlmi/%{name}/archive/%{commit}/%{name}-%{v
# and its absence of it in RHEL's openlmi-tools package, it needs to be pulled
# from upstream tarball of openlmi-tools.
Source1: http://fedorahosted.org/released/openlmi-tools/openlmi-tools-%{tools_version}.tar.gz
+Source2: README-realmd.md
+Source3: README-selinux.md
BuildArch: noarch
-Patch0: openlmi-tools-0.9.1-setup.patch
-Patch1: openlmi-scripts-0.3.0-requirements.patch
-Patch2: openlmi-tools-0.9.1-doc.patch
-Patch3: openlmi-scripts-0.3.0-doc_build.patch
-Patch4: openlmi-tools-0.9.1-python_egg_name.patch
-# Older openlmi-tools doesn't have is_fetched method on LMIClass, work it around
-Patch5: openlmi-scripts-0.3.0-networking-fix-for-older-tools.patch
+Patch1: openlmi-tools-0.10.4-python-egg-name.patch
BuildRequires: python2-devel
# For documentation
@@ -36,7 +33,7 @@ BuildRequires: python-IPy
BuildRequires: ImageMagick
BuildRequires: pyparsing
Requires: python2
-Requires: openlmi-python-base >= 0.3.0
+Requires: openlmi-python-base >= 0.5.0
Requires: python-docopt >= 0.6.1
Requires: openlmi-tools >= 0.9
Requires: pyparsing
@@ -54,89 +51,125 @@ This package contains the documents for OpenLMI Scripts.
%package account
Summary: Client scripts for OpenLMI Account provider
License: BSD
-Requires: openlmi-tools >= 0.9
+Requires: %{name} = %{version}-%{release}
%description account
-This packages contains client side python library for OpenLMI Account
+This package contains client side python library for OpenLMI Account
provider and command line wrapper.
%package hardware
Summary: Client scripts for OpenLMI Hardware provider
License: BSD
-Requires: openlmi-tools >= 0.9
+Requires: %{name} = %{version}-%{release}
%description hardware
-This packages contains client side python library for OpenLMI Hardware
+This package contains client side python library for OpenLMI Hardware
provider and command line wrapper.
%package journald
Summary: Client scripts for OpenLMI Journald provider
License: BSD
-Requires: openlmi-tools >= 0.9
+Requires: %{name} = %{version}-%{release}
%description journald
-This packages contains client side python library for OpenLMI Journald
+This package contains client side python library for OpenLMI Journald
+provider and command line wrapper.
+
+%package locale
+Summary: Client scripts for OpenLMI Locale provider
+License: BSD
+Requires: %{name} = %{version}-%{release}
+
+%description locale
+This package contains client side python library for OpenLMI Locale
provider and command line wrapper.
%package logicalfile
Summary: Client scripts for OpenLMI Logical File provider
License: BSD
-Requires: openlmi-tools >= 0.9
+Requires: %{name} = %{version}-%{release}
%description logicalfile
-This packages contains client side python library for OpenLMI Logical File
+This package contains client side python library for OpenLMI Logical File
provider and command line wrapper.
%package networking
Summary: Client scripts for OpenLMI Networking provider
License: BSD
-Requires: openlmi-tools >= 0.9
+Requires: %{name} = %{version}-%{release}
Requires: python-IPy
%description networking
-This packages contains client side python library for OpenLMI Networking
+This package contains client side python library for OpenLMI Networking
provider and command line wrapper.
%package powermanagement
Summary: Client scripts for OpenLMI Power provider
License: BSD
-Requires: openlmi-tools >= 0.9
+Requires: %{name} = %{version}-%{release}
%description powermanagement
-This packages contains client side python library for OpenLMI PowerManagement
+This package contains client side python library for OpenLMI PowerManagement
provider and command line wrapper.
+%package realmd
+Summary: Client scripts for OpenLMI Realmd provider
+License: BSD
+Requires: %{name} = %{version}-%{release}
+
+%description realmd
+This package contains client side python library for OpenLMI Realmd
+provider and command line wrapper.
+
+%package selinux
+Summary: Client scripts for OpenLMI SELinux provider
+License: BSD
+Requires: %{name} = %{version}-%{release}
+
+%description selinux
+This package contains client side python library for OpenLMI SELinux provider
+and command line wrapper.
+
%package service
Summary: Client scripts for OpenLMI Service provider
License: BSD
-Requires: openlmi-tools >= 0.9
+Requires: %{name} = %{version}-%{release}
%description service
-This packages contains client side python library for OpenLMI Service
+This package contains client side python library for OpenLMI Service
provider and command line wrapper.
%package software
Summary: Client scripts for OpenLMI Software provider
License: BSD
-Requires: openlmi-tools >= 0.9
+Requires: %{name} = %{version}-%{release}
%description software
-This packages contains client side python library for OpenLMI Software
+This package contains client side python library for OpenLMI Software
provider and command line wrapper.
+%package sssd
+Summary: Client scripts for OpenLMI SSSD provider
+License: BSD
+Requires: %{name} = %{version}-%{release}
+
+%description sssd
+This package contains client side python library for OpenLMI SSSD provider and
+command line wrapper.
+
%package storage
Summary: Client scripts for OpenLMI Storage provider
License: BSD
-Requires: openlmi-tools >= 0.9
+Requires: %{name} = %{version}-%{release}
%description storage
-This packages contains client side python library for OpenLMI Storage
+This package contains client side python library for OpenLMI Storage
provider and command line wrapper.
%package system
Summary: Client scripts providing general system information
License: BSD
-Requires: openlmi-tools >= 0.9
+Requires: %{name} = %{version}-%{release}
Requires: %{name}-service >= %{version}-%{release}
%description system
@@ -147,51 +180,53 @@ system.
%prep
%setup -cqn %{name} -a 1
-%patch0 -p1 -b .setup
-%patch1 -p1 -b .requirements
-%patch2 -p1 -b .doc
-%patch3 -p1 -b .doc_build
-%patch4 -p1 -b .python_egg_name
-%patch5 -p1 -b .fix-networking
+pushd openlmi-tools-%{tools_version}
+%patch1 -p1 -b .python_egg_name
+popd
+
+find %{name}-%{commit}/commands/ -name '*.py.skel' | xargs sed -i \
+ 's/\(install_requires\s\*=.*\)openlmi-tools[^"'"'"']*/\1%{name} == %{version}/'
%build
pushd openlmi-tools-%{tools_version}
+ make setup
# build lmi meta-command
pushd cli
- %{__python} setup.py build
+ %{__python2} setup-scripts.py build
popd # cli
# build meta-command's documentation
pushd doc
- make html
- [ -e build/html/.buildinfo ] && rm build/html/.buildinfo
+ # Create a symlink to openlmi-scripts for documentation generator.
+ ln -sf %{_builddir}/%{buildsubdir}/%{name}-%{commit} ./%{name}
+ # Create setup scripts for all modules.
+ pushd openlmi-scripts
+ COMMANDS="%{commands}" make setup-all
+ popd
popd # doc
popd # openlmi-tools
pushd %{name}-%{commit}
- # build scripts and their documentation
- COMMANDS="%{commands}" make setup-all
+ # build scripts
for cmd in %{commands}; do
pushd commands/$cmd
- %{__python} setup.py build
- cd doc
- # Since setup.py depends on openlmi-scripts (which was changed with
- # requirements patch), setuptools will try to download it from PyPI,
- # which is wrong. Let's install it manually from local openlmi-tools.
- # DEPS variable is set to a path with setup.py script that shall
- # be run before script setup.py of particular script library.
- DEPS=%{_builddir}/%{buildsubdir}/openlmi-tools-%{tools_version}/cli make html
- [ -e _build/html/.buildinfo ] && rm _build/html/.buildinfo
+ %{__python2} setup.py build
popd # commands/$cmd
done
popd # openlmi-scripts
+pushd openlmi-tools-%{tools_version}/doc
+ # build documentation
+ WITH_COMMANDS=1 JUST_SCRIPTS=1 COMMANDS="%{commands}" make html
+ [ -e build/html/.buildinfo ] && rm build/html/.buildinfo
+popd # openlmi-tools/doc
+
%install
pushd openlmi-tools-%{tools_version}
# install lmi meta-command
pushd cli
- %{__python} setup.py install -O1 --skip-build --root %{buildroot}
- cp -p lmi/scripts/__init__.* %{buildroot}%{python_sitelib}/lmi/scripts
+ %{__python2} setup-scripts.py install -O1 --skip-build --root %{buildroot}
+ cp -p lmi/scripts/__init__.* %{buildroot}%{python2_sitelib}/lmi/scripts
# install man dir
install -m 0755 -d %{buildroot}%{_mandir}/man1
@@ -213,31 +248,32 @@ pushd openlmi-tools-%{tools_version}
popd # completion
popd # cli
-
- # install meta-commands' documentation
+ # install documentation
install -m 0755 -d %{buildroot}%{_docdir}/%{name}
cp -rp doc/build/html %{buildroot}%{_docdir}/%{name}
install -m 0644 COPYING %{buildroot}%{_docdir}/%{name}
-
popd # openlmi-tools
pushd %{name}-%{commit}
- # install scripts and their documentation
+ # install scripts
for cmd in %{commands}; do
pushd commands/$cmd
- %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+ %{__python2} setup.py install -O1 --skip-build --root %{buildroot}
install -m 0755 -d %{buildroot}%{_docdir}/%{name}-$cmd
- cp -rp doc/_build/html %{buildroot}%{_docdir}/%{name}-$cmd
install -m 0644 README.md ../../COPYING \
%{buildroot}%{_docdir}/%{name}-$cmd
popd # commands/$cmd
- # install documentation
- install -m 0755 -d %{buildroot}%{_docdir}/%{name}
- install -m 0644 README.md %{buildroot}%{_docdir}/%{name}
done
+
+ # install documentation
+ install -m 0755 -d %{buildroot}%{_docdir}/%{name}
+ install -m 0644 README.md %{buildroot}%{_docdir}/%{name}
popd # openlmi-scripts
+install -m 0644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}-realmd/README.md
+install -m 0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}-selinux/README.md
+
%files
%doc %{_docdir}/%{name}/README.md
%doc %{_docdir}/%{name}/COPYING
@@ -249,11 +285,11 @@ popd # openlmi-scripts
%dir %{_libexecdir}/lmi-bash-completion/commands
%{_libexecdir}/lmi-bash-completion/*.sh
%{_libexecdir}/lmi-bash-completion/commands/_help
-%dir %{python_sitelib}/lmi/scripts
-%{python_sitelib}/lmi/scripts/__init__.py*
-%{python_sitelib}/lmi/scripts/common
-%{python_sitelib}/lmi/scripts/_metacommand
-%{python_sitelib}/openlmi_scripts-*
+%dir %{python2_sitelib}/lmi/scripts
+%{python2_sitelib}/lmi/scripts/__init__.py*
+%{python2_sitelib}/lmi/scripts/common
+%{python2_sitelib}/lmi/scripts/_metacommand
+%{python2_sitelib}/openlmi_scripts-*
%{_mandir}/man1/lmi.1.gz
%files doc
@@ -261,55 +297,80 @@ popd # openlmi-scripts
%files account
%doc %{_docdir}/%{name}-account/
-%{python_sitelib}/lmi/scripts/account/
-%{python_sitelib}/openlmi_scripts_account-*
+%{python2_sitelib}/lmi/scripts/account/
+%{python2_sitelib}/openlmi_scripts_account-*
%files hardware
%doc %{_docdir}/%{name}-hardware/
-%{python_sitelib}/lmi/scripts/hardware/
-%{python_sitelib}/openlmi_scripts_hardware-*
+%{python2_sitelib}/lmi/scripts/hardware/
+%{python2_sitelib}/openlmi_scripts_hardware-*
%files journald
%doc %{_docdir}/%{name}-journald/
-%{python_sitelib}/lmi/scripts/journald/
-%{python_sitelib}/openlmi_scripts_journald-*
+%{python2_sitelib}/lmi/scripts/journald/
+%{python2_sitelib}/openlmi_scripts_journald-*
+
+%files locale
+%doc %{_docdir}/%{name}-locale/
+%{python2_sitelib}/lmi/scripts/locale/
+%{python2_sitelib}/openlmi_scripts_locale-*
%files logicalfile
%doc %{_docdir}/%{name}-logicalfile/
-%{python_sitelib}/lmi/scripts/logicalfile/
-%{python_sitelib}/openlmi_scripts_logicalfile-*
+%{python2_sitelib}/lmi/scripts/logicalfile/
+%{python2_sitelib}/openlmi_scripts_logicalfile-*
%files networking
%doc %{_docdir}/%{name}-networking/
-%{python_sitelib}/lmi/scripts/networking/
-%{python_sitelib}/openlmi_scripts_networking-*
+%{python2_sitelib}/lmi/scripts/networking/
+%{python2_sitelib}/openlmi_scripts_networking-*
%files powermanagement
%doc %{_docdir}/%{name}-powermanagement/
-%{python_sitelib}/lmi/scripts/powermanagement/
-%{python_sitelib}/openlmi_scripts_powermanagement-*
+%{python2_sitelib}/lmi/scripts/powermanagement/
+%{python2_sitelib}/openlmi_scripts_powermanagement-*
+
+%files realmd
+%doc %{_docdir}/%{name}-realmd/
+%{python2_sitelib}/lmi/scripts/realmd/
+%{python2_sitelib}/openlmi_scripts_realmd-*
+
+%files selinux
+%doc %{_docdir}/%{name}-selinux/
+%{python2_sitelib}/lmi/scripts/selinux/
+%{python2_sitelib}/openlmi_scripts_selinux-*
%files service
%doc %{_docdir}/%{name}-service/
-%{python_sitelib}/lmi/scripts/service/
-%{python_sitelib}/openlmi_scripts_service-*
+%{python2_sitelib}/lmi/scripts/service/
+%{python2_sitelib}/openlmi_scripts_service-*
%files software
%doc %{_docdir}/%{name}-software/
-%{python_sitelib}/lmi/scripts/software/
-%{python_sitelib}/openlmi_scripts_software-*
+%{python2_sitelib}/lmi/scripts/software/
+%{python2_sitelib}/openlmi_scripts_software-*
+
+%files sssd
+%doc %{_docdir}/%{name}-sssd/
+%{python2_sitelib}/lmi/scripts/sssd/
+%{python2_sitelib}/openlmi_scripts_sssd-*
%files storage
%doc %{_docdir}/%{name}-storage/
-%{python_sitelib}/lmi/scripts/storage/
-%{python_sitelib}/openlmi_scripts_storage-*
+%{python2_sitelib}/lmi/scripts/storage/
+%{python2_sitelib}/openlmi_scripts_storage-*
%files system
%doc %{_docdir}/%{name}-system/
-%{python_sitelib}/lmi/scripts/system/
-%{python_sitelib}/openlmi_scripts_system-*
+%{python2_sitelib}/lmi/scripts/system/
+%{python2_sitelib}/openlmi_scripts_system-*
%changelog
+* Thu Dec 11 2014 Michal Minar <miminar at redhat.com> 0.4.0-1
+- New upstream release.
+- New subpackages: locale, realmd, sssd, selinux.
+- All documentation is now bundled in single doc package.
+
* Tue Oct 07 2014 Radek Novacek <rnovacek at redhat.com> 0.3.0-2
- Fix networking script with older openlmi-tools without is_fetched method
diff --git a/openlmi-tools-0.9.1-python_egg_name.patch b/openlmi-tools-0.10.4-python-egg-name.patch
similarity index 75%
rename from openlmi-tools-0.9.1-python_egg_name.patch
rename to openlmi-tools-0.10.4-python-egg-name.patch
index ac5fc95..50227de 100644
--- a/openlmi-tools-0.9.1-python_egg_name.patch
+++ b/openlmi-tools-0.10.4-python-egg-name.patch
@@ -1,7 +1,7 @@
Index: openlmi-scripts/openlmi-tools-0.9.1/cli/lmi/scripts/_metacommand/util.py
===================================================================
---- openlmi-scripts.orig/openlmi-tools-0.9.1/cli/lmi/scripts/_metacommand/util.py
-+++ openlmi-scripts/openlmi-tools-0.9.1/cli/lmi/scripts/_metacommand/util.py
+--- openlmi-tools-0.10.4/cli/lmi/scripts/_metacommand/util.py
++++ openlmi-tools-0.10.4/cli/lmi/scripts/_metacommand/util.py
@@ -30,7 +30,7 @@ from lmi.scripts.common import Configura
from lmi.scripts.common import get_logger
from lmi.scripts.common import lmi_logging
diff --git a/sources b/sources
index 8f2399f..a6e1b04 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e4079db18a0f2d5b01c4bc6d1a524d08 openlmi-tools-0.9.1.tar.gz
-921ae7a773483c4c66109a787e32869b openlmi-scripts-0.3.0-7d0c443.tar.gz
+820aa6d9a5d836c17577d0df18f92228 openlmi-scripts-0.4.0-cd65bf4.tar.gz
+4e2fb7af95e4d21350aa4d7d958cdd5d openlmi-tools-0.10.4.tar.gz
More information about the scm-commits
mailing list