[cclive: 2/2] Merge branch 'f20'

[Christopher Meng]

commit f2b30217234c451ede42c8e5bcc9c257c42d867c
Merge: 7ce02f9 d73d3f6
Author: Christopher Meng <rpm at cicku.me>
Date:   Mon Dec 2 13:07:44 2013 +0800

    Merge branch 'f20'
    
    Conflicts:
    	cclive.spec

 cclive.spec |   56 ++++++++++++++++++++++++++++++++++++++------------------
 sources     |    2 +-
 2 files changed, 39 insertions(+), 19 deletions(-)
---
diff --cc cclive.spec
index a9af3c6,db489b3..5a71690
--- a/cclive.spec
+++ b/cclive.spec
@@@ -20,26 -23,22 +23,25 @@@ Googlevideo, Break, Liveleak, Sevenload
  
  %build
  %configure
- 
  make %{?_smp_mflags}
  
- 
  %install
- make install DESTDIR=$RPM_BUILD_ROOT
- chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
- 
+ make install DESTDIR=%{buildroot}
+ chrpath --delete %{buildroot}%{_bindir}/%{name}
  
  %files
- %doc COPYING README 
- %{_bindir}/%{name}
+ %doc AUTHORS ChangeLog COPYING README 
+ %{_bindir}/cclive
  %{_bindir}/ccl
- %{_mandir}/man1/%{name}.1.gz
- 
+ %{_mandir}/man1/cclive.1*
  
  %changelog
+ * Mon Dec 02 2013 Christopher Meng <rpm at cicku.me> - 0.9.3-1
+ - Update to 0.9.4
+ 
 +* Fri Nov 29 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9.2-2
 +- Rebuild for libquvi SONAME change.
 +
  * Fri Aug 30 2013 Peter Robinson <pbrobinson at fedoraproject.org> 0.9.2-1
  - Update to 0.9.2, cleanup spec