diff options
| -rwxr-xr-x | redhat/build/gather_rpm_sources.sh | 3 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 4 | ||||
| -rw-r--r-- | redhat/docker/f28/Dockerfile.x86_64 | 2 | ||||
| -rw-r--r-- | redhat/docker/oss150/packages | 1 | ||||
| -rw-r--r-- | redhat/docker/osstw/packages | 12 |
5 files changed, 14 insertions, 8 deletions
diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index fb9499e4f..decabea84 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -11,6 +11,8 @@ TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" DIST="$4" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) +[ -z "${SPECFILE}" ] && exit 1 + SOURCES=$(get_source_files.sh ${PKGNAME} ${TDE_VERSION} ${DIST}) TARBALL=$(get_latest_tarball_filename.sh ${PKGNAME} ${TDE_VERSION} || :) VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :) @@ -23,6 +25,7 @@ BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)" LOGFILE="${TMPPATH}/log.${COMP##*/}" mkdir -p "${TARGETDIR}" +rm -f "${TARGETDIR}/"* cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TARGETDIR}" diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 5b7ee0b3b..91b211fd3 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -46,7 +46,7 @@ case "${PKGNAME}" in "dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";; "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";; "digikam") PKGRUNTIME="digikam-i18n";; - "esound") PKGRUNTIME="esound-libs";; + "esound") PKGRUNTIME="libesd0";; "imlib1") PKGRUNTIME="${lib}Imlib1";; "knetworkmanager8") PKGRUNTIME="knetworkmanager";; "koffice") PKGRUNTIME="koffice-suite";; @@ -95,7 +95,7 @@ if [ -n "${DEVEL}" ]; then "avahi-tqt") PKGDEVEL="libavahi-tqt-devel";; "dbus-tqt") PKGDEVEL="libdbus-tqt-1-devel";; "dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";; - "esound") PKGDEVEL="esound-devel";; + "esound") PKGDEVEL="libesd-devel";; "imlib1") PKGDEVEL="${lib}Imlib-devel";; "koffice") PKGDEVEL="koffice-devel";; "lcms") PKGDEVEL="liblcms-devel";; diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64 index 44f7d21eb..dc5e685c8 100644 --- a/redhat/docker/f28/Dockerfile.x86_64 +++ b/redhat/docker/f28/Dockerfile.x86_64 @@ -3,7 +3,7 @@ FROM fedora:28 ARG TDE_VERSION=14.0.4 ARG ARCH=x86_64 -RUN echo "proxy=http://192.168.111.249:3128" >>"/etc/yum.conf" +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" # Add RPMFUSION repository RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm diff --git a/redhat/docker/oss150/packages b/redhat/docker/oss150/packages index aa2be744d..9a9ffe93c 100644 --- a/redhat/docker/oss150/packages +++ b/redhat/docker/oss150/packages @@ -58,6 +58,7 @@ ImageMagick-devel imlib2-devel intltool java-1_8_0-openjdk-devel +less libacl-devel libart_lgpl-devel libavahi-devel diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index ab1f81b10..68478e1a4 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -28,7 +28,6 @@ docbook-xsl-stylesheets doxygen GraphicsMagick dssi-devel fdupes -ffmpeg-devel fftw3-devel file-devel flac-devel @@ -59,6 +58,7 @@ imake imlib2-devel intltool java-1_8_0-openjdk-devel +less libacl-devel libart_lgpl-devel libavahi-devel @@ -97,6 +97,7 @@ libmtp-devel libmusicbrainz-devel libneon-devel libnjb-devel +libnsl-devel libofx-devel libopenssl-devel libotr-devel @@ -115,10 +116,11 @@ libsndfile-devel libtag-devel libtheora-devel libtiff-devel +libtirpc-devel libtool libtwolame-devel libudev-devel -libudisks2-devel +libudisks2-0-devel libv4l-devel libvisual-devel libvorbis-devel @@ -127,10 +129,12 @@ libwpd-devel libXdmcp-devel libxine-devel libxkbfile-devel -libXScrnSaver-devel +libXmu-devel libxslt-devel +libXss-devel libXt-devel libXtst-devel +libXxf86dga-devel lilo lirc-devel make @@ -155,7 +159,6 @@ pkcs11-helper-devel postgresql postgresql-devel python-devel -python-sip-devel rpcgen rpm-build rsvg-view @@ -168,7 +171,6 @@ sqlite3-devel subversion-devel sudo swig -sword-devel torsocks transfig unixODBC-devel |