From 12294ad8744af37d0c24eb54eadfd8e58b8b4464 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 28 Aug 2009 23:16:03 +0000 Subject: [PATCH] Accepting request 19190 from Virtualization Copy from Virtualization/virt-manager based on submit request 19190 from user charlesa OBS-URL: https://build.opensuse.org/request/show/19190 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=28 --- virt-manager.changes | 6 ++++++ virt-manager.spec | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/virt-manager.changes b/virt-manager.changes index de050813..8e91d783 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 28 16:44:17 MDT 2009 - carnold@novell.com + +- Building for 11.1 or sles11 fails because of changes in the + schemas location. Fix spec file to handle it. + ------------------------------------------------------------------- Thu Jul 30 20:03:21 MDT 2009 - carnold@novell.com diff --git a/virt-manager.spec b/virt-manager.spec index f63b5e2a..62cbb9fc 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -26,7 +26,7 @@ Name: virt-manager %define virtinst_rel 0 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} Version: 0.8.0 -Release: 1 +Release: 2 Summary: Virtual Machine Manager Group: System/Monitoring License: LGPL v2.1 or later @@ -193,10 +193,13 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING AUTHORS ChangeLog # %dir %attr(775,root,root) /etc/gconf # %dir %attr(775,root,root) /etc/gconf/schemas -# %config %{gsysconfdir}/gconf/schemas/%{name}.schemas +%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} %dir %{_datadir}/gconf %dir %{_datadir}/gconf/schemas %config %{_datadir}/gconf/schemas/%{name}.schemas +%else +%{gsysconfdir}/gconf/schemas/%{name}.schemas +%endif %{_bindir}/%{name} %{_libexecdir}/%{name}-launch %dir %{_datadir}/%{name}