summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Petersen <petersen@redhat.com>2014-02-11 15:43:33 +0900
committerJens Petersen <petersen@redhat.com>2014-02-11 15:43:33 +0900
commit9a2f9f58899b68371ea7b57e834c61a91a20f390 (patch)
tree24398ebc89406b74affa0bc419efe615b11aa4b0
parent903007851bc8778a7a88df8726e7a7364a460101 (diff)
downloadpandoc-standalone-9a2f9f58899b68371ea7b57e834c61a91a20f390.zip
pandoc-standalone-9a2f9f58899b68371ea7b57e834c61a91a20f390.tar.gz
pandoc-standalone-9a2f9f58899b68371ea7b57e834c61a91a20f390.tar.xz
do not statically link C deps; clear execstack on executables
-rw-r--r--pandoc.spec11
1 files changed, 9 insertions, 2 deletions
diff --git a/pandoc.spec b/pandoc.spec
index 0b84c35..bd81912 100644
--- a/pandoc.spec
+++ b/pandoc.spec
@@ -6,7 +6,7 @@
Name: pandoc
Version: %{pandoc_ver}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Conversion between markup formats
License: GPLv2+
@@ -113,7 +113,7 @@ a YAML format suitable for inclusion in pandoc YAML metadata.
%build
%global cabal cabal-dev
-%define cabal_configure %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} -f "embed_data_files" --ghc-options="-optl-static -optl-pthread"
+%define cabal_configure %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} -f "embed_data_files"
# sandbox pandoc-citeproc deps first since it includes pandoc
cd pandoc-citeproc-%{pandoc_citeproc_ver}
@@ -134,6 +134,9 @@ rm -rf %{buildroot}
cd pandoc-citeproc-%{pandoc_citeproc_ver}
%cabal -s ../cabal-dev copy --destdir=%{buildroot} -v
+# clear execstack
+execstack -c %{buildroot}%{_bindir}/*
+
# don't need the libs and the data files are embedded
rm -r %{buildroot}%{_libdir}/%{name}-%{pandoc_ver}
rm -r %{buildroot}%{_datadir}/%{name}-%{pandoc_ver}
@@ -163,6 +166,10 @@ rm -rf %{buildroot}
%changelog
+* Tue Feb 4 2014 Jens Petersen <petersen@redhat.com> - 1.12.3.1-4
+- do not statically link C deps, since static glibc is not portable anyway
+- clear execstack on executables
+
* Sun Feb 2 2014 Jens Petersen <petersen@redhat.com> - 1.12.3.1-3
- include pandoc-citeproc-0.3.0.1
- link programs statically