[Kimchi-devel] [PATCH 2/2] Fix Issue #743 - gingerbase: fail to create RPM.
Paulo Ricardo Paz Vital
pvital at linux.vnet.ibm.com
Fri Oct 30 12:04:25 UTC 2015
On Fri, 2015-10-30 at 01:50 +0530, chandra at linux.vnet.ibm.com wrote:
> From: chandrureddy <chandra at linux.vnet.ibm.com>
>
> In files gingerbase.spec.fedora.in and gignerbase.spec.suse.in and
> make-deb.sh.in
> add setup instruction
> correct the file section
> day correction
> Name changed from gingerbase to ginger-base
>
> Added files ChangeLog and CONTRIBUTE.md
> VERSION changed to 2.0.0
> ---
> src/wok/plugins/gingerbase/CONTRIBUTE.md | 19
> +++++++++++++
> src/wok/plugins/gingerbase/ChangeLog | 31
> ++++++++++++++++++++++
> src/wok/plugins/gingerbase/VERSION | 2 +-
> .../gingerbase/contrib/gingerbase.spec.fedora.in | 26 +++++++-----
> ------
> .../gingerbase/contrib/gingerbase.spec.suse.in | 30 ++++++++++--
> ---------
> src/wok/plugins/gingerbase/contrib/make-deb.sh.in | 2 +-
> 6 files changed, 76 insertions(+), 34 deletions(-)
> create mode 100644 src/wok/plugins/gingerbase/CONTRIBUTE.md
> create mode 100644 src/wok/plugins/gingerbase/ChangeLog
>
> diff --git a/src/wok/plugins/gingerbase/CONTRIBUTE.md
> b/src/wok/plugins/gingerbase/CONTRIBUTE.md
> new file mode 100644
> index 0000000..03b4e79
> --- /dev/null
> +++ b/src/wok/plugins/gingerbase/CONTRIBUTE.md
> @@ -0,0 +1,19 @@
> +How to Contribute
> +=================
> +
> +All development discussion happens on the mailing list. All
> development is done
> +using the `git` SCM. Patches should be sent using the `git send
> -email` command
> +to the ginger-dev-list at googlegroups.com mailing list.
> +
> +Please go through below wiki page which describe on how to
> contribute to the community.
> +[How to Contribute](
> https://github.com/kimchi-project/ginger/wiki/How-to-Contribute)
> +
> +Good examples of how to send patches are included in
> +[QEMU SubmitAPatch](http://wiki.qemu.org/Contribute/SubmitAPatch)
> and
> +[Linux SubmittingPatches](
> https://www.kernel.org/doc/Documentation/SubmittingPatches).
> +
> +All documentation and READMEs are written using
> +[Markdown](http://daringfireball.net/projects/markdown/).
> +
> +For a patch to be committed, it must receive at least one "Reviewed
> -by" on the
> +mailing list.
> diff --git a/src/wok/plugins/gingerbase/ChangeLog
> b/src/wok/plugins/gingerbase/ChangeLog
> new file mode 100644
> index 0000000..70c2235
> --- /dev/null
> +++ b/src/wok/plugins/gingerbase/ChangeLog
> @@ -0,0 +1,31 @@
> +CHANGELOG
> +=========
> +
> +#### [Current] ####
> + * [94ce07b] Fix make check-local for Kimchi
> (Aline Manera)
> + * [794ed7c] Add .gitignore file to gingerbase directory
> (Aline Manera)
> + * [1f1679f] Add src/wok/plugins directory to the Wok PEP8 backlist
> (Aline Manera)
> + * [94a71b1] Remove Host Resource from Kimchi
> (Aline Manera)
> + * [89c9058] Keep /host/partitions on Kimchi
> (Aline Manera)
> + * [3c8c947] Move host authorization tests from Kimchi to Ginger
> Base (Aline Manera)
> + * [d165ab5] Remove repositories tests from Kimchi
> (Aline Manera)
> + * [cc7d7a3] Fix Ginger Base tests
> (Aline Manera)
> + * [9e62598] Get the right internal URI to Ginger Base plugin
> (Aline Manera)
> + * [d6ee86b] Fix PYTHONPATH to run tests for Ginger Base
> (Aline Manera)
> + * [379ccff] V7 Ginger Base : base plugin po files
> (chandrureddy)
> + * [cd4c415] V7 Ginger Base : base plugin ui make, images and config
> (chandrureddy)
> + * [2256442] V7 Ginger Base : base plugin ui/css files
> (chandrureddy)
> + * [c12612f] V7 Ginger Base : base plugin ui/js files
> (chandrureddy)
> + * [89fc8af] V7 Ginger Base : base plugin ui/pages files
> (chandrureddy)
> + * [074670a] V7 Ginger Base : base plugin ui/pages/help files
> (chandrureddy)
> + * [83bb860] V7 Ginger Base : base plugin tests files
> (chandrureddy)
> + * [3b10bb7] V7 Ginger Base : base plugin model files
> (chandrureddy)
> + * [3cc1ae1] V7 Ginger Base : control files
> (chandrureddy)
> + * [c37bfb7] V7 Ginger Base : base plugin m4 files
> (chandrureddy)
> + * [8e8adcc] V7 Ginger Base : base plugin build-aix and contrib
> (chandrureddy)
> + * [ca7d757] V7 Ginger Base : base plugin docs files
> (chandrureddy)
> + * [a9add5c] V7 Add License files to ginger base
> (chandrureddy)
> + * [5456005] V7 Ginger Base : base folder files part 3
> (chandrureddy)
> + * [89de0af] V7 Ginger Base : base folder files part 2
> (chandrureddy)
> + * [ae5e96c] V7 Ginger Base : base folder files part 1
> (chandrureddy)
> + * [d8134dd] V7 Ginger Base : Taking off the host tab functionality
> (chandrureddy)
> diff --git a/src/wok/plugins/gingerbase/VERSION
> b/src/wok/plugins/gingerbase/VERSION
> index bc80560..227cea2 100644
> --- a/src/wok/plugins/gingerbase/VERSION
> +++ b/src/wok/plugins/gingerbase/VERSION
> @@ -1 +1 @@
> -1.5.0
> +2.0.0
> diff --git
> a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in
> b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in
> index a4ffb66..204de63 100644
> --- a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in
> +++ b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.fedora.in
> @@ -1,4 +1,4 @@
> -Name: Ginger Base
> +Name: ginger-base
> Version: @PACKAGE_VERSION@
> Release: @PACKAGE_RELEASE@%{?dist}
> Summary: Wok plugin for base host management
> @@ -12,6 +12,8 @@ Requires: python-psutil >= 0.6.0
> Requires: sos
> BuildRequires: libxslt
> BuildRequires: python-lxml
> +BuildRequires: python-devel
> +BuildRequires: python-pip
>
> %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
> %global with_systemd 1
> @@ -28,7 +30,7 @@ Ginger Base is an open source base host management
> plugin for Wok
> common tools for configuring and managing the Linux systems.
>
> %prep
> -
> +%setup
>
> %build
> %configure
> @@ -45,24 +47,16 @@ rm -rf $RPM_BUILD_ROOT
>
> %files
> %attr(-,root,root)
> -%{python_sitelib}/wok/plugins/gingerbase/*.py*
> -%{python_sitelib}/wok/plugins/gingerbase/control/*.py*
> -%{python_sitelib}/wok/plugins/gingerbase/model/*.py*
> -%{python_sitelib}/wok/plugins/gingerbase/API.json
> -%{python_sitelib}/wok/plugins/gingerbase/
> -%{_datadir}/wok/plugins/gingerbase/doc/API.md
> -%{_datadir}/wok/plugins/gingerbase/doc/README.md
> -%{_datadir}/wok/plugins/gingerbase/doc/README-federation.md
> +%{python_sitelib}/wok/plugins/gingerbase
> +%{_datadir}/gingerbase/doc/API.md
> +%{_datadir}/gingerbase/doc/README.md
> +%{_datadir}/gingerbase/doc/gingerbase-host-tab.png
> %{_prefix}/share/locale/*/LC_MESSAGES/gingerbase.mo
> -%{_datadir}/wok/plugins/gingerbase/ui/config/*.xml
> -%{_datadir}/wok/plugins/gingerbase/ui/
> %{_datadir}/wok/plugins/gingerbase
> %{_sysconfdir}/wok/plugins.d/gingerbase.conf
> -%{_sysconfdir}/wok/
> -%{_sharedstatedir}/wok/debugreports/
> -%{_sharedstatedir}/wok/
> +%{_sharedstatedir}/gingerbase/
>
>
> %changelog
> -* Thu Aug 25 2015 Chandra Shehkhar Reddy Potula <
> chandra at linux.vnet.ibm.com> 0.0-1s
> +* Tue Aug 25 2015 Chandra Shehkhar Reddy Potula <
> chandra at linux.vnet.ibm.com> 0.0-1
> - First build
> diff --git
> a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in
> b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in
> index ba92606..68492cf 100644
> --- a/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in
> +++ b/src/wok/plugins/gingerbase/contrib/gingerbase.spec.suse.in
> @@ -1,4 +1,4 @@
> -Name: Ginger Base
> +Name: gingerbase
I guess the name is ginger-base, right?
> Version: @PACKAGE_VERSION@
> Release: @PACKAGE_RELEASE@%{?dist}
> Summary: Wok plugin for base host management
> @@ -11,6 +11,8 @@ Requires: wok
> Requires: python-psutil >= 0.6.0
> BuildRequires: libxslt-tools
> BuildRequires: python-lxml
> +BuildRequires: python-devel
> +BuildRequires: python-pip
>
> %if 0%{?suse_version} == 1100
> Requires: python-ordereddict
> @@ -28,6 +30,11 @@ common tools for configuring and managing the
> Linux systems.
> %prep
> %setup
>
> +%build
> +%configure
> +make
> +
> +
> %install
> rm -rf %{buildroot}
> make DESTDIR=%{buildroot} install
> @@ -38,25 +45,16 @@ rm -rf $RPM_BUILD_ROOT
>
> %files
> %attr(-,root,root)
> -%{python_sitelib}/wok/plugins/gingerbase/*.py*
> -%{python_sitelib}/wok/plugins/gingerbase/control/*.py*
> -%{python_sitelib}/wok/plugins/gingerbase/model/*.py*
> -%{python_sitelib}/wok/plugins/gingerbase/API.json
> -%{python_sitelib}/wok/plugins/gingerbase/
> -%{_datadir}/wok/plugins/gingerbase/doc/API.md
> -%{_datadir}/wok/plugins/gingerbase/doc/README.md
> -%{_datadir}/wok/plugins/gingerbase/doc/README-federation.md
> +%{python_sitelib}/wok/plugins/gingerbase
> +%{_datadir}/gingerbase/doc/API.md
> +%{_datadir}/gingerbase/doc/README.md
> +%{_datadir}/gingerbase/doc/gingerbase-host-tab.png
> %{_prefix}/share/locale/*/LC_MESSAGES/gingerbase.mo
> -%{_datadir}/wok/plugins/gingerbase/ui/config/*.xml
> -%{_datadir}/wok/plugins/gingerbase/ui/
> %{_datadir}/wok/plugins/gingerbase
> %{_sysconfdir}/wok/plugins.d/gingerbase.conf
> -%{_sysconfdir}/wok/
> -%{_var}/lib/wok/debugreports/
> -%{_var}/lib/wok/
> -
> +%{_sharedstatedir}/gingerbase/
>
>
> %changelog
> -* Thu Aug 25 2015 Chandra Shehkhar Reddy Potula <
> chandra at linux.vnet.ibm.com> 0.0-1
> +* Tue Aug 25 2015 Chandra Shehkhar Reddy Potula <
> chandra at linux.vnet.ibm.com> 0.0-1
> - First build
> diff --git a/src/wok/plugins/gingerbase/contrib/make-deb.sh.in
> b/src/wok/plugins/gingerbase/contrib/make-deb.sh.in
> index a4c92bf..cdb5b07 100644
> --- a/src/wok/plugins/gingerbase/contrib/make-deb.sh.in
> +++ b/src/wok/plugins/gingerbase/contrib/make-deb.sh.in
> @@ -11,5 +11,5 @@ fi
> TMPDIR=`mktemp -d`
>
> make DESTDIR=$TMPDIR install-deb
> -dpkg-deb -b $TMPDIR gingerbase-${VERSION}-${RELEASE}.noarch.deb
> +dpkg-deb -b $TMPDIR ginger-base-${VERSION}-${RELEASE}.noarch.deb
> rm -rf $TMPDIR
More information about the Kimchi-devel
mailing list