diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-10-12 18:24:41 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-10-12 18:24:41 +0900 |
| commit | b72b2f09d3239813de7f3e4cf44310ca25561e64 (patch) | |
| tree | 02502370332e8fbb612ef4d1290998499a7e6ca1 /redhat/build/build_rpm_package.sh | |
| parent | 9d54bb35b5fb67dd052757e3a22cb83acbba9c50 (diff) | |
| parent | 9806eb7f9c92362ca0d03e7410d1ecee9b61a38f (diff) | |
| download | tde-packaging-b72b2f09d3239813de7f3e4cf44310ca25561e64.tar.gz tde-packaging-b72b2f09d3239813de7f3e4cf44310ca25561e64.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/build/build_rpm_package.sh')
| -rwxr-xr-x | redhat/build/build_rpm_package.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 718efa648..9aae43d36 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -44,11 +44,6 @@ if [ -r "${TEMPDIR}/one.patch" ]; then -e "/%setup/ s/$/\n%patch0 -p1/" fi -# Determines if we are running an i386 or x86_64 distro -if [ "$(rpm -q --qf '%{arch}\n' kernel | tail -n 1)" = "i686" ]; then - ARGS="${ARGS} --target=i686" -fi - [ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}" RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})" @@ -67,6 +62,8 @@ rpmbuild -ba \ --define "tde_version ${TDE_VERSION}" \ --define "tde_prefix /opt/trinity" \ --define "preversion ${PREVERSION:-}" \ + --define "with_jack 1" \ + --define "with_xscreensaver 1" \ ${ARGS} \ "${TEMPDIR}/${SPECFILE##*/}" RET=$? |