aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-10-16 10:08:10 +0200
committerMihai Moldovan <ionic@ionic.de>2017-10-16 10:08:10 +0200
commit07d308359995e07285b5c15d897c2617b52f0093 (patch)
tree2019195184b852d1ec5b1afcab3246490ed65492
parentf54e56d81675a0238d1061ac332aa056442b6560 (diff)
downloadnx-libs-07d308359995e07285b5c15d897c2617b52f0093.tar.gz
nx-libs-07d308359995e07285b5c15d897c2617b52f0093.tar.bz2
nx-libs-07d308359995e07285b5c15d897c2617b52f0093.zip
nx-libs.spec: drop ugly sed hack to push optflags to build system.
-rw-r--r--debian/changelog1
-rw-r--r--nx-libs.spec2
2 files changed, 1 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 22b38241f..c4bf56dab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
https://bugs.centos.org/view.php?id=13779 are resolved.
Backported from Arctica GH 3.6.x branch.
v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
+ - Drop ugly sed hack to push optflags to build system.
* debian/:
- Add x2goagent.options file for compatibility with x2goserver nightly.
* debian/roll-tarballs.sh:
diff --git a/nx-libs.spec b/nx-libs.spec
index ab32deb49..85cf8b13c 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -733,8 +733,6 @@ rm -Rf .preserve/
rm -Rf nx*/configure nx*/autom4te.cache*
# Install into /usr
sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def
-# Use rpm optflags
-sed -i -e 's#-O3#%{optflags}#' nx-X11/config/cf/host.def
# Use multilib dirs
# We're installing binaries into %%{_libdir}/nx/bin rather than %%{_libexedir}/nx
# because upstream expects libraries and binaries in the same directory