rpms/coq/F-8 coq.spec,1.5,1.6 import.log,1.5,1.6

[Alan Dunn]

Author: amdunn

Update of /cvs/pkgs/rpms/coq/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32762/F-8

Modified Files:
	coq.spec import.log 
Log Message:
Fix prelink issue that prevents binaries from working and implement execstack fix.



Index: coq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-8/coq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coq.spec	6 Aug 2008 01:55:49 -0000	1.5
+++ coq.spec	10 Sep 2008 17:16:11 -0000	1.6
@@ -25,7 +25,7 @@
 
 Name:		coq
 Version:	8.1pl3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Coq proof management system
 
 Group:		Applications/Engineering
@@ -49,11 +49,12 @@
 Patch4:		makefile-parser.patch
 Patch5:		parser-man.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs
+BuildRequires:	ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, prelink
 
 %if 0%{?fedora} < 9
 BuildRequires: tetex, tetex-latex
 # There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8
+# bz# 458467
 ExcludeArch: ppc64
 %else
 BuildRequires: texlive-latex, texlive-texmf
@@ -215,6 +216,9 @@
 # Fix permissions in the documentation
 chmod -R a+rX refman stdlib
 
+# Clear any execstack permissions that binaries may have
+execstack -c bin/*
+
 %install
 rm -rf %{buildroot}
 
@@ -242,6 +246,21 @@
 %endif
 mv RecTutorial.v %{buildroot}%{tutorialcodedir}
 
+# Make sure that prelink does not foul up our bytecode executables by
+# stripping them with a cron job. This is done in install to ensure
+# that exactly the files that are eventually installed are in the
+# list, not all of the files in the bin directory of the build
+
+%define prelinkfilename %{name}-prelink.conf
+cd %{buildroot}%{_bindir}
+for f in *; do
+file $f | grep "not stripped" | sed -e 's/:.*//' -e 's!^!-b %{_bindir}/!' >> %{prelinkfilename}
+done
+
+%define prelinkconfdir %{_sysconfdir}/prelink.conf.d
+mkdir -p %{buildroot}%{prelinkconfdir}
+mv %{prelinkfilename} %{buildroot}%{prelinkconfdir}
+
 %clean
 rm -rf %{buildroot}
 
@@ -256,10 +275,10 @@
 %{_datadir}/coq
 %{_bindir}/coq*
 %{_bindir}/gallina
-%{_bindir}/coq-parser
-%if %{opt}
-%{_bindir}/coq-parser.opt
-%endif
+# %%{_bindir}/coq-parser
+# %%if %%{opt}
+# %%{_bindir}/coq-parser.opt
+# %%endif
 # Exclude ide files to put in a separate package
 %exclude %{_bindir}/coqide*
 %exclude %{_datadir}/coq/ide
@@ -267,6 +286,10 @@
 %exclude %{_datadir}/coq/*.cmxa
 %endif
 %{tex_dir}/coq*
+# We DO want to replace any such file with this name - it will only be
+# for Coq, and we want to correctly reflect the set of files that
+# needs to be blacklisted from prelink with this new install
+%config %{prelinkconfdir}/%{prelinkfilename}
 
 %files coqide
 %defattr(-,root,root,-)
@@ -300,6 +323,9 @@
 %doc README.coq-emacs
 
 %changelog
+* Tue Sep 09 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-4
+- Added creation of prelink blacklist for any bytecode files.
+- Fixed execstack status for binaries.
 * Tue Aug 05 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-3
 - Changed parser to coq-parser to avoid name conflict with
   coda-client.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-8/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	6 Aug 2008 01:55:49 -0000	1.5
+++ import.log	10 Sep 2008 17:16:11 -0000	1.6
@@ -3,3 +3,4 @@
 coq-8_1pl3-2_fc8:F-8:coq-8.1pl3-2.fc8.src.rpm:1216557367
 coq-8_1pl3-2_fc8_1:F-8:coq-8.1pl3-2.fc8.1.src.rpm:1216558147
 coq-8_1pl3-3_fc8:F-8:coq-8.1pl3-3.fc8.src.rpm:1217987468
+coq-8_1pl3-4_fc8:F-8:coq-8.1pl3-4.fc8.src.rpm:1221066654