Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.39 grimoire by Eric Sandall (b85e54c334574aaaa3c1b1b3af2c063d1c866f0a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.39 grimoire by Eric Sandall (b85e54c334574aaaa3c1b1b3af2c063d1c866f0a)
  • Date: Sat, 2 Jan 2010 12:11:03 -0600

GIT changes to stable-0.39 grimoire by Eric Sandall <sandalle AT sourcemage.org>:

disk/lvm/HISTORY
| 7 +++++++
disk/lvm/PRE_SUB_DEPENDS
| 5 +++++
disk/lvm/REPAIR^none^PRE_SUB_DEPENDS
| 5 +++++
disk/lvm/REPAIR^none^SUB_DEPENDS
| 6 ++++++
disk/lvm/SUB_DEPENDS
| 6 ++++++
gnome2-libs/gnome-python-desktop/HISTORY
| 6 ++++++
gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
| 1 +

gnome2-libs/gnome-python-desktop/REPAIR^6c46b9e1f598d0c8c2a58dc64333f9c8^PRE_SUB_DEPENDS
| 5 +++++
gnome2-libs/gnome-python-desktop/REPAIR^none^PRE_SUB_DEPENDS
| 1 +
gnome2-libs/gnome-python-desktop/SUB_DEPENDS
| 1 +
libs/libvirt/DEPENDS
| 2 +-
libs/libvirt/HISTORY
| 4 ++++
utils/virt-manager/DEPENDS
| 2 +-
utils/virt-manager/HISTORY
| 4 ++++
14 files changed, 53 insertions(+), 2 deletions(-)

New commits:
commit b85e54c334574aaaa3c1b1b3af2c063d1c866f0a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

virt-manager: Depends on gnome-python-desktop built with LIBRSVG2
Bug #15515
(cherry picked from commit cb3a57289a7ee30f27474f77e4c207f9303a184d)

commit 4c90eb912c4832b6d7c0b745b4838d3d4747b7e3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-python-desktop: Repair files for SUB_DEPENDS are not needed
(cherry picked from commit 9c9569fb5ac8aead5957158a52c80d466d8dff03)

commit 45e1c2798a93cb6ee1ae6f84a22d50aafd4f547e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-python-desktop: Add repair file for original PRE_SUB_DEPENDS
(cherry picked from commit 845a3d763cb7feeec0d621e5597ad3adea10fb2e)

commit 569173a982ce590af4555993cb14a749727f36d6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-python-desktop: Updated/added repair files for Bug #15515
(cherry picked from commit 7f3509f2a4fa0a21107501039a6528e2e456c214)

commit 1739ef3e66f318f55429ec07ed9b3bd86790ef7c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-python-desktop: Allow forcing librsvg2 (Bug #15515)
(cherry picked from commit 8fa9dc285221f4448d03b6daa24892e94fb50f47)

commit d0daa5861893be6fbb3638bd76c5b8f1ecf899ed
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

lvm: Add repair files for Bug #15517
(cherry picked from commit 5e49f09361469bdb3df2c7bdd7ec01c21c24d719)

commit 884c8e119ca2dcf1d06d6dd20c25083e73a37a5b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

lvm: Allow forcing all of LVM to be built
Fixes Bug #15517
(cherry picked from commit 6d695eaefec79ecc35fcfa1a7ea0db19f3b662e7)

commit 6418e91bedd023b120b3ae6b5d11e3b9eb2c2e17
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libvirt: Requires full build of lvm
Fixes Bug #15517

diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index c93922c..f92fd31 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,10 @@
+2010-01-02 Eric Sandall <sandalle AT sourcemage.org>
+ * REPAR^none^*: Add repair files for Bug #15517
+
+2009-12-18 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing all of LVM to be built
+ Fixes Bug #15517
+
2009-11-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.02.56

diff --git a/disk/lvm/PRE_SUB_DEPENDS b/disk/lvm/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..0b139d2
--- /dev/null
+++ b/disk/lvm/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LVM_FULL) [[ "$LVM_DM_ONLY" == "n" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/disk/lvm/REPAIR^none^PRE_SUB_DEPENDS
b/disk/lvm/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..0b139d2
--- /dev/null
+++ b/disk/lvm/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LVM_FULL) [[ "$LVM_DM_ONLY" == "n" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/disk/lvm/REPAIR^none^SUB_DEPENDS
b/disk/lvm/REPAIR^none^SUB_DEPENDS
new file mode 100755
index 0000000..7c24e9b
--- /dev/null
+++ b/disk/lvm/REPAIR^none^SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "$THIS_SUB_DEPENDS" in
+ LVM_FULL) LVM_DM_ONLY=n &&
+ persistent_add LVM_DM_ONLY ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1;;
+esac
diff --git a/disk/lvm/SUB_DEPENDS b/disk/lvm/SUB_DEPENDS
new file mode 100755
index 0000000..7c24e9b
--- /dev/null
+++ b/disk/lvm/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "$THIS_SUB_DEPENDS" in
+ LVM_FULL) LVM_DM_ONLY=n &&
+ persistent_add LVM_DM_ONLY ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1;;
+esac
diff --git a/gnome2-libs/gnome-python-desktop/HISTORY
b/gnome2-libs/gnome-python-desktop/HISTORY
index 4db3e23..18ab534 100644
--- a/gnome2-libs/gnome-python-desktop/HISTORY
+++ b/gnome2-libs/gnome-python-desktop/HISTORY
@@ -1,3 +1,9 @@
+2010-01-02 Eric Sandall <sandalle AT sourcemage.org>
+ * REPAIR^none^PRE_SUB_DEPENDS: Updated for Bug #15515
+
+2009-12-17 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing librsvg2 (Bug #15515)
+
2009-09-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.0

diff --git a/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
b/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
index 15362d4..24ee9ab 100755
--- a/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
+++ b/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
GTKHTML2) if is_depends_enabled $SPELL gtkhtml2; then return 0; fi;;
+LIBRSVG2) if is_depends_enabled $SPELL librsvg2; then return 0; fi;;
esac
return 1
diff --git
a/gnome2-libs/gnome-python-desktop/REPAIR^6c46b9e1f598d0c8c2a58dc64333f9c8^PRE_SUB_DEPENDS

b/gnome2-libs/gnome-python-desktop/REPAIR^6c46b9e1f598d0c8c2a58dc64333f9c8^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..24ee9ab
--- /dev/null
+++
b/gnome2-libs/gnome-python-desktop/REPAIR^6c46b9e1f598d0c8c2a58dc64333f9c8^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+GTKHTML2) if is_depends_enabled $SPELL gtkhtml2; then return 0; fi;;
+LIBRSVG2) if is_depends_enabled $SPELL librsvg2; then return 0; fi;;
+esac
+return 1
diff --git a/gnome2-libs/gnome-python-desktop/REPAIR^none^PRE_SUB_DEPENDS
b/gnome2-libs/gnome-python-desktop/REPAIR^none^PRE_SUB_DEPENDS
index 15362d4..24ee9ab 100755
--- a/gnome2-libs/gnome-python-desktop/REPAIR^none^PRE_SUB_DEPENDS
+++ b/gnome2-libs/gnome-python-desktop/REPAIR^none^PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
GTKHTML2) if is_depends_enabled $SPELL gtkhtml2; then return 0; fi;;
+LIBRSVG2) if is_depends_enabled $SPELL librsvg2; then return 0; fi;;
esac
return 1
diff --git a/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
b/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
index 048daee..12ad4f0 100755
--- a/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
+++ b/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
GTKHTML2) echo "gtkhtml2 bindings requested, forcing them."; depends
gtkhtml2;;
+LIBRSVG2) echo "librsvg2 support requested, forcing it."; depends librsvg2
'--enable-rsvg';;
*) echo "unknown sub-depends!"; return 1;;
esac
diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS
index bcf0dc9..2ae633d 100755
--- a/libs/libvirt/DEPENDS
+++ b/libs/libvirt/DEPENDS
@@ -5,7 +5,7 @@ depends curl &&
depends glib2 &&
depends gnutls &&

