[vttest/el6: 20/20] Merge remote-tracking branch 'origin/f21' into el6

[Christopher Meng]

commit 3c99269fd210444263467d6419ed4a6e70386638
Merge: 4d5c521 1c2e402
Author: Christopher Meng <i at cicku.me>
Date:   Fri Jul 18 10:10:04 2014 +0800

    Merge remote-tracking branch 'origin/f21' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	vttest.spec

 .gitignore                  |    1 +
 sources                     |    2 +-
 vttest-20111210-config.diff | 1417 +++++++++++++++++++++++++++++++++++++++++++
 vttest.spec                 |   35 +-
 4 files changed, 1429 insertions(+), 26 deletions(-)
---
diff --cc .gitignore
index 6ccdd54,675a7d2..b106dc0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,6 +1,3 @@@
  vttest-20071216.tgz
  /vttest-20100830.tgz
 -/vttest-20110705.tgz
 -/vttest-20111210.tgz
 -/vttest-20140116.tgz
+ /vttest-20140305.tgz
diff --cc vttest.spec
index 068be53,69c1260..029a450
--- a/vttest.spec
+++ b/vttest.spec
@@@ -1,9 -1,7 +1,7 @@@
  Name:           vttest
- Version:        20100830
+ Version:        20140305
 -Release:        2%{?dist}
 +Release:        1%{?dist}
  Summary:        Test the compatibility of so-called "VT100-compatible" terminals
- 
- Group:          Applications/System
  License:        MIT
  URL:            http://invisible-island.net/vttest/vttest.html
  Source0:        ftp://invisible-island.net/vttest/vttest-%{version}.tgz
@@@ -35,23 -25,49 +25,18 @@@ don
  %configure
  make %{?_smp_mflags}
  
- 
  %install
- rm -rf $RPM_BUILD_ROOT
- make install DESTDIR=$RPM_BUILD_ROOT
- 
- 
- %clean
- rm -rf $RPM_BUILD_ROOT
- 
 -make install DESTDIR=%{buildroot}
++%make_install
  
  %files
- %defattr(-,root,root,-)
  %doc BUGS CHANGES COPYING MANIFEST README
- %{_bindir}/*
- %{_mandir}/man?/*
+ %{_bindir}/vttest
+ %{_mandir}/man1/vttest.1*
  
  %changelog
 -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20140305-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
+ * Thu Mar 06 2014 Christopher Meng <rpm at cicku.me> - 20140305-1
+ - Update to 20140305
+ 
 -* Mon Jan 20 2014 Christopher Meng <rpm at cicku.me> - 20140116-1
 -- Update to 20140116
 -
 -* Mon Aug 19 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 20111210-6
 -- Don't run the autotools (Sources are incompatible w/ modern autotools)
 -  (FTBFS, RHBZ#992865)
 -- Add vttest-20111210-config.diff/Import automake-1.13's config.{sub,guess}
 -  (RHBZ#926707)
 -- Fix bogus %%changelog date.
 -
 -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20111210-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
 -* Wed May 08 2013 Adam Miller <maxamillion at fedoraproject.org> - 20111210-4
 -- #BZ926707 - support aarch64
 -
 -* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20111210-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20111210-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Sat Jan 14 2012 Adam Miller <maxamillion at fedoraproject.org> - 20111210-1
 -- Updated to latest upstream release
 -
 -* Wed Jul 13 2011 Adam Miller <maxamillion at fedoraproject.org> - 20110705-1
 -- Updated to latest upstream release
 -
  * Tue Apr 05 2011 Adam Miller <maxamillion at fedoraproject.org> - 20100830-1
  - Updated to latest upstream release
  - Added patch from dkutalek at redhat.com