Re: [Kimchi-devel] [PATCH 0/6] Use installed spice-html5 package when possible

I have an upstream branch with this patch set applied. Repository: https://github.com/alinefm/kimchi Branch: alinefm/remove-spice On 10/10/2014 06:16 PM, Aline Manera wrote: > spice-html5 is present in almost all supported Linux distributions > (RHEL6.5, Fedora20 and Ubuntu 14.04). So in those cases we should not > package > the spice-html5 code into Kimchi and instead of that uses the > spice-html5 package > as dependency. > This patch set change the build process to check the spice-html5 > package > availability in order to decide to package or not the spice-html5 code. > > It also gets the latest spice-html5 code into Kimchi and update the > COPYING > content to point to the imported codes. > spice-html5 package is not available for RHEL7 and openSUSE > 13.1. So > for those distributions, you must run the following command to Kimchi > includes the spice-html5 into its package. > ./autogen.sh --with-spice-html5 > > Aline Manera (6): > Import the latest spice-html5 code into Kimchi > Modify spice_auto.html for Kimchi proposals > Add new spice-html5 code to Kimchi build process > Update Kimchi to use the installed spice-html5 > Delete former imported spice code > Update COPYING content to expose the imported code > > COPYING | 10 +- > autogen.sh | 2 + > configure.ac | 15 +- > contrib/DEBIAN/control.in | 3 +- > contrib/kimchi.spec.fedora.in | 30 +- > contrib/kimchi.spec.suse.in | 24 +- > docs/README.md | 10 +- > src/kimchi/Makefile.am | 11 +- > src/kimchi/config.py.in | 33 +- > tests/test_config.py.in | 15 +- > ui/Makefile.am | 2 +- > ui/css/Makefile.am | 2 - > ui/css/spice/Makefile.am | 20 - > ui/css/spice/spice.css | 115 --- > ui/js/Makefile.am | 2 - > ui/js/spice/Makefile.am | 22 - > ui/js/spice/atKeynames.js | 183 ----- > ui/js/spice/bitmap.js | 51 -- > ui/js/spice/cursor.js | 92 --- > ui/js/spice/display.js | 806 -------------------- > ui/js/spice/enums.js | 282 ------- > ui/js/spice/inputs.js | 251 ------- > ui/js/spice/jsbn.js | 589 --------------- > ui/js/spice/lz.js | 166 ---- > ui/js/spice/main.js | 176 ----- > ui/js/spice/png.js | 256 ------- > ui/js/spice/prng4.js | 79 -- > ui/js/spice/quic.js | 1335 > --------------------------------- > ui/js/spice/rng.js | 102 --- > ui/js/spice/rsa.js | 146 ---- > ui/js/spice/sha1.js | 346 --------- > ui/js/spice/spiceconn.js | 447 ----------- > ui/js/spice/spicedataview.js | 96 --- > ui/js/spice/spicemsg.js | 883 ---------------------- > ui/js/spice/spicetype.js | 480 ------------ > ui/js/spice/ticket.js | 250 ------ > ui/js/spice/utils.js | 261 ------- > ui/js/spice/wire.js | 123 --- > ui/js/src/kimchi.api.js | 2 +- > ui/pages/spice.html.tmpl | 140 ---- > ui/spice-html5/Makefile.am | 25 + > ui/spice-html5/atKeynames.js | 183 +++++ > ui/spice-html5/bitmap.js | 51 ++ > ui/spice-html5/css/Makefile.am | 20 + > ui/spice-html5/css/spice.css | 118 +++ > ui/spice-html5/cursor.js | 110 +++ > ui/spice-html5/display.js | 823 ++++++++++++++++++++ > ui/spice-html5/enums.js | 324 ++++++++ > ui/spice-html5/inputs.js | 280 +++++++ > ui/spice-html5/lz.js | 166 ++++ > ui/spice-html5/main.js | 231 ++++++ > ui/spice-html5/pages/Makefile.am | 20 + > ui/spice-html5/pages/spice_auto.html | 200 +++++ > ui/spice-html5/playback.js | 278 +++++++ > ui/spice-html5/png.js | 256 +++++++ > ui/spice-html5/quic.js | 1335 > +++++++++++++++++++++++++++++++++ > ui/spice-html5/resize.js | 70 ++ > ui/spice-html5/simulatecursor.js | 202 +++++ > ui/spice-html5/spicearraybuffer.js | 58 ++ > ui/spice-html5/spiceconn.js | 460 ++++++++++++ > ui/spice-html5/spicedataview.js | 120 +++ > ui/spice-html5/spicemsg.js | 1047 > ++++++++++++++++++++++++++ > ui/spice-html5/spicetype.js | 473 ++++++++++++ > ui/spice-html5/thirdparty/Makefile.am | 20 + > ui/spice-html5/thirdparty/jsbn.js | 589 +++++++++++++++ > ui/spice-html5/thirdparty/prng4.js | 79 ++ > ui/spice-html5/thirdparty/rng.js | 102 +++ > ui/spice-html5/thirdparty/rsa.js | 146 ++++ > ui/spice-html5/thirdparty/sha1.js | 346 +++++++++ > ui/spice-html5/ticket.js | 250 ++++++ > ui/spice-html5/utils.js | 265 +++++++ > ui/spice-html5/webm.js | 553 ++++++++++++++ > ui/spice-html5/wire.js | 123 +++ > 73 files changed, 9419 insertions(+), 7762 deletions(-) > delete mode 100644 ui/css/spice/Makefile.am > delete mode 100644 ui/css/spice/spice.css > delete mode 100644 ui/js/spice/Makefile.am > delete mode 100644 ui/js/spice/atKeynames.js > delete mode 100644 ui/js/spice/bitmap.js > delete mode 100644 ui/js/spice/cursor.js > delete mode 100644 ui/js/spice/display.js > delete mode 100644 ui/js/spice/enums.js > delete mode 100644 ui/js/spice/inputs.js > delete mode 100644 ui/js/spice/jsbn.js > delete mode 100644 ui/js/spice/lz.js > delete mode 100644 ui/js/spice/main.js > delete mode 100644 ui/js/spice/png.js > delete mode 100644 ui/js/spice/prng4.js > delete mode 100644 ui/js/spice/quic.js > delete mode 100644 ui/js/spice/rng.js > delete mode 100644 ui/js/spice/rsa.js > delete mode 100644 ui/js/spice/sha1.js > delete mode 100644 ui/js/spice/spiceconn.js > delete mode 100644 ui/js/spice/spicedataview.js > delete mode 100644 ui/js/spice/spicemsg.js > delete mode 100644 ui/js/spice/spicetype.js > delete mode 100644 ui/js/spice/ticket.js > delete mode 100644 ui/js/spice/utils.js > delete mode 100644 ui/js/spice/wire.js > delete mode 100644 ui/pages/spice.html.tmpl > create mode 100644 ui/spice-html5/Makefile.am > create mode 100644 ui/spice-html5/atKeynames.js > create mode 100644 ui/spice-html5/bitmap.js > create mode 100644 ui/spice-html5/css/Makefile.am > create mode 100644 ui/spice-html5/css/spice.css > create mode 100644 ui/spice-html5/cursor.js > create mode 100644 ui/spice-html5/display.js > create mode 100644 ui/spice-html5/enums.js > create mode 100644 ui/spice-html5/inputs.js > create mode 100644 ui/spice-html5/lz.js > create mode 100644 ui/spice-html5/main.js > create mode 100644 ui/spice-html5/pages/Makefile.am > create mode 100644 ui/spice-html5/pages/spice_auto.html > create mode 100644 ui/spice-html5/playback.js > create mode 100644 ui/spice-html5/png.js > create mode 100644 ui/spice-html5/quic.js > create mode 100644 ui/spice-html5/resize.js > create mode 100644 ui/spice-html5/simulatecursor.js > create mode 100644 ui/spice-html5/spicearraybuffer.js > create mode 100644 ui/spice-html5/spiceconn.js > create mode 100644 ui/spice-html5/spicedataview.js > create mode 100644 ui/spice-html5/spicemsg.js > create mode 100644 ui/spice-html5/spicetype.js > create mode 100644 ui/spice-html5/thirdparty/Makefile.am > create mode 100644 ui/spice-html5/thirdparty/jsbn.js > create mode 100644 ui/spice-html5/thirdparty/prng4.js > create mode 100644 ui/spice-html5/thirdparty/rng.js > create mode 100644 ui/spice-html5/thirdparty/rsa.js > create mode 100644 ui/spice-html5/thirdparty/sha1.js > create mode 100644 ui/spice-html5/ticket.js > create mode 100644 ui/spice-html5/utils.js > create mode 100644 ui/spice-html5/webm.js > create mode 100644 ui/spice-html5/wire.js > _______________________________________________ Kimchi-devel mailing list Kimchi-devel(a)ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel