Merge branch 'master' into el6

Conflicts: .gitignore sources yapet.spec
2018-03-28 11:05:34 -07:00 · 2014-03-25 12:24:28 +08:00 · 2011-08-05 20:52:18 +02:00 · 2010-07-29 16:19:17 +00:00 · 2010-07-09 18:43:40 +00:00 · 2010-06-30 16:20:14 +00:00
2 changed files with 1 additions and 22 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,4 @@
-yapet-0.6.tar.gz
+/yapet-0.6.tar.gz
 /yapet-0.7.tar.bz2
 /yapet-0.8pre2.tar.bz2
 /yapet-1.0.tar.bz2
--- a/yapet.spec
+++ b/yapet.spec
@ -102,27 +102,6 @@ rm -frv %{buildroot}%{_docdir}
 * Thu Feb 27 2014 Christopher Meng <rpm@cicku.me> - 1.0-1
 - Update to 1.0

-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-0.6.pre2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-0.5.pre2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-0.4.pre2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-0.3.pre2
- Rebuilt for c++ ABI breakage
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-0.2.pre2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Mar 15 2011 Simon Wesp <cassmdodiah@fedoraproject.org> - 0.8-0.1.pre2
- Update
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
 * Sun Nov 14 2010 Simon Wesp <cassmdodiah@fedoraproject.org> - 0.7-1
 - New upstream release
Author	SHA1	Message	Date
Greg Bailey	f0195db72b	Merge branch 'master' into el6	2018-03-28 11:05:34 -07:00
Christopher Meng	f00779222e	Merge branch 'master' into el6 Conflicts: .gitignore sources yapet.spec	2014-03-25 12:24:28 +08:00
Simon Wesp	326c0acf8b	New Upstream Release	2011-08-05 20:52:18 +02:00
Fedora Release Engineering	eb17d07a43	dist-git conversion	2010-07-29 16:19:17 +00:00
cassmodiah	e96680e440	initial import	2010-07-09 18:43:40 +00:00
cassmodiah	97d9162096	customized for EL-6	2010-06-30 16:20:14 +00:00
Dennis Gilmore	5fb60b6c5b	Initialize branch EL-6 for yapet	2010-05-08 02:29:50 +00:00
Bill Nottingham	1cc0fb507e	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:12:16 +00:00
cassmodiah	a708ac7aa9	initial release	2009-10-13 17:24:01 +00:00