From: Marcin Krol Date: Tue, 3 Feb 2015 20:33:14 +0000 (+0000) Subject: - drop x32 X-Git-Url: https://git.tld-linux.org/?p=packages%2FFHS.git;a=commitdiff_plain;h=9ccc76c9fbb3dd0bd5c447a23a0766f94bb62c63 - drop x32 --- diff --git a/FHS.spec b/FHS.spec index b75fe0a..dda2630 100644 --- a/FHS.spec +++ b/FHS.spec @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Podstawowy układ katalogów systemu Linux zgodny z FHS 2.3 Summary(tr.UTF-8): Temel dosya sistemi yapısı Name: FHS Version: 2.3 -Release: 36 +Release: 37 License: GPL Group: Base URL: http://www.pathname.com/fhs/ @@ -27,14 +27,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %else %define with_lib64 0 %endif -%if "%{_lib}" == "libx32" -%define with_libx32 1 -%else -%ifarch %{x8664} -# x32 as additional ABI -%define with_libx32 1 -%endif -%endif # avoid rpm 4.4.9 adding rm -rf buildroot, we need the dirs to check consistency %define __spec_clean_body %{nil} @@ -96,9 +88,6 @@ install -d \ %if %{with lib64} install -d $RPM_BUILD_ROOT{/lib64,/usr/lib64/games,/usr/local/lib64} %endif -%if %{with libx32} -install -d $RPM_BUILD_ROOT{/libx32,/usr/libx32/games,/usr/local/libx32} -%endif install -d $RPM_BUILD_ROOT/usr/share/man/man{1,2,3,4,5,6,7,8} install -d $RPM_BUILD_ROOT%{_locmandir}/man{1,2,3,4,5,6,7,8} @@ -213,9 +202,3 @@ posix.chown("/var/lock", 0, %{gid_uucp}) %dir /usr/lib64/games %dir /usr/local/lib64 %endif -%if %{with libx32} -%dir /libx32 -%dir /usr/libx32 -%dir /usr/libx32/games -%dir /usr/local/libx32 -%endif