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

packaging: add fedora 32

Change-Id: Ida94131950baf124354b4cb5a521271aaeddee73
parent 841d8e74
No related branches found
No related tags found
No related merge requests found
...@@ -124,6 +124,8 @@ package-all: package-debian_9 \ ...@@ -124,6 +124,8 @@ package-all: package-debian_9 \
package-fedora_30_i386 \ package-fedora_30_i386 \
package-fedora_31 \ package-fedora_31 \
package-fedora_31_i386 \ package-fedora_31_i386 \
package-fedora_32 \
package-fedora_32_i386 \
package-rhel_8 \ package-rhel_8 \
package-opensuse-leap_15.1 \ package-opensuse-leap_15.1 \
package-gentoo package-gentoo
......
FROM fedora:32
RUN dnf clean all
RUN dnf install -y dnf-command\(builddep\) rpmdevtools
RUN dnf clean all
RUN dnf upgrade -y && \
dnf install -y mesa-libgbm-devel mesa-dri-drivers && \
dnf install -y libinput-devel && \
dnf install -y \
git \
rpm-build \
tar \
make \
autoconf \
automake \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
libcurl-devel \
libtool \
dbus-devel \
expat-devel \
pcre-devel \
yaml-cpp-devel \
boost-devel \
dbus-c++-devel \
dbus-devel \
libXext-devel \
libXfixes-devel \
yasm \
nasm \
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 \
openssl-static \
clutter-devel \
clutter-gtk-devel \
libappindicator-gtk3-devel \
libnotify-devel \
libupnp-devel \
qrencode-devel \
qt5-qtbase-devel \
qt5-qttools-devel \
sqlite-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
CMD /opt/build-package-fedora.sh
...@@ -105,6 +105,8 @@ enabled=1' ...@@ -105,6 +105,8 @@ enabled=1'
ENDTAG="fedora_30" ENDTAG="fedora_30"
elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
ENDTAG="fedora_31" ENDTAG="fedora_31"
elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
ENDTAG="fedora_32"
else else
# Distribution is not supported. Don't provide automatic updates. # Distribution is not supported. Don't provide automatic updates.
CAN_ADD_YUM_SOURCE=false CAN_ADD_YUM_SOURCE=false
......
...@@ -105,6 +105,8 @@ enabled=1' ...@@ -105,6 +105,8 @@ enabled=1'
ENDTAG="fedora_30" ENDTAG="fedora_30"
elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
ENDTAG="fedora_31" ENDTAG="fedora_31"
elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
ENDTAG="fedora_32"
elif [ "${PLATFORM_ID}" = "opensuse-leap:15.1" ] || [ "${ID}_${VERSION_ID}" = "opensuse-leap_15.1" ]; then elif [ "${PLATFORM_ID}" = "opensuse-leap:15.1" ] || [ "${ID}_${VERSION_ID}" = "opensuse-leap_15.1" ]; then
ENDTAG="opensuse-leap_15.1" ENDTAG="opensuse-leap_15.1"
REPO_FILE="/etc/zypp/repos.d/jami-main.repo" REPO_FILE="/etc/zypp/repos.d/jami-main.repo"
......
...@@ -97,6 +97,8 @@ enabled=1' ...@@ -97,6 +97,8 @@ enabled=1'
ENDTAG="rhel_8" ENDTAG="rhel_8"
elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
ENDTAG="fedora_31" ENDTAG="fedora_31"
elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
ENDTAG="fedora_32"
else else
# Distribution is not supported. Don't provide automatic updates. # Distribution is not supported. Don't provide automatic updates.
CAN_ADD_YUM_SOURCE=false CAN_ADD_YUM_SOURCE=false
......
...@@ -35,8 +35,15 @@ rpmdev-setuptree ...@@ -35,8 +35,15 @@ rpmdev-setuptree
cp /opt/ring-project-ro/jami_*.tar.gz /root/rpmbuild/SOURCES cp /opt/ring-project-ro/jami_*.tar.gz /root/rpmbuild/SOURCES
# Set the version # Set the version
#sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" jami.spec
sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" *.spec sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" *.spec
if [ ${DISTRIBUTION} == "fedora_32" ]; then
# Remove Obsoletes for Fedora 32, as we don't publish "ring"
sed -i '/^Obsoletes:/d' *.spec
sed -i '/^Provides:/d' *.spec
sed -i '/^Conflicts:/d' *.spec
# gnome-icon-theme-symbolic is removed from Fedora, but icons are well integrated
sed -i '/gnome-icon-theme-symbolic/d' *.spec
fi
rpmdev-bumpspec --comment="Automatic nightly release" --userstring="Jenkins <ring@lists.savoirfairelinux.net>" jami.spec rpmdev-bumpspec --comment="Automatic nightly release" --userstring="Jenkins <ring@lists.savoirfairelinux.net>" jami.spec
rpmdev-bumpspec --comment="Automatic nightly release" --userstring="Jenkins <ring@lists.savoirfairelinux.net>" jami-one-click.spec rpmdev-bumpspec --comment="Automatic nightly release" --userstring="Jenkins <ring@lists.savoirfairelinux.net>" jami-one-click.spec
......
...@@ -460,6 +460,18 @@ def run_generate_all(parsed_args): ...@@ -460,6 +460,18 @@ def run_generate_all(parsed_args):
"output_file": ".packages-built", "output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged", "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
}, },
{
"distribution": "fedora_32",
"debian_packaging_override": "",
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
},
{
"distribution": "fedora_32_i386",
"debian_packaging_override": "",
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
},
{ {
"distribution": "rhel_8", "distribution": "rhel_8",
"debian_packaging_override": "", "debian_packaging_override": "",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment