aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClark Williams <clark.williams@gmail.com>2015-01-08 10:05:09 -0600
committerClark Williams <clark.williams@gmail.com>2015-01-08 10:05:09 -0600
commitad45e23ec9bb02e226893632f3690aaaa57f87f1 (patch)
treeb1e585a09598afa697e4ff5a51dacbb1492112c8
parentbb517b15fac81150072d71bac7518e323e9f1288 (diff)
downloadrteval-ad45e23ec9bb02e226893632f3690aaaa57f87f1.tar.gz
picked up specfile changes from dist-git
Signed-off-by: Clark Williams <clark.williams@gmail.com>
-rw-r--r--rteval.spec13
1 files changed, 6 insertions, 7 deletions
diff --git a/rteval.spec b/rteval.spec
index 8a8abed..94399e6 100644
--- a/rteval.spec
+++ b/rteval.spec
@@ -3,7 +3,7 @@
Name: rteval
Version: 2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Utility to evaluate system suitability for RT Linux
Group: Development/Tools
@@ -91,10 +91,13 @@ rm -rf $RPM_BUILD_ROOT
/usr/bin/rteval
%changelog
-* Thu Mar 27 2014 Clark Williams <williams@redhat.com> - 2.1.4
+* Mon Nov 10 2014 Luis Claudio R. Goncalves <lgoncalv@redhat.com> - 2.1-5
+- rebuild for RHEL-7.1 (1151567)
+
+* Thu Mar 27 2014 Clark Williams <williams@redhat.com> - 2.1-4
- cherry-picked old commit to deal with installdir problem
-* Wed Mar 26 2014 Clark Williams <williams@redhat.com> - 2.1.3
+* Wed Mar 26 2014 Clark Williams <williams@redhat.com> - 2.1-3
- added sysstat requires to specfile
* Tue Mar 12 2013 David Sommerseth <davids@redhat.com> - 2.1-2
@@ -214,11 +217,7 @@ rm -rf $RPM_BUILD_ROOT
- added --annotate feature to rteval
- updates to xmlrpc code
-<<<<<<< HEAD
* Tue Apr 6 2010 Clark Williams <williams@redhat.com> - 1.20-1
-=======
-* Tue Apr 6 2010 Clark Williams <williams@redhat.com> - 1.20-1
->>>>>>> davids/davids/v2.0
- code fixes from Luis Claudio Goncalves <lgoncalv@redhat.com>
- from David Sommerseth <davids@redhat.com>:
- xmlrpc server updates