[sx] Copy the CHANGELOG in %prep

Niels de Vos devos at fedoraproject.org
Mon Dec 5 13:35:03 UTC 2011


commit 2e7c645d3dd99ae3ec6460b574dd63f385891847
Author: Niels de Vos <ndevos at redhat.com>
Date:   Mon Dec 5 13:32:30 2011 +0000

    Copy the CHANGELOG in %prep
    
    Using %{SOURCE1} is not valid in %files/%doc:
    > Processing files: sx-2.06-1.fc17.noarch
    > error: Can't mix special %doc with other forms: /builddir/build/SOURCES/CHANGELOG.Fedora

 sx.spec |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/sx.spec b/sx.spec
index 2955c37..2b6fc34 100644
--- a/sx.spec
+++ b/sx.spec
@@ -24,6 +24,7 @@ has a class defined.
 
 %prep
 %setup -q
+%{__cp} %{SOURCE1} .
 
 %build
 %{__python} setup.py build
@@ -37,7 +38,7 @@ has a class defined.
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE AUTHORS PKG-INFO %{SOURCE1}
+%doc LICENSE AUTHORS PKG-INFO CHANGELOG.Fedora
 %doc doc/*
 %{_bindir}/sxconsole
 %{python_sitelib}/*


More information about the scm-commits mailing list