From 8206793a70e1c8514ac20b7ad3ef1a472950b77c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 5 May 2012 10:42:56 -0400 Subject: [PATCH] Revert "manifest local" This reverts commit b05275865206acaf6b991212208984df878d86ba. Conflicts: gnomeos/3.4/gnomeos-3.4-src.json --- gnomeos/3.4/gnomeos-3.4-src.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnomeos/3.4/gnomeos-3.4-src.json b/gnomeos/3.4/gnomeos-3.4-src.json index f58a5ea2..df986a32 100644 --- a/gnomeos/3.4/gnomeos-3.4-src.json +++ b/gnomeos/3.4/gnomeos-3.4-src.json @@ -26,8 +26,7 @@ "netfilter": "git:git://git.netfilter.org/", "cgwalters": "git:git://github.com/cgwalters/"}, - "patches": {"src": "git:/src/ostree", - "branch": "wip/ostbuild-v2", + "patches": {"src": "gnome:ostree", "subdir": "gnomeos/3.4"}, "components": [ @@ -574,8 +573,7 @@ {"src": "gnome:libsoup", "config-args": ["--disable-tls-check"]}, - {"src": "git:/src/ostree", - "branch": "wip/ostbuild-v2", + {"src": "gnome:ostree", "config-opts": ["--disable-documentation", "--with-soup-gnome"]},