diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2012-06-21 16:56:56 +0100 |
|---|---|---|
| committer | Graydon, Tracy <tracy.graydon@intel.com> | 2013-01-17 12:36:20 -0800 |
| commit | 2512f764eb7163927f02cbaac952fae910970c89 (patch) | |
| tree | 362fc43bece63f63049f6b5385bc4935f5d27f08 /packaging/rpm.spec | |
| parent | baa9daa099c33b3b2e0137d77d93026ddbbfa23c (diff) | |
| download | rpm-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.spec')
| -rw-r--r-- | packaging/rpm.spec | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging/rpm.spec b/packaging/rpm.spec index b83d13b..e5c37c8 100644 --- a/packaging/rpm.spec +++ b/packaging/rpm.spec @@ -1,7 +1,6 @@ # run internal testsuite? %bcond_without check - Name: rpm Version: 4.9.1 Release: 4 @@ -180,7 +179,10 @@ rm -f rpmdb/db.h %patch86 -p1 %patch87 -p1 -b .msm %patch90 -p1 +<<<<<<< HEAD %patch100 -p1 +======= +>>>>>>> 6863478... fixed optflags and perl auto-dependencies rm -f m4/libtool.m4 |