diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-11-07 15:32:15 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-11-07 15:32:15 +0100 |
| commit | e187705a4cf93d04d69e4b58351c128432bf8ba8 (patch) | |
| tree | 863436fe53d6780c1f9303f0061c520f39b4eeab /redhat/build | |
| parent | 10d8be91c9ba6a6360c6ac9ee818408c42c0663b (diff) | |
| download | tde-packaging-e187705a4cf93d04d69e4b58351c128432bf8ba8.tar.gz tde-packaging-e187705a4cf93d04d69e4b58351c128432bf8ba8.zip | |
RPM Packaging: update for 14.0.2
Diffstat (limited to 'redhat/build')
| -rwxr-xr-x | redhat/build/build_rpm_package.sh | 6 | ||||
| -rwxr-xr-x | redhat/build/get_installed_package_version.sh | 2 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 2 | ||||
| -rwxr-xr-x | redhat/build/get_spec_version.sh | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 64d10e705..e3cd5478f 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -86,13 +86,7 @@ rpmbuild -ba \ --define "tde_prefix /opt/trinity" \ --define "preversion ${PREVERSION:-}" \ --define "tde_patch 1" \ - --define "with_akode 1" \ - --define "with_jack 1" \ - --define "with_lame 1" \ - --define "with_mad 1" \ --define "with_mpeg 1" \ - --define "with_xine 1" \ - --define "with_xscreensaver 1" \ "${TEMPDIR}/${SPECFILE##*/}" RET=$? diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh index ae2e726c1..4df81b12b 100755 --- a/redhat/build/get_installed_package_version.sh +++ b/redhat/build/get_installed_package_version.sh @@ -13,7 +13,7 @@ if [ -z "${VERSION}" ] || [[ "${VERSION}" =~ "not installed" ]]; then VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" ${PKGNAME}) fi -VERSION=${VERSION/-*_/\~} +VERSION=${VERSION/-0_/\~} #VERSION=${VERSION%-[0-9]} VERSION=${VERSION%.opt} VERSION=${VERSION%.[a-z]*} diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index ae0790e7a..f2ed2d011 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -102,7 +102,7 @@ if [ -n "${DEVEL}" ]; then "libkipi") PKGDEVEL="${lib}kipi-devel";; "tqca") PKGDEVEL="${lib}tqca-devel";; "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";; - "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers";; + "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";; # Default case: development package has same name as runtime package, plus '-devel' suffix. *) PKGDEVEL="${PKGRUNTIME}-devel";; esac diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh index 82c61dcd8..0980fd239 100755 --- a/redhat/build/get_spec_version.sh +++ b/redhat/build/get_spec_version.sh @@ -12,7 +12,7 @@ SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) VERSION=$(sed -n "/^Version:/ s/Version:[ ]*//p" ${SPECFILE}) RELEASE=$(sed -n "/^Release:/ s/Release:[ ]*//p" ${SPECFILE}) VERSION=$(rpm -E "${VERSION}") -RELEASE=$(rpm -E "${RELEASE}") +RELEASE=$(rpm --define "tde_version ${TDE_VERSION}" -E "${RELEASE}") RELEASE=${RELEASE%$(rpmdist.sh --dist)} echo ${VERSION}-${RELEASE} |