[ocp/f13] conditionalize compiling the i386 assembly version, and default to off: with-i386asm only set SELinu

[Charles R. Anderson]

commit 746bc0a2af02c513d90f495cb7f4a06955d6f8c8
Author: Chuck Anderson <cra at wpi.edu>
Date:   Sat Jun 4 13:11:37 2011 -0400

    conditionalize compiling the i386 assembly version, and default to off:
    with-i386asm
    only set SELinux fcontexts when compiling i386 assembly version
    fix changelog days

 ocp.spec |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/ocp.spec b/ocp.spec
index 6556f45..41fbd1d 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,6 +1,6 @@
 #define snapshot 20100401
 %define version 0.1.20
-%define release %{?snapshot:0.5.%{snapshot}snap}%{!?snapshot:4}%{?dist}
+%define release %{?snapshot:0.5.%{snapshot}snap}%{!?snapshot:5}%{?dist}
 
 Name: ocp
 Version: %{version}
@@ -19,7 +19,8 @@ URL: http://stian.cubic.org/coding-ocp.php
 Source0: http://stian.cubic.org/ocp/%{source}.tar.bz2
 Source1: ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2: ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
-Patch0: ocp-0.1.20-timidity-parse-config.patch
+Patch0: ocp-0.1.20-no-i386-asm.patch
+Patch1: ocp-0.1.20-timidity-parse-config.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: adplug-devel
@@ -43,9 +44,11 @@ Requires: hicolor-icon-theme
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 %ifarch %{ix86}
+%if %{?_with_i386asm:1}%{!?_with_i386asm:0}
 Requires(post): /usr/sbin/semanage
 Requires(post): /sbin/restorecon
 %endif
+%endif
 
 %description
 Open Cubic Player is a music file player ported from DOS that supports
@@ -58,7 +61,10 @@ visualizations.
 
 %prep
 %setup -q -n %{source}
-%patch0 -p1 -b .timidity
+%if %{?_with_i386asm:0}%{!?_with_i386asm:1}
+%patch0 -p1 -b .noi386asm
+%endif
+%patch1 -p1 -b .timidity
 unzip %{SOURCE1}
 mv license.txt license-images.txt
 unzip %{SOURCE2}
@@ -146,12 +152,14 @@ rm -rf %{buildroot}
 /sbin/install-info %{_infodir}/ocp.info.gz %{_infodir}/dir || :
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 %ifarch %{ix86}
+%if %{?_with_i386asm:1}%{!?_with_i386asm:0}
 semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmix\.so' 2>/dev/null || :
 semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
 semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
 semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
 restorecon -R %{_libdir}/ocp-* || :
 %endif
+%endif
 
 
 %preun
@@ -165,10 +173,16 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 
 
 %changelog
-* Wed Jun 03 2011 Charles R. Anderson <cra at wpi.edu> 0.1.20-4
+* Sat Jun 04 2011 Charles R. Anderson <cra at wpi.edu> 0.1.20-5
+- conditionalize compiling the i386 assembly version, and default to off:
+  --with-i386asm
+- only set SELinux fcontexts when compiling i386 assembly version
+- fix changelog days
+
+* Fri Jun 03 2011 Charles R. Anderson <cra at wpi.edu> 0.1.20-4
 - correct fcontext regexps and restorecon glob
 
-* Wed Jun 03 2011 Charles R. Anderson <cra at wpi.edu> 0.1.20-3
+* Fri Jun 03 2011 Charles R. Anderson <cra at wpi.edu> 0.1.20-3
 - fix parsing timidity.cfg
 - set SELinux file context textrel_shlib_t on libraries which contain non-PIC
   i386 assembly so we don't need allow_execmod (32-bit i386 build only)