TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM: update opensuse dependencies to postgresql

Browse Source 
Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/219/head
François Andriot 1 year ago
parent b74e1dc2f4
commit 50110d42bb
10 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
redhat/Makefile
Unescape View File

@ -167,7 +167,7 @@ libbeagle:
$(call buildpkg,3rdparty/libbeagle)
mp4v2:
ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .osstw ))
ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .osstw ))
$(call buildpkg,3rdparty/mp4v2)
endif

9
redhat/applications/misc/krecipes/krecipes.spec
Unescape View File

@ -79,17 +79,12 @@ BuildRequires: brp-check-trinity
BuildRequires: mysql-devel
# POSTGRESQL support
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql10
BuildRequires: postgresql10-devel
%else
BuildRequires: postgresql
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
BuildRequires: postgresql
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql-server-devel
%else
BuildRequires: postgresql-devel
%endif
%endif
# SQLITE support
BuildRequires: sqlite-devel

9
redhat/applications/multimedia/amarok/amarok.spec
Unescape View File

@ -111,17 +111,12 @@ BuildRequires: taglib-devel
BuildRequires: sqlite-devel
# POSTGRESQL support
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql10
BuildRequires: postgresql10-devel
%else
BuildRequires: postgresql
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
BuildRequires: postgresql
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql-server-devel
%else
BuildRequires: postgresql-devel
%endif
%endif
# not used anymore, in favor of libvisual ? -- Rex
#{?fedora:BuildRequires: xmms-devel}

3
redhat/applications/office/koffice/koffice.spec
Unescape View File

@ -220,7 +220,8 @@ BuildRequires: trinity-poppler-devel >= 0.12
%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0
%define with_postgresql 1
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
BuildRequires: postgresql
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql-server-devel
%else
BuildRequires: postgresql-devel

9
redhat/dependencies/tqt3/tqt3.spec
Unescape View File

@ -268,17 +268,12 @@ BuildRequires: sqlite3-devel
%endif
# POSTGRESQL support
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql10
BuildRequires: postgresql10-devel
%else
BuildRequires: postgresql
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
BuildRequires: postgresql
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql-server-devel
%else
BuildRequires: postgresql-devel
%endif
%endif
# Firebird support
%if 0%{?mdkversion} || 0%{?mgaversion}

4
redhat/docker/oss152/packages
Unescape View File

@ -163,8 +163,8 @@ perl-PAR-Packer
perl-pcsc
pkcs11-helper-devel
pkgconfig(pygtk-2.0)
postgresql10
postgresql10-devel
postgresql
postgresql-devel
python-devel
python3-devel
python-sip-devel

1
redhat/docker/oss153/Dockerfile.x86_64
Unescape View File

@ -12,7 +12,6 @@ RUN set -x \
&& zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.3/ packman \
&& zypper refresh \
&& zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64 \
&& zypper -n install postgresql10{,-devel,-server}-10.17-8.35.1.x86_64 \
&& zypper -n update \
&& zypper -n install -l $(</packages)

6
redhat/docker/oss154/Dockerfile.x86_64
Unescape View File

@ -9,11 +9,9 @@ COPY packages /packages
RUN set -x \
&& echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
&& echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
&& rm -fv /etc/zypp/repos.d/repo-sle-* \
&& zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \
&& zypper refresh \
&& zypper -n refresh \
&& zypper -n update \
&& zypper -n install --oldpackage libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-data-2.4.46-150200.14.5.1.noarch \
&& zypper -n install -l $(</packages)
RUN ln -sfv python3 /usr/bin/python
@ -33,7 +31,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
# Install heimdal development files
RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.4/repo/oss/src/libheimdal-7.7.0-bp154.1.43.src.rpm \
&& wget -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://objects.githubusercontent.com/github-production-release-asset-2e65be/319333/be127800-88cf-11e9-901a-8182ad5b94e1?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20230410%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230410T153423Z&X-Amz-Expires=300&X-Amz-Signature=9ceafbdc1252b40abdbec062b63dcb444ecd91c4dcad13f96a27faed69f04546&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=319333&response-content-disposition=attachment%3B%20filename%3Dheimdal-7.7.0.tar.gz&response-content-type=application%2Foctet-stream" \
&& wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz" \
&& sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.7.0.tar.gz|" -e "/^%patch0/ s|^%|#|" \
&& rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
&& sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.7.0/tools/ install

9
redhat/docker/oss154/packages
Unescape View File

@ -105,6 +105,7 @@ liblrdf-devel
libmad-devel
libmng-devel
libmp3lame-devel
libmp4v2-devel
libmpcdec-devel
libmtp-devel
libmusicbrainz-devel
@ -177,12 +178,14 @@ patch
pciutils-devel
pcre-devel
pcsc-lite-devel
perl(JSON)
perl-PAR-Packer
perl-pcsc
pkcs11-helper-devel
polkit-devel
postgresql10
postgresql10-devel
postgresql
postgresql-devel
postgresql-server-devel
python3-devel
python3-sip-devel
recode
@ -200,6 +203,7 @@ subversion-devel
sudo
swig
sword-devel
texinfo
torsocks
transfig
unixODBC-devel
@ -208,6 +212,7 @@ usbutils
utempter-devel
valgrind
vim
wget
wireless-tools
wv2-devel
xbase-devel

8
redhat/docker/osstw/packages
Unescape View File

@ -9,7 +9,6 @@ bison
bluez-devel
boost-devel
brp-check-suse
brp-extract-appdata
ccache
cdparanoia
cdparanoia-devel
@ -39,6 +38,7 @@ ffmpeg-4-libavcodec-devel
ffmpeg-4-libavdevice-devel
fftw3-devel
file-devel
findutils
flac-devel
flex
font-util
@ -183,8 +183,9 @@ perl-pcsc
pkcs11-helper-devel
pkgconfig(guile-1.8)
polkit-devel
postgresql10
postgresql10-devel
postgresql
postgresql-devel
postgresql-server-devel
potrace-devel
ppp
python-devel
@ -230,6 +231,7 @@ usbutils
utempter-devel
valgrind
vim
wget
wireless-tools
wv2-devel
xcb-proto-devel

Write Preview
Loading…
Cancel
Save