Skip to content
Snippets Groups Projects
Commit 49b81289 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

packaging: add fedora 37

Update repo file and update jami-qt.spec to follow name changes

Change-Id: Iec616c3ae7c33c9c443954e15a8c5a2c2d63f964
parent fbc5bdd1
Branches
Tags
No related merge requests found
...@@ -169,6 +169,7 @@ DISTRIBUTIONS := \ ...@@ -169,6 +169,7 @@ DISTRIBUTIONS := \
ubuntu_22.04 \ ubuntu_22.04 \
fedora_35 \ fedora_35 \
fedora_36 \ fedora_36 \
fedora_37 \
opensuse-leap_15.3 \ opensuse-leap_15.3 \
opensuse-leap_15.4 \ opensuse-leap_15.4 \
snap snap
......
FROM fedora:37
RUN dnf clean all
RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
dnf install -y mock
RUN dnf groupinstall -y "X Software Development"
RUN dnf install -y \
git \
rpm-build \
tar \
make \
autoconf \
automake \
nasm \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
libcurl-devel \
libtool \
mesa-libgbm-devel \
mesa-dri-drivers \
dbus-devel \
expat-devel \
pcre-devel \
yaml-cpp-devel \
dbus-c++-devel \
dbus-devel \
libXext-devel \
libXfixes-devel \
yasm \
python2.7 \
speex-devel \
gsm-devel \
chrpath \
check \
astyle \
uuid-c++-devel \
gettext-devel \
gcc-c++ \
which \
alsa-lib-devel \
systemd-devel \
libuuid-devel \
uuid-devel \
gnutls-devel \
nettle-devel \
opus-devel \
patch \
jsoncpp-devel \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
libvdpau-devel \
msgpack-devel \
NetworkManager-libnm-devel \
openssl-devel \
clutter-devel \
clutter-gtk-devel \
libappindicator-gtk3-devel \
libnotify-devel \
libupnp-devel \
qrencode-devel \
libargon2-devel \
libsndfile-devel \
libdrm \
gperf \
bison \
clang \
clang-devel \
llvm-devel \
nodejs \
flex \
gstreamer1 gstreamer1-devel \
gstreamer1-plugins-base-devel \
gstreamer1-plugins-good \
gstreamer1-plugins-bad-free-devel \
nss-devel \
libxcb* \
libxkb* \
libX11-devel \
vulkan-devel \
libXrender-devel \
xcb-util-* \
xz \
xkeyboard-config \
libnotify \
wget \
libstdc++-static \
sqlite-devel \
perl-generators \
perl-English \
libxshmfence-devel \
ninja-build \
clang \
cmake
ADD scripts/build-package-rpm.sh /opt/build-package-rpm.sh
CMD ["/opt/build-package-rpm.sh"]
...@@ -119,7 +119,7 @@ echo "$JAMI_KEY" > "$GPG_FILE" ...@@ -119,7 +119,7 @@ echo "$JAMI_KEY" > "$GPG_FILE"
rm -f /var/lib/rpm/.rpm.lock > /dev/null 2>&1 rm -f /var/lib/rpm/.rpm.lock > /dev/null 2>&1
rpm --import "$GPG_FILE" > /dev/null 2>&1 rpm --import "$GPG_FILE" > /dev/null 2>&1
jami_repo_name="$NAME \$releasever - \$basearch - Jami" jami_repo_name="$DISTRIBUTION \$releasever - \$basearch - Jami"
jami_repo_base_url="$JAMI_REPO_BASE/$ID_\$releasever" jami_repo_base_url="$JAMI_REPO_BASE/$ID_\$releasever"
# Add an entry for the package repository to the trusted package. # Add an entry for the package repository to the trusted package.
......
...@@ -113,6 +113,8 @@ if [ ! -f "${RPM_PATH}" ]; then ...@@ -113,6 +113,8 @@ if [ ! -f "${RPM_PATH}" ]; then
cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc35.x86_64.rpm "${RPM_PATH}" cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc35.x86_64.rpm "${RPM_PATH}"
elif [[ "${DISTRIBUTION}" == "fedora_36" ]]; then elif [[ "${DISTRIBUTION}" == "fedora_36" ]]; then
cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc36.x86_64.rpm "${RPM_PATH}" cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc36.x86_64.rpm "${RPM_PATH}"
elif [[ "${DISTRIBUTION}" == "fedora_37" ]]; then
cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc37.x86_64.rpm "${RPM_PATH}"
else else
cp /root/rpmbuild/RPMS/x86_64/jami-libqt-*.rpm "${RPM_PATH}" cp /root/rpmbuild/RPMS/x86_64/jami-libqt-*.rpm "${RPM_PATH}"
fi fi
......
...@@ -151,7 +151,7 @@ function package_rpm() ...@@ -151,7 +151,7 @@ function package_rpm()
mkdir -p ${DISTRIBUTION_REPOSITORY_FOLDER} mkdir -p ${DISTRIBUTION_REPOSITORY_FOLDER}
# .repo file # .repo file
name="Jami \$releasever - \$basearch - jami" name="${DISTRIBUTION%_*} \$releasever - \$basearch - jami"
baseurl="https://dl.jami.net/${CHANNEL}/${DISTRIBUTION%_*}_\$releasever" baseurl="https://dl.jami.net/${CHANNEL}/${DISTRIBUTION%_*}_\$releasever"
cat << EOF > ${DISTRIBUTION_REPOSITORY_FOLDER}/jami-${CHANNEL}.repo cat << EOF > ${DISTRIBUTION_REPOSITORY_FOLDER}/jami-${CHANNEL}.repo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment