Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Minor spec file cleanup for srpm case. 

Ensure kpkg is defined is srpm case before using it to define
the krequires macro.  Interestingly this is not an issue for
rpm-4.7.1-4 but it is for rpm-4.4.2.3-18.
This commit is contained in:
Brian Behlendorf 2010-05-18 10:08:29 -07:00
parent 98d5d8bd50
commit d404dd1dad
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zfs-modules.spec.in
View File

@ -22,7 +22,7 @@
%define kobj %{require_kobj} %define kobj %{require_kobj}
%endif %endif
# SLES 10, SLES 11: # SLES:
%if %{defined suse_version} %if %{defined suse_version}
%if %{undefined kver} %if %{undefined kver}
%ifarch ppc64 %ifarch ppc64
@ -104,7 +104,7 @@
%endif %endif
%else %else
# Fedora 11: # Fedora:
%if %{defined fedora} %if %{defined fedora}
%if %{undefined kver} %if %{undefined kver}
%define klnk %{_usrsrc}/kernels/*/include/config %define klnk %{_usrsrc}/kernels/*/include/config
@ -186,7 +186,9 @@
# final RPM should be keyed to the kernel version it was built against. # final RPM should be keyed to the kernel version it was built against.
%if %{defined build_src_rpm} %if %{defined build_src_rpm}
%define release @ZFS_META_RELEASE@ %define release @ZFS_META_RELEASE@
%if %{defined kpkg}
%define krequires %{kpkg} %define krequires %{kpkg}
%endif
%define splrequires %{splpkg} %define splrequires %{splpkg}
%else %else
%define relext %(echo %{kverpkg} | %{__sed} -e 's/-/_/g') %define relext %(echo %{kverpkg} | %{__sed} -e 's/-/_/g')