[Kimchi-devel] [PATCH v3 3/3] Github #329: .gitignore, spec and readme changes

[Aline Manera]

On 04/10/2014 05:44 PM, Daniel Barboza wrote:
> From: Daniel Henrique Barboza <danielhb at linux.vnet.ibm.com>
>
> Added src/nginx.config.in to Fedora and SUSE spec files and nginx
> as dependency.
> Added nginx to README.md instructions.
> Added src/nginx_kimchi.conf to .gitignore. This file is a product
> of the nginx.config.in template tha was used for the last (or
> current) kimchid/nginx run. As such, there is no need to put
> this file in version control.
>
> Signed-off-by: Daniel Henrique Barboza <danielhb at linux.vnet.ibm.com>
> ---
>   .gitignore                    | 1 +
>   contrib/kimchi.spec.fedora.in | 2 ++
>   contrib/kimchi.spec.suse.in   | 2 ++
>   docs/README.md                | 4 ++--
>   4 files changed, 7 insertions(+), 2 deletions(-)

You also need to update the DEBIAN/control.in file to adjust the build 
for Ubuntu

>
> diff --git a/.gitignore b/.gitignore
> index 67878e2..66d3731 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -27,6 +27,7 @@ stamp-po
>   kimchi-*.tar.gz
>   src/kimchid
>   src/kimchi.conf
> +src/nginx_kimchi.conf
>   src/kimchi/config.py
>   tests/run_tests.sh
>   tests/test_config.py
> diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
> index bf80104..3f716dc 100644
> --- a/contrib/kimchi.spec.fedora.in
> +++ b/contrib/kimchi.spec.fedora.in
> @@ -28,6 +28,7 @@ Requires:	sos
>   Requires:	python-ipaddr
>   Requires:	python-lxml
>   Requires:	nfs-utils
> +Requires:	nginx
>   Requires:	iscsi-initiator-utils
>   BuildRequires:	libxslt
>   BuildRequires:	libxml2-python
> @@ -175,6 +176,7 @@ rm -rf $RPM_BUILD_ROOT
>   %{_datadir}/kimchi/ui/pages/help/*.html
>   %{_datadir}/kimchi/ui/pages/tabs/*.html.tmpl
>   %{_sysconfdir}/kimchi/kimchi.conf
> +%{_sysconfdir}/kimchi/nginx.conf.in
>   %{_sysconfdir}/kimchi/distros.d/debian.json
>   %{_sysconfdir}/kimchi/distros.d/fedora.json
>   %{_sysconfdir}/kimchi/distros.d/opensuse.json
> diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
> index cba0899..ee88592 100644
> --- a/contrib/kimchi.spec.suse.in
> +++ b/contrib/kimchi.spec.suse.in
> @@ -24,6 +24,7 @@ Requires:	python-ipaddr
>   Requires:	python-lxml
>   Requires:	python-xml
>   Requires:	nfs-client
> +Requires:	nginx
>   Requires:	open-iscsi
>   BuildRequires:	libxslt-tools
>   BuildRequires:	python-libxml2
> @@ -101,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
>   %{_datadir}/kimchi/ui/pages/help/*.html
>   %{_datadir}/kimchi/ui/pages/tabs/*.html.tmpl
>   %{_sysconfdir}/kimchi/kimchi.conf
> +%{_sysconfdir}/kimchi/nginx.conf.in
>   %{_sysconfdir}/kimchi/distros.d/debian.json
>   %{_sysconfdir}/kimchi/distros.d/fedora.json
>   %{_sysconfdir}/kimchi/distros.d/opensuse.json
> diff --git a/docs/README.md b/docs/README.md
> index 8b8b181..63ac760 100644
> --- a/docs/README.md
> +++ b/docs/README.md
> @@ -53,7 +53,7 @@ Install Dependencies
>                           PyPAM m2crypto python-jsonschema rpm-build \
>                           qemu-kvm python-psutil python-ethtool sos \
>                           python-ipaddr python-lxml nfs-utils \
> -                        iscsi-initiator-utils libxslt pyparted
> +                        iscsi-initiator-utils libxslt pyparted nginx
>        # If using RHEL6, install the following additional packages:
>        $ sudo yum install python-unittest2 python-ordereddict
>        # Restart libvirt to allow configuration changes to take effect
> @@ -75,7 +75,7 @@ for more information on how to configure your system to access this repository.
>                              python-pam python-m2crypto python-jsonschema \
>                              qemu-kvm libtool python-psutil python-ethtool \
>                              sosreport python-ipaddr python-lxml nfs-common \
> -                           open-iscsi lvm2 xsltproc python-parted
> +                           open-iscsi lvm2 xsltproc python-parted nginx
>
>       Packages version requirement:
>           python-jsonschema >= 1.3.0