[ocp/f13] fix parsing timidity.cfg set SELinux file context textrel_shlib_t on libraries which contain non-PIC

[Charles R. Anderson]

commit f797631a4177b9533621ed438f63767719a0eaf1
Author: Chuck Anderson <cra at wpi.edu>
Date:   Sat Jun 4 11:39:01 2011 -0400

    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)

 ocp-0.1.20-timidity-parse-config.patch |   30 ++++++++++++++++++++++++++++++
 ocp.spec                               |   20 +++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/ocp-0.1.20-timidity-parse-config.patch b/ocp-0.1.20-timidity-parse-config.patch
new file mode 100644
index 0000000..d77d117
--- /dev/null
+++ b/ocp-0.1.20-timidity-parse-config.patch
@@ -0,0 +1,30 @@
+diff -up ocp-0.1.20/playgmi/gmitimidity.c.timidity ocp-0.1.20/playgmi/gmitimidity.c
+--- ocp-0.1.20/playgmi/gmitimidity.c.timidity	2010-05-17 05:55:16.000000000 -0400
++++ ocp-0.1.20/playgmi/gmitimidity.c	2011-06-01 23:36:26.491647508 -0400
+@@ -56,7 +56,7 @@ static void parse_config(FILE *input, in
+ 		if ((pos=strchr(line, '#')))
+ 			*pos=0;
+ 		base=line;
+-		while ((*base)&&(*base==' '))
++		while ((*base)&&isspace(*base))
+ 			base++;
+ 		if (!base)
+ 			continue;
+@@ -184,7 +184,7 @@ static int loadpatchTimidity( struct min
+ 		fprintf(stderr, "[timidity] not entry configured for program %d\n", program);
+ 		return errFileMiss;
+ 	}
+-	for (i=DirectoryStackIndex-1;i>=0;i--)
++	for (i=DirectoryStackIndex;i>=0;i--)
+ 	{
+ 		snprintf(path, sizeof(path), "%s/%s.pat", DirectoryStack[i], midInstrumentNames[program]);
+ 		if ((file=fopen(path, "r"))!=NULL)
+@@ -220,7 +220,7 @@ static int addpatchTimidity( struct mins
+ 		fprintf(stderr, "[timidity] not entry configured for program %d\n", program);
+ 		return errFileMiss;
+ 	}
+-	for (i=DirectoryStackIndex-1;i>=0;i--)
++	for (i=DirectoryStackIndex;i>=0;i--)
+ 	{
+ 		snprintf(path, sizeof(path), "%s/%s.pat", DirectoryStack[i], midInstrumentNames[program]);
+ 		if ((file=fopen(path, "r"))!=NULL)
diff --git a/ocp.spec b/ocp.spec
index 59b428b..e7231b7 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:2}%{?dist}
+%define release %{?snapshot:0.5.%{snapshot}snap}%{!?snapshot:3}%{?dist}
 
 Name: ocp
 Version: %{version}
@@ -19,6 +19,7 @@ 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
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: adplug-devel
@@ -41,6 +42,10 @@ Requires: hicolor-icon-theme
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+%ifarch %{ix86}
+Requires(post): /usr/sbin/semanage
+Requires(post): /sbin/restorecon
+%endif
 
 %description
 Open Cubic Player is a music file player ported from DOS that supports
@@ -53,6 +58,7 @@ visualizations.
 
 %prep
 %setup -q -n %{source}
+%patch0 -p1 -b .timidity
 unzip %{SOURCE1}
 mv license.txt license-images.txt
 unzip %{SOURCE2}
@@ -139,6 +145,13 @@ rm -rf %{buildroot}
 %post
 /sbin/install-info %{_infodir}/ocp.info.gz %{_infodir}/dir || :
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+%ifarch %{ix86}
+semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devmix\.so' 2>/dev/null || :
+semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devmixf\.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
 
 
 %preun
@@ -152,6 +165,11 @@ 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-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)
+
 * Wed Jun 01 2011 Charles R. Anderson <cra at wpi.edu> 0.1.20-2
 - remove --with-debug since it overrides optflags (bz#625884)