[sfk/el6: 3/3] Merge branch 'master' into f20
Christopher Meng
cicku at fedoraproject.org
Thu Feb 12 10:50:48 UTC 2015
commit 28c9570b71e07e50f84863dc03b5684d3b2ee451
Merge: 7795c6c fbaad1b
Author: Christopher Meng <i at cicku.me>
Date: Thu Feb 12 18:49:15 2015 +0800
Merge branch 'master' into f20
.gitignore | 1 +
sfk.spec | 36 ++++++++++++++++++++++++++++--------
sources | 2 +-
3 files changed, 30 insertions(+), 9 deletions(-)
---
diff --cc sfk.spec
index f317559,173ac54..219fc93
--- a/sfk.spec
+++ b/sfk.spec
@@@ -16,10 -19,19 +19,19 @@@ Note that Fedora ships the OSE(Open Sou
%prep
%setup -q
+ # More friendly to users
+ %if 0%{?fedora}
+ sed -i 's|"linux-lib6"|"Fedora %{?fedora} %{?_arch}"|' sfk.cpp
+ %endif
+
+ %if 0%{?rhel}
+ sed -i 's|"linux-lib6"|"Red Hat Enterprise Linux %{?rhel} %{?_arch}"|' sfk.cpp
+ %endif
%build
+ autoreconf -fiv
%configure
-%make_build
+make %{?_smp_mflags}
%install
%make_install
More information about the scm-commits
mailing list