[luci] Fix bad merge

[Fabio M. Di Nitto]

commit b57f2317c5deb78e060c597fc1afadeb2d5f2098
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Mon Dec 13 20:54:55 2010 +0100

    Fix bad merge
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

 luci.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/luci.spec b/luci.spec
index 3fe26e2..200a567 100644
--- a/luci.spec
+++ b/luci.spec
@@ -97,7 +97,7 @@ TurboGears 2 framework.
 
 %prep
 %setup -q
-cp %{sourcedir}/logo.png %{builddir}/luci-%{version}/luci/public/images
+cp %{_sourcedir}/logo.png %{_builddir}/luci-%{version}/luci/public/images
 # Important parameters for luci and start of its service
 %{__python} setup.py saveopts --filename=setup.cfg pkg_prepare  \
                      --username="%{luciusername}"               \
@@ -222,6 +222,9 @@ fi
 
 
 %changelog
+* Mon Dec 13 2010 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.22.6-2
+- Fix bad merge from upstream spec file
+
 * Mon Dec 13 2010 Ryan McCabe <rmccabe at redhat.com> - 0.22.6-1
 - New upstream release (0.22.6)