-depends lvm '--with-storage-lvm' &&
+depends -sub "LVM_FULL" lvm '--with-storage-lvm' &&

optional_depends avahi \
'--with-avahi' \
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index d315b19..01a9dee 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,7 @@
+2009-12-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Requires full build of lvm
+ Fixes Bug #15517
+
2009-11-21 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Requires device-mapper (lvm) to compile, no longer optional

diff --git a/utils/virt-manager/DEPENDS b/utils/virt-manager/DEPENDS
index e523562..1bb499d 100755
--- a/utils/virt-manager/DEPENDS
+++ b/utils/virt-manager/DEPENDS
@@ -1,7 +1,7 @@
depends dbus-python &&
depends gnome-python2 &&
depends gnome-keyring &&
-depends gnome-python-desktop &&
+depends -sub "LIBRSVG2" gnome-python-desktop &&
depends -sub "PYTHON" gtk-vnc &&
depends -sub "PYTHON" libxml2 &&
depends pygtk2 &&
diff --git a/utils/virt-manager/HISTORY b/utils/virt-manager/HISTORY
index c40a23c..b2e2fdb 100644
--- a/utils/virt-manager/HISTORY
+++ b/utils/virt-manager/HISTORY
@@ -1,3 +1,7 @@
+2009-12-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on gnome-python-desktop built with librsvg2
+ Bug #15515
+
2009-11-17 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 0.8.0
* DEPENDS: updated, forgot rarian



  • [SM-Commit] GIT changes to stable-0.39 grimoire by Eric Sandall (b85e54c334574aaaa3c1b1b3af2c063d1c866f0a), Eric Sandall, 01/02/2010

Archive powered by MHonArc 2.6.24.

Top of Page