[obconf/f16] fix config file loading (#739973)

[Miroslav Lichvar]

commit 78c4882120224c0ca602249143f3010a56454670
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Fri Sep 30 14:32:40 2011 +0200

    fix config file loading (#739973)

 obconf-loadconf.patch |   26 ++++++++++++++++++++++++++
 obconf.spec           |    7 ++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/obconf-loadconf.patch b/obconf-loadconf.patch
new file mode 100644
index 0000000..9451c39
--- /dev/null
+++ b/obconf-loadconf.patch
@@ -0,0 +1,26 @@
+commit cc7a18807663313ef111d86a75844ded0416a889
+Author: Dana Jansens <danakj at orodu.net>
+Date:   Fri Aug 5 12:05:10 2011 -0400
+
+    Load the rc.xml config file given on --config-file the same as Openbox (use the whole path given).
+
+diff --git a/src/main.c b/src/main.c
+index 9035e8d..a576253 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -233,11 +233,10 @@ int main(int argc, char **argv)
+     }
+ 
+     xmlIndentTreeOutput = 1;
+-    if (!obt_xml_load_config_file(parse_i,
+-                                  "openbox",
+-                                  (obc_config_file ?
+-                                   obc_config_file : "rc.xml"),
+-                                  "openbox_config"))
++    if (!((obc_config_file &&
++           obt_xml_load_file(parse_i, obc_config_file, "openbox_config")) ||
++          obt_xml_load_config_file(parse_i, "openbox", "rc.xml",
++                                   "openbox_config")))
+     {
+         obconf_error(_("Failed to load an rc.xml. You have probably failed to install Openbox properly."), TRUE);
+         exit_with_error = TRUE;
diff --git a/obconf.spec b/obconf.spec
index fa50e5e..897df26 100644
--- a/obconf.spec
+++ b/obconf.spec
@@ -1,6 +1,6 @@
 Name:		obconf
 Version:	2.0.3
-Release:	7.20100212gitb04658%{?dist}
+Release:	8.20100212gitb04658%{?dist}
 Summary:	A graphical configuration editor for the Openbox window manager
 
 Group:		User Interface/X
@@ -9,6 +9,7 @@ URL:		http://icculus.org/openbox/index.php/ObConf:About
 #Source0:	http://icculus.org/openbox/obconf/%{name}-%{version}.tar.gz
 Source0:	obconf-20100212gitb04658.tar.gz
 Patch0:		obconf-trans.patch
+Patch1:		obconf-loadconf.patch
 Patch2:		obconf-spinner.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,6 +28,7 @@ ObConf is a graphical configuration editor for the Openbox window manager.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1 -b .loadconf
 %patch2 -p1 -b .spinner
 
 
@@ -75,6 +77,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null
 
 
 %changelog
+* Fri Sep 30 2011 Miroslav Lichvar <mlichvar at redhat.com> - 2.0.3-8.20100212gitb04658
+- fix config file loading (#739973)
+
 * Fri Aug 05 2011 Miroslav Lichvar <mlichvar at redhat.com> - 2.0.3-7.20100212gitb04658
 - update to 20100212gitb04658 for openbox-3.5