[SM-Commit] GIT changes to master grimoire by Eric Sandall (29893c13e2cb0785771428f863e4a807c6968a43)

Eric Sandall scm at sourcemage.org
Fri Feb 27 05:57:29 EST 2009


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 dev/null                                         |binary
 python-pypi/virtinst/DETAILS                     |    2 -
 python-pypi/virtinst/HISTORY                     |    3 ++
 python-pypi/virtinst/virtinst-0.400.0.tar.gz.sig |    0 
 python-pypi/virtinst/virtinst-0.400.1.tar.gz.sig |binary
 utils/virt-manager/DEPENDS                       |   12 +++++++-
 utils/virt-manager/DETAILS                       |    2 -
 utils/virt-manager/HISTORY                       |    5 +++
 utils/virt-manager/virt-manager-0.6.0.tar.gz.sig |    0 
 utils/virt-manager/virt-manager-0.6.1.tar.gz.sig |binary
 x11/gtk-vnc/DEPENDS                              |    7 ++++-
 x11/gtk-vnc/DETAILS                              |    2 -
 x11/gtk-vnc/HISTORY                              |    6 ++++
 x11/gtk-vnc/INSTALL                              |   31 +++++++++++++++++++++++
 x11/gtk-vnc/gtk-vnc-0.3.7.tar.gz.sig             |    0 
 x11/gtk-vnc/gtk-vnc-0.3.8.tar.gz.sig             |binary
 16 files changed, 64 insertions(+), 6 deletions(-)

New commits:
commit 29893c13e2cb0785771428f863e4a807c6968a43
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gtk-vnc: Optionally depend on NS-PLUGIN-COMPATIBLE for a browser
    plugin.
    Install browser plugin README if plugin is requested

commit 7a7727f290f4d6f640c763f76359198c4b668090
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gtk-vnc: Updated to 0.3.8

commit ab931fc8b257e4524fd069d764680b224f226669
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    virt-manager: Suggest dependencies on libvirt and virtinst for local
    operations, as these are not required for remote operation.

