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

Fix zfs.spec.in defaults 

Commit 2ee4e7da accidentally introduced two issues which only occur
when rebuilding the ZFS source rpm outside the ZFS build system.

1) The _dracutdir, _udevdir, and _udevruledir macros must be checked
   using the 'undefined' keyword.  This was just overlooked in the
   patch review and does not cause a failure when using 'make pkg'
   because the values are provided by the make target.

2) The default _udevruledir path included a typo.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #2310
This commit is contained in:
Brian Behlendorf 2014-06-12 13:11:26 -07:00
parent 2ee4e7da90
commit 5d2107d82b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpm/generic/zfs.spec.in
View File

@ -2,7 +2,7 @@
%global _libdir /%{_lib} %global _libdir /%{_lib}
# Set the default udev directory based on distribution. # Set the default udev directory based on distribution.
%if 0%{!?_udevdir} %if %{undefined _udevdir}
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 || 0%{?centos} >= 7 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 || 0%{?centos} >= 7
%global _udevdir %{_prefix}/lib/udev %global _udevdir %{_prefix}/lib/udev
%else %else
@ -11,16 +11,16 @@
%endif %endif
# Set the default udevrule directory based on distribution. # Set the default udevrule directory based on distribution.
%if 0%{!?_udevruledir} %if %{undefined _udevruledir}
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 || 0%{?centos} >= 7 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 || 0%{?centos} >= 7
%global _udevruledir %{_prefix}/lib/udevrule/rules.d %global _udevruledir %{_prefix}/lib/udev/rules.d
%else %else
%global _udevruledir /lib/udevrule/rules.d %global _udevruledir /lib/udev/rules.d
%endif %endif
%endif %endif
# Set the default dracut directory based on distribution. # Set the default dracut directory based on distribution.
%if 0%{!?_dracutdir} %if %{undefined _dracutdir}
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 || 0%{?centos} >= 7 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 || 0%{?centos} >= 7
%global _dracutdir %{_prefix}/lib/dracut %global _dracutdir %{_prefix}/lib/dracut
%else %else