summaryrefslogtreecommitdiff
path: root/packaging/rpm.changes
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2012-06-21 16:56:56 +0100
committerGraydon, Tracy <tracy.graydon@intel.com>2013-01-17 12:36:20 -0800
commit2512f764eb7163927f02cbaac952fae910970c89 (patch)
tree362fc43bece63f63049f6b5385bc4935f5d27f08 /packaging/rpm.changes
parentbaa9daa099c33b3b2e0137d77d93026ddbbfa23c (diff)
downloadrpm-2512f764eb7163927f02cbaac952fae910970c89.tar.gz
rpm-2512f764eb7163927f02cbaac952fae910970c89.tar.bz2
rpm-2512f764eb7163927f02cbaac952fae910970c89.zip
Remove the crufty header stuff I missed in the spec
Diffstat (limited to 'packaging/rpm.changes')
-rw-r--r--packaging/rpm.changes8
1 files changed, 5 insertions, 3 deletions
diff --git a/packaging/rpm.changes b/packaging/rpm.changes
index c5fac79..fa42028 100644
--- a/packaging/rpm.changes
+++ b/packaging/rpm.changes
@@ -1,3 +1,8 @@
+* Thu Jan 17 20:11:27 UTC 2013 - tracy.graydon@intel.com
+- Cherry-pick 6863478fddde08f15ef1368267a9f52d1b3e1ada from 1.0_post branch to fix optflags.patch.
+- Resolve conflicts with changelog and spec file resulting from cherry-pick
+- Fixes DEVT-41
+
* Thu Sep 6 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0
- Changes to the security plugin
- Using libmagic instead of file utility to check file's content
@@ -68,9 +73,6 @@
* Mon Jun 25 2012 Anas Nashif <anas.nashif@intel.com> 70cc161
- require bzip2-devel >= 1.0.5
-* Thu Jun 21 2012 Anas Nashif <anas.nashif@intel.com> 6863478
-- fixed optflags and perl auto-dependencies
-
* Thu Jun 21 2012 Anas Nashif <anas.nashif@intel.com> c290eab
- disable perl auto requires
- fixed optflags