[Kimchi-devel] [PATCH] bug fix: Add spice.css to Makefile and spec files

[Rodrigo Trujillo]

Reviewed-by: Rodrigo Trujillo <rodrigo.trujillo at linux.vnet.ibm.com>

On 08/05/2014 05:14 PM, Aline Manera wrote:
> spice.css was added to source code but the build process was not updated
> accordingly.
> Fix it.
>
> Signed-off-by: Aline Manera <alinefm at linux.vnet.ibm.com>
> ---
>   configure.ac                  |  1 +
>   contrib/kimchi.spec.fedora.in |  1 +
>   contrib/kimchi.spec.suse.in   |  1 +
>   ui/css/Makefile.am            |  2 +-
>   ui/css/spice/Makefile.am      | 20 ++++++++++++++++++++
>   5 files changed, 24 insertions(+), 1 deletion(-)
>   create mode 100644 ui/css/spice/Makefile.am
>
> diff --git a/configure.ac b/configure.ac
> index a260f7d..d9b991a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -98,6 +98,7 @@ AC_CONFIG_FILES([
>       ui/Makefile
>       ui/css/Makefile
>       ui/css/novnc/Makefile
> +    ui/css/spice/Makefile
>       ui/css/fonts/Makefile
>       ui/css/fonts/novnc/Makefile
>       ui/images/Makefile
> diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
> index acc9bc0..0c6f934 100644
> --- a/contrib/kimchi.spec.fedora.in
> +++ b/contrib/kimchi.spec.fedora.in
> @@ -166,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT
>   %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.*
>   %endif
>   %{_datadir}/kimchi/ui/css/novnc/base.css
> +%{_datadir}/kimchi/ui/css/spice/spice.css
>   %{_datadir}/kimchi/ui/css/theme-default.min.css
>   %{_datadir}/kimchi/ui/images/*.png
>   %{_datadir}/kimchi/ui/images/*.ico
> diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
> index 7e082dc..2d3d271 100644
> --- a/contrib/kimchi.spec.suse.in
> +++ b/contrib/kimchi.spec.suse.in
> @@ -87,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT
>   %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.*
>   %endif
>   %{_datadir}/kimchi/ui/css/novnc/base.css
> +%{_datadir}/kimchi/ui/css/spice/spice.css
>   %{_datadir}/kimchi/ui/css/theme-default.min.css
>   %{_datadir}/kimchi/ui/images/*.png
>   %{_datadir}/kimchi/ui/images/*.ico
> diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am
> index 9a2a29f..a4f575d 100644
> --- a/ui/css/Makefile.am
> +++ b/ui/css/Makefile.am
> @@ -15,7 +15,7 @@
>   # See the License for the specific language governing permissions and
>   # limitations under the License.
>
> -SUBDIRS = novnc
> +SUBDIRS = novnc spice
>
>   if FONTS
>   SUBDIRS += fonts
> diff --git a/ui/css/spice/Makefile.am b/ui/css/spice/Makefile.am
> new file mode 100644
> index 0000000..1271663
> --- /dev/null
> +++ b/ui/css/spice/Makefile.am
> @@ -0,0 +1,20 @@
> +#
> +# Kimchi
> +#
> +# Copyright IBM, Corp. 2014
> +#
> +# Licensed under the Apache License, Version 2.0 (the "License");
> +# you may not use this file except in compliance with the License.
> +# You may obtain a copy of the License at
> +#
> +#     http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing, software
> +# distributed under the License is distributed on an "AS IS" BASIS,
> +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +# See the License for the specific language governing permissions and
> +# limitations under the License.
> +
> +cssdir = $(datadir)/kimchi/ui/css/spice
> +
> +dist_css_DATA = spice.css