commit ca5698dbaffe80835a450db082a25e0d876ae42e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "libvirt: Updated to 0.6.0"
    
    This reverts commit 40cb2f114a3e4d534f5bfb619aca6bb5d8b9415c.
    
    Breaks virt-manager 0.6.0 and 0.6.1 (latest stable). :(

commit 140127f30ec9b3d2a8c5667fee6505b8a5d54fb7
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    virt-manager: Updated to 0.6.1

commit d010db50eee225529efbcd43161015765c41ba9d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    virtinst: Updated to 0.400.1

commit 1661fe569f69530449ce0776647bec3936fb335b
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libvirt: Updated to 0.6.0

diff --git a/python-pypi/virtinst/DETAILS b/python-pypi/virtinst/DETAILS
index 3ab5e00..b1af615 100755
--- a/python-pypi/virtinst/DETAILS
+++ b/python-pypi/virtinst/DETAILS
@@ -1,5 +1,5 @@
             SPELL=virtinst
-          VERSION=0.400.0
+          VERSION=0.400.1
            SOURCE=$SPELL-$VERSION.tar.gz
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
     SOURCE_URL[0]=http://virt-manager.et.redhat.com/download/sources/$SPELL/$SOURCE
diff --git a/python-pypi/virtinst/HISTORY b/python-pypi/virtinst/HISTORY
index 0b3e157..309464c 100644
--- a/python-pypi/virtinst/HISTORY
+++ b/python-pypi/virtinst/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 0.400.1
+
 2009-01-16 George Sherwood <gsherwood at sourcemage.org>
 	* DEPENDS: updated case sub on libxml2. Bug 14997.
 
diff --git a/python-pypi/virtinst/virtinst-0.400.0.tar.gz.sig b/python-pypi/virtinst/virtinst-0.400.0.tar.gz.sig
deleted file mode 100644
index 20f93a0..0000000
Binary files a/python-pypi/virtinst/virtinst-0.400.0.tar.gz.sig and /dev/null differ
diff --git a/python-pypi/virtinst/virtinst-0.400.1.tar.gz.sig b/python-pypi/virtinst/virtinst-0.400.1.tar.gz.sig
new file mode 100644
index 0000000..83a6abc
Binary files /dev/null and b/python-pypi/virtinst/virtinst-0.400.1.tar.gz.sig differ
diff --git a/utils/virt-manager/DEPENDS b/utils/virt-manager/DEPENDS
index c3badd1..f03d6bf 100755
--- a/utils/virt-manager/DEPENDS
+++ b/utils/virt-manager/DEPENDS
@@ -2,13 +2,21 @@ depends  dbus-python            &&
 depends  gnome-python2          &&
 depends  gnome-python-desktop   &&
 depends  -sub "PYTHON" gtk-vnc  &&
-depends  libvirt                &&
 depends  -sub "PYTHON" libxml2  &&
 depends  pygtk2                 &&
 depends  python                 &&
-depends  virtinst               &&
 depends  -sub "pygtk2" vte      &&
 
+suggest_depends  libvirt                       \
+                 ''                            \
+                 ''                            \
+                 'for local Virtual Machines'  &&
+
+suggest_depends  virtinst                                   \
+                 ''                                         \
+                 ''                                         \
+                 'for provisioning local Virtual Machines'  &&
+                 
 optional_depends  gettext                        \
                   '--enable-nls'                 \
                   '--disable-nls'                \
diff --git a/utils/virt-manager/DETAILS b/utils/virt-manager/DETAILS
index 4bdebf0..32ac9ad 100755
--- a/utils/virt-manager/DETAILS
+++ b/utils/virt-manager/DETAILS
@@ -1,5 +1,5 @@
             SPELL=virt-manager
-          VERSION=0.6.0
+          VERSION=0.6.1
            SOURCE=$SPELL-$VERSION.tar.gz
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
     SOURCE_URL[0]=http://virt-manager.et.redhat.com/download/sources/$SPELL/$SOURCE
diff --git a/utils/virt-manager/HISTORY b/utils/virt-manager/HISTORY
index bf980e4..b56e50c 100644
--- a/utils/virt-manager/HISTORY
+++ b/utils/virt-manager/HISTORY
@@ -1,3 +1,8 @@
+2009-02-27 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 0.6.1
+	  Suggest dependencies on libvirt and virtinst for local operations,
+	  as these are not required for remote operation.
+
 2009-01-16 George Sherwood <gsherwood at sourcemage.org>
 	* DEPENDS: changed gtk-vnc & libxml2 sub to uppercase. Bug 14999
 	  & 14997
diff --git a/utils/virt-manager/virt-manager-0.6.0.tar.gz.sig b/utils/virt-manager/virt-manager-0.6.0.tar.gz.sig
deleted file mode 100644
index edb849b..0000000
Binary files a/utils/virt-manager/virt-manager-0.6.0.tar.gz.sig and /dev/null differ
diff --git a/utils/virt-manager/virt-manager-0.6.1.tar.gz.sig b/utils/virt-manager/virt-manager-0.6.1.tar.gz.sig
new file mode 100644
index 0000000..722b47a
Binary files /dev/null and b/utils/virt-manager/virt-manager-0.6.1.tar.gz.sig differ
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS
index 5f568f3..753cac3 100755
--- a/x11/gtk-vnc/DEPENDS
+++ b/x11/gtk-vnc/DEPENDS
@@ -3,4 +3,9 @@ depends  gnutls  &&
 optional_depends  python                \
                   '--with-python'       \
                   '--without-python'    \
-                  'for Python support'
+                  'for Python support'  &&
+
+optional_depends  NS-PLUGIN-COMPATIBLE      \
+                  '--enable-plugin=yes'     \
+                  '--enable-plugin=no'      \
+                  'for web browser plugin'
diff --git a/x11/gtk-vnc/DETAILS b/x11/gtk-vnc/DETAILS
index 1b011b1..aed82d6 100755
--- a/x11/gtk-vnc/DETAILS
+++ b/x11/gtk-vnc/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gtk-vnc
-         VERSION=0.3.7
+         VERSION=0.3.8
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY
index 4578de9..83f84a7 100644
--- a/x11/gtk-vnc/HISTORY
+++ b/x11/gtk-vnc/HISTORY
@@ -1,3 +1,9 @@
+2009-02-27 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 0.3.8
+	* DEPENDS: Optionally depend on NS-PLUGIN-COMPATIBLE for a browser
+	  plugin
+	* INSTALL: Install browser plugin README if plugin is requested
+
 2009-01-16 George Sherwood <george at beernabeer.com>
 	* SUB_DEPENDS: python -> PYTHON Bug #14999
 	* PRE_SUB_DEPENDS: python -> PYTHON Bug #14999
diff --git a/x11/gtk-vnc/INSTALL b/x11/gtk-vnc/INSTALL
new file mode 100755
index 0000000..ea38732
--- /dev/null
+++ b/x11/gtk-vnc/INSTALL
@@ -0,0 +1,31 @@
+default_install  &&
+
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL NS-PLUGIN-COMPATIBLE)
+then
+  # gtk-vnc only installs to libdir/mozilla/plugins :/
+  message "${MESSAGE_COLOR}Determine which browser plugins to install${DEFAULT_COLOR}" &&
+  if [[ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]]
+  then
+    message "${MESSAGE_COLOR}Installing plugin for xulrunner${DEFAULT_COLOR}" &&
+    install -m 0755 $SOURCE_DIRECTORY/plugin/gtk-vnc-plugin.so  \
+                    $INSTALL_ROOT/usr/lib/xulrunner/plugins
+  fi  &&
+
+  if [[ -d ${INSTALL_ROOT}/opt/firefox/plugins ]]
+  then
+    message "${MESSAGE_COLOR}Installing plugin for firefox-bin${DEFAULT_COLOR}" &&
+    install -m 0755 $SOURCE_DIRECTORY/plugin/gtk-vnc-plugin.so  \
+                    $INSTALL_ROOT/opt/firefox/plugins
+  fi  &&
+
+  if [[ -d ${INSTALL_ROOT}/usr/lib/seamonkey/plugins ]]
+  then
+    message "${MESSAGE_COLOR}Installing plugin for seamonkey${DEFAULT_COLOR}" &&
+    install -m 0755 $SOURCE_DIRECTORY/plugin/gtk-vnc-plugin.so  \
+                    $INSTALL_ROOT/usr/lib/seamonkey/plugins
+  fi  &&
+
+  mkdir -p $INSTALL_ROOT/usr/share/doc/$SPELL                       &&
+  install -m 0644 $SOURCE_DIRECTORY/plugin/README                   \
+                  $INSTALL_ROOT/usr/share/doc/$SPELL/README.plugin
+fi
diff --git a/x11/gtk-vnc/gtk-vnc-0.3.7.tar.gz.sig b/x11/gtk-vnc/gtk-vnc-0.3.7.tar.gz.sig
deleted file mode 100644
index 08a6c6b..0000000
Binary files a/x11/gtk-vnc/gtk-vnc-0.3.7.tar.gz.sig and /dev/null differ
diff --git a/x11/gtk-vnc/gtk-vnc-0.3.8.tar.gz.sig b/x11/gtk-vnc/gtk-vnc-0.3.8.tar.gz.sig
new file mode 100644
index 0000000..f37f43c
Binary files /dev/null and b/x11/gtk-vnc/gtk-vnc-0.3.8.tar.gz.sig differ



More information about the SM-Commit mailing list