RPM: add support for openSuse Leap 15.4

Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/158/head
François Andriot 3 years ago
parent e858b3aaf2
commit b005a4d36b

@ -65,7 +65,9 @@ polkit-tqt: tqtinterface dbus-1-tqt
$(call buildpkg,dependencies/polkit-tqt) $(call buildpkg,dependencies/polkit-tqt)
python-tqt: sip4-tqt tdelibs tqscintilla python-tqt: sip4-tqt tdelibs tqscintilla
ifeq (,$(filter $(DIST), .oss154 ))
$(call buildpkg,dependencies/python-tqt) $(call buildpkg,dependencies/python-tqt)
endif
sip4-tqt: sip4-tqt:
$(call buildpkg,dependencies/sip4-tqt) $(call buildpkg,dependencies/sip4-tqt)
@ -139,12 +141,12 @@ tdewebdev: tdebase tdesdk
### 3rd party libraries and tools ### 3rd party libraries and tools
brp-check-trinity: brp-check-trinity:
ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .osstw )) ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw ))
$(call buildpkg,3rdparty/brp-check-trinity) $(call buildpkg,3rdparty/brp-check-trinity)
endif endif
esound: esound:
ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .osstw )) ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
$(call buildpkg,3rdparty/esound) $(call buildpkg,3rdparty/esound)
endif endif
@ -159,7 +161,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw ))
endif endif
lcms: lcms:
ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .mga8 .oss151 .oss152 .oss153 .osstw )) ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
$(call buildpkg,3rdparty/lcms) $(call buildpkg,3rdparty/lcms)
endif endif
@ -167,7 +169,7 @@ libbeagle:
$(call buildpkg,3rdparty/libbeagle) $(call buildpkg,3rdparty/libbeagle)
mp4v2: mp4v2:
ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .osstw )) ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw ))
$(call buildpkg,3rdparty/mp4v2) $(call buildpkg,3rdparty/mp4v2)
endif endif
@ -220,10 +222,14 @@ mlt: tqtinterface
$(call buildpkg,libraries/mlt) $(call buildpkg,libraries/mlt)
pytdeextensions: tqtinterface python-trinity pytdeextensions: tqtinterface python-trinity
ifeq (,$(filter $(DIST), .oss154 ))
$(call buildpkg,libraries/pytdeextensions) $(call buildpkg,libraries/pytdeextensions)
endif
python-trinity: tqtinterface python-tqt python-trinity: tqtinterface python-tqt
ifeq (,$(filter $(DIST), .oss154 ))
$(call buildpkg,libraries/python-trinity) $(call buildpkg,libraries/python-trinity)
endif
### Trinity Applications ### Trinity Applications
abakus: tdebase abakus: tdebase
@ -434,7 +440,7 @@ kpicosim: tdebase
$(call buildpkg,applications/kpicosim) $(call buildpkg,applications/kpicosim)
kpilot: tdebase tdepim kpilot: tdebase tdepim
ifeq (,$(filter $(DIST),.el5 .osstw)) ifeq (,$(filter $(DIST),.el5 .oss154 .osstw))
$(call buildpkg,applications/kpilot) $(call buildpkg,applications/kpilot)
endif endif
@ -511,7 +517,7 @@ qalculate-tde:
$(call buildpkg,applications/qalculate-tde) $(call buildpkg,applications/qalculate-tde)
qt4-tqt-theme-engine: tdebase qt4-tqt-theme-engine: tdebase
ifeq (,$(filter $(DIST),.el5 .el6 .el8 .oss153 .osstw)) ifeq (,$(filter $(DIST),.el5 .el6 .el8 .oss153 .oss154 .osstw))
$(call buildpkg,applications/qt4-tqt-theme-engine) $(call buildpkg,applications/qt4-tqt-theme-engine)
endif endif
@ -536,7 +542,9 @@ tdedocker: tdebase
$(call buildpkg,applications/tdedocker) $(call buildpkg,applications/tdedocker)
tde-guidance: tdebase pytdeextensions tde-guidance: tdebase pytdeextensions
ifeq (,$(filter $(DIST), .oss154 ))
$(call buildpkg,applications/tde-guidance) $(call buildpkg,applications/tde-guidance)
endif
tdeio-apt: tdebase tdeio-apt: tdebase
$(call buildpkg,applications/tdeio-apt) $(call buildpkg,applications/tdeio-apt)

@ -264,6 +264,10 @@ BuildRequires: rubypick
%endif %endif
# PYTHON support # PYTHON support
%if 0%{?sle_version} >= 150400
%define python python3
%define __python %__python3
%else
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
%global python python2 %global python python2
%global __python %__python2 %global __python %__python2
@ -271,6 +275,7 @@ BuildRequires: rubypick
%else %else
%global python python %global python python
%endif %endif
%endif
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
BuildRequires: %{python} BuildRequires: %{python}
BuildRequires: %{python}-devel BuildRequires: %{python}-devel

@ -113,7 +113,11 @@ BuildRequires: libexif-devel
BuildRequires: readline-devel BuildRequires: readline-devel
# PYTHON support # PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %if 0%{?sle_version} >= 150400
%define with_python 0
%else
%define with_python 1
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
%global python python2 %global python python2
%global __python %__python2 %global __python %__python2
%global python_sitearch %{python2_sitearch} %global python_sitearch %{python2_sitearch}
@ -123,6 +127,7 @@ BuildRequires: readline-devel
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
BuildRequires: %{python} BuildRequires: %{python}
BuildRequires: %{python}-devel BuildRequires: %{python}-devel
%endif
# LCMS support # LCMS support
%if 0%{?suse_version} || 0%{?rhel} >= 7 %if 0%{?suse_version} || 0%{?rhel} >= 7
@ -385,8 +390,10 @@ Requires: perl
%{tde_tdeappdir}/*koshell.desktop %{tde_tdeappdir}/*koshell.desktop
%{tde_datadir}/apps/kofficewidgets/ %{tde_datadir}/apps/kofficewidgets/
%if 0%{?with_kross} %if 0%{?with_kross}
%if 0%{?with_python}
%{tde_datadir}/apps/kross/ %{tde_datadir}/apps/kross/
%{tde_tdelibdir}/krosspython.* %{tde_tdelibdir}/krosspython.*
%endif
%if 0%{?with_ruby} %if 0%{?with_ruby}
%{tde_tdelibdir}/krossruby.* %{tde_tdelibdir}/krossruby.*
%endif %endif

@ -84,7 +84,9 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity BuildRequires: brp-check-trinity
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?sle_version} <= 150300
Requires: trinity-guidance Requires: trinity-guidance
%endif
%description %description

@ -154,6 +154,10 @@ BuildRequires: libacl-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
# PYTHON support # PYTHON support
%if 0%{?sle_version} >= 150400
%define python python3
%define __python %__python3
%else
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
%global python python2 %global python python2
%global __python %__python2 %global __python %__python2
@ -161,6 +165,7 @@ BuildRequires: libattr-devel
%else %else
%global python python %global python python
%endif %endif
%endif
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
BuildRequires: %{python} BuildRequires: %{python}
BuildRequires: %{python}-devel BuildRequires: %{python}-devel

@ -102,6 +102,10 @@ BuildRequires: gamin-devel
%endif %endif
# PYTHON support # PYTHON support
%if 0%{?sle_version} >= 150400
%define python python3
%define __python %__python3
%else
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
%global python python2 %global python python2
%global __python %__python2 %global __python %__python2
@ -109,6 +113,7 @@ BuildRequires: gamin-devel
%else %else
%global python python %global python python
%endif %endif
%endif
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
BuildRequires: %{python} BuildRequires: %{python}
BuildRequires: %{python}-devel BuildRequires: %{python}-devel

@ -13,7 +13,7 @@ if [ -x /usr/sbin/urpmi ]; then
elif [ -x /usr/bin/dnf ]; then elif [ -x /usr/bin/dnf ]; then
PKGINST="sudo dnf install -y --nogpgcheck" PKGINST="sudo dnf install -y --nogpgcheck"
elif [ -x /usr/bin/zypper ]; then elif [ -x /usr/bin/zypper ]; then
PKGINST="sudo zypper install -y" PKGINST="sudo zypper install -y --allow-vendor-change"
elif [ -x /usr/bin/yum ]; then elif [ -x /usr/bin/yum ]; then
PKGINST='sudo yum install -y' PKGINST='sudo yum install -y'
elif [ -x /usr/bin/apt-get ]; then elif [ -x /usr/bin/apt-get ]; then

@ -71,6 +71,10 @@ BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1
BuildRequires: gcc-c++ BuildRequires: gcc-c++
# PYTHON support # PYTHON support
%if 0%{?sle_version} >= 150400
%define python python3
%define __python %__python3
%else
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
%global python python2 %global python python2
%global __python %__python2 %global __python %__python2
@ -79,6 +83,7 @@ BuildRequires: gcc-c++
%global python python %global python python
%endif %endif
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%endif
BuildRequires: %{python} BuildRequires: %{python}
BuildRequires: %{python}-devel BuildRequires: %{python}-devel

@ -82,8 +82,13 @@ BuildRequires: flex
%global __python %__python2 %global __python %__python2
%global python_sitearch %{python2_sitearch} %global python_sitearch %{python2_sitearch}
%else %else
%if 0%{?sle_version} >= 150400
%global python python3
%global __python %__python3
%else
%global python python %global python python
%endif %endif
%endif
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
BuildRequires: %{python} BuildRequires: %{python}
BuildRequires: %{python}-devel BuildRequires: %{python}-devel

@ -0,0 +1,29 @@
FROM opensuse/leap:15.4
ARG TDE_VERSION=14.0.12
ARG ARCH=x86_64
# Add PACKMAN repository
# Install Trinity build dependencies
COPY packages /packages
RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
&& echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
&& zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \
&& zypper refresh \
&& zypper -n update \
&& zypper -n install -l $(</packages)
RUN ln -sfv python3 /usr/bin/python
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
USER trinity
COPY rpmmacros /home/trinity/.rpmmacros
# Add YUM repository for locally built packages
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
&& mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch

@ -0,0 +1,216 @@
alsa-devel
aspell
aspell-devel
audiofile-devel
automake
bdftopcf
binutils-devel
bison
brp-check-suse
brp-extract-appdata
ccache
cdparanoia
cdparanoia-devel
chmlib-devel
chrpath
clamav
clamav-devel
cln-devel
clucene-core-devel
cmake
createrepo_c
cups-devel
cyrus-sasl-devel
dbus-1-devel
dbus-1-glib-devel
djvulibre
docbook-utils
docbook-xsl-stylesheets
docbook2x
doxygen GraphicsMagick
dssi-devel
fdupes
ffmpeg-devel
fftw3-devel
file-devel
flac-devel
flex
font-util
freetype-devel
fribidi-devel
gamin-devel
gcc-c++
giflib-devel
git
glu-devel
gmime-devel
gmime2_6-devel
gmp-devel
gperf xmlto
GraphicsMagick-devel
gsl-devel
gstreamer-devel
gstreamer-plugins-base-devel
gstreamer-devel
gtk2-devel
gtk3-devel
gtk-doc
htdig
html2ps
hunspell-devel
iceauth
ImageMagick-devel
imake
imlib2-devel
intltool
java-1_8_0-openjdk-devel
less
libacl-devel
libao-devel
libart_lgpl-devel
libavahi-devel
libavcodec-devel
libblkid-devel
libboost_python-py3-1_66_0-devel
libboost_system1_66_0-devel
libbz2-devel
libcap-devel
libcdio-devel
libcdio-paranoia-devel
libconfig-devel
libcryptsetup-devel
libcurl-devel
libdb-4_8-devel
libdvdread-devel
libexempi-devel
libexiv2-devel
libfontenc-devel
libgadu-devel
libGeoIP-devel
libgpgme-devel
libgphoto2-devel
libgpod-devel
libgssglue-devel
libical-devel
libICE-devel
libidn-devel
libiw-devel
libjack-devel
libjasper-devel
liblcms2-devel
liblo-devel
liblrdf-devel
libmad-devel
libmng-devel
libmp3lame-devel
libmpcdec-devel
libmtp-devel
libmusicbrainz-devel
libmysqld-devel
libneon-devel
libnjb-devel
libnsl-devel
libofx-devel
libotr-devel
libpaper-devel
libpng16-devel
libpoppler-devel
libpqxx-devel
libpulse-devel
libqalculate-devel
libraw1394-devel
librsvg-devel
libsamplerate-devel
libSDL-devel
libSM-devel
libsmbclient-devel
libsndfile-devel
libtag-devel
libtheora-devel
libtiff-devel
libtirpc-devel
libtool
libtwolame-devel
libudev1
libudisks2-0-devel
libuuid-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwmf-devel
libwpd-devel
libXaw-devel
libXdmcp-devel
libxine-devel
libxkbfile-devel
libXpm-devel
libXmu-devel
libXScrnSaver-devel
libxslt-devel
libXt-devel
libXv-devel
libXxf86dga-devel
libXxf86vm-devel
libyaz-devel
libzrtpcpp-devel
lirc-devel
make
makeinfo
meanwhile-devel
Mesa-devel
Mesa-libGL-devel
mozilla-nspr-devel
mysql-devel
net-tools
net-tools-deprecated
NetworkManager-devel
ocaml
openexr-devel
opensc
openslp-devel
opensp-devel
pam-devel
patch
pciutils-devel
pcre-devel
pcsc-lite-devel
perl-PAR-Packer
perl-pcsc
pkcs11-helper-devel
polkit-devel
postgresql10
postgresql10-devel
python3-devel
python3-sip-devel
recode
rpcgen
rpm-build
rpmlint
rsvg-convert
ruby
ruby-devel
sane-backends-devel
scons
speex-devel
sqlite3-devel
subversion-devel
sudo
swig
sword-devel
torsocks
transfig
unixODBC-devel
update-desktop-files
usbutils
utempter-devel
valgrind
vim
wireless-tools
wv2-devel
xbase-devel
xcb-proto-devel
xorg-x11
xscreensaver
xscreensaver-data
xscreensaver-data-extra
xz-devel

@ -0,0 +1,5 @@
%dist .oss154
%_smp_mflags -j8
%jobs 8
%sle_version 150400
%_build_insert_debug_package %nil

@ -43,10 +43,14 @@ BuildArch: noarch
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: brp-check-suse BuildRequires: brp-check-suse
%if 0%{?suse_version} <= 1500
BuildRequires: brp-extract-appdata BuildRequires: brp-extract-appdata
%endif
Requires: update-desktop-files Requires: update-desktop-files
Requires: brp-check-suse Requires: brp-check-suse
%if 0%{?suse_version} <= 1500
Requires: brp-extract-appdata Requires: brp-extract-appdata
%endif
Requires: sed Requires: sed
@ -82,7 +86,7 @@ for i in \
-e "s|applications/kde|applications/tde|g" \ -e "s|applications/kde|applications/tde|g" \
-e "s|KDE|TDE|g" \ -e "s|KDE|TDE|g" \
-e "s|kde-|tde-|g" \ -e "s|kde-|tde-|g" \
%if 0%{?suse_version} == 1550 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
-e "s|/usr/share/applications|/opt/trinity/share/applications|g" \ -e "s|/usr/share/applications|/opt/trinity/share/applications|g" \
-e "/^for i in/ s|\\\| /\$RPM_BUILD_ROOT/opt/trinity/share/applnk \\\|" \ -e "/^for i in/ s|\\\| /\$RPM_BUILD_ROOT/opt/trinity/share/applnk \\\|" \
%endif %endif

@ -165,9 +165,11 @@ Requires: trinity-konversation
Requires: trinity-kooldock Requires: trinity-kooldock
Requires: trinity-kopete-otr Requires: trinity-kopete-otr
Requires: trinity-kpicosim Requires: trinity-kpicosim
%if 0%{?rhel} != 5 %if 0%{?sle_version} <= 150300
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6
Requires: trinity-kpilot Requires: trinity-kpilot
%endif %endif
%endif
#Requires: trinity-kplayer #Requires: trinity-kplayer
Requires: trinity-krecipes Requires: trinity-krecipes
Requires: trinity-krename Requires: trinity-krename
@ -189,9 +191,12 @@ Requires: trinity-kxmleditor
Requires: trinity-mathemagics Requires: trinity-mathemagics
Requires: trinity-mplayerthumbs Requires: trinity-mplayerthumbs
Requires: trinity-piklab Requires: trinity-piklab
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
# On RHEL6, polkit is too old
Requires: trinity-polkit-agent-tde Requires: trinity-polkit-agent-tde
%endif
Requires: trinity-potracegui Requires: trinity-potracegui
#Requires: trinity-qalculate-tde Requires: trinity-qalculate-tde
# On RHEL, lilypond is not available, so no rosegarden :'-( # On RHEL, lilypond is not available, so no rosegarden :'-(
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
Requires: trinity-rosegarden Requires: trinity-rosegarden
@ -200,7 +205,9 @@ Requires: trinity-smb4k
Requires: trinity-smartcardauth Requires: trinity-smartcardauth
Requires: trinity-soundkonverter Requires: trinity-soundkonverter
Requires: trinity-tastymenu Requires: trinity-tastymenu
%if 0%{?sle_version} <= 150300
Requires: trinity-tde-guidance Requires: trinity-tde-guidance
%endif
Requires: trinity-tde-style-baghira Requires: trinity-tde-style-baghira
Requires: trinity-tde-style-domino Requires: trinity-tde-style-domino
Requires: trinity-tde-style-ia-ora Requires: trinity-tde-style-ia-ora

@ -138,12 +138,17 @@ BuildRequires: db4-devel
#%endif #%endif
# PYTHON2 support # PYTHON2 support
%if 0%{?sle_version} >= 150400
%define with_python 0
%else
%define with_python 1
%if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7 %if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
%global python python2 %global python python2
%global __python %__python2 %global __python %__python2
%else %else
%global python python %global python python
%endif %endif
%endif
Requires: trinity-atlantikdesigner = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-atlantikdesigner = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-kaddressbook-plugins = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kaddressbook-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
@ -395,7 +400,9 @@ controls XMMS, install the xmms-kde-trinity package.
Summary: scripts for KNewsTicker, the Trinity news ticker Summary: scripts for KNewsTicker, the Trinity news ticker
Group: Applications/Utilities Group: Applications/Utilities
Requires: perl Requires: perl
%if 0%{with_python}
Requires: %{python} Requires: %{python}
%endif
#Requires: libfinance-quote-perl #Requires: libfinance-quote-perl
#Requires: libmime-perl #Requires: libmime-perl
#Requires: libnews-nntpclient-perl #Requires: libnews-nntpclient-perl
@ -436,7 +443,9 @@ Requires: %{_lib}jpeg62
%if 0%{?suse_version} == 1230 %if 0%{?suse_version} == 1230
Requires: libjpeg8 Requires: libjpeg8
%endif %endif
%if 0%{with_python}
Requires: %{python} Requires: %{python}
%endif
Requires: rsync Requires: rsync
#Requires: unison #Requires: unison
Requires: trinity-konqueror Requires: trinity-konqueror
@ -676,7 +685,6 @@ sed -i "knewsticker-scripts/sportscores.py" \
-e "s|env python|env %{python}|" -e "s|env python|env %{python}|"
%endif %endif
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"

@ -450,7 +450,7 @@ Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif %endif
# OpenSuse 15.0 Theme # OpenSuse 15.x Theme
%if "%{?suse_version}" == "1500" %if "%{?suse_version}" == "1500"
Requires: wallpaper-branding Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
@ -458,30 +458,6 @@ Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif %endif
# OpenSuse 15.1 Theme
%if "%{?suse_version}" == "1510"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
# OpenSuse 15.2 Theme
%if "%{?suse_version}" == "1520"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
# OpenSuse 15.3 Theme
%if "%{?suse_version}" == "1530"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
# OpenSuse TW Theme # OpenSuse TW Theme
%if "%{?suse_version}" == "1550" %if "%{?suse_version}" == "1550"
Requires: wallpaper-branding Requires: wallpaper-branding

@ -169,7 +169,11 @@ BuildRequires: Mesa-libGLU-devel
%endif %endif
# PYTHON support # PYTHON support
%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7 %if 0%{?sle_version} >= 150400
%define with_python 0
%else
%define with_python 1
%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 7
%global python python2 %global python python2
%global __python %__python2 %global __python %__python2
%global python_sitearch %{python2_sitearch} %global python_sitearch %{python2_sitearch}
@ -179,6 +183,7 @@ BuildRequires: Mesa-libGLU-devel
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
BuildRequires: %{python} BuildRequires: %{python}
BuildRequires: %{python}-devel BuildRequires: %{python}-devel
%endif
## ruby ## ruby
BuildRequires: ruby-devel >= 1.8 BuildRequires: ruby-devel >= 1.8
@ -264,7 +269,7 @@ BuildRequires: java-1.6.0-openjdk-devel
%endif %endif
%endif %endif
%if 0%{?pclinuxos} == 0 %if 0%{?pclinuxos} == 0
%define _with_java --with-java=%{java_home} %define with_java 1
%endif %endif
## Perl ## Perl
@ -276,24 +281,24 @@ BuildRequires: perl-devel
## QScintilla ## QScintilla
BuildRequires: libtqscintilla-devel >= %{?tde_epoch:%{tde_epoch}:}1.7.1 BuildRequires: libtqscintilla-devel >= %{?tde_epoch:%{tde_epoch}:}1.7.1
%define _enable_qscintilla --enable-qscintilla %define with_qscintilla 1
Obsoletes: trinity-kdebindings < %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-kdebindings < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-kdebindings = %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-kdebindings = %{?epoch:%{epoch}:}%{version}-%{release}
# Metapackage requires # Metapackage requires
%if "%{?_with_java}" != "" %if 0%{?with_java}
Requires: trinity-tdebindings-java = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdebindings-java = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-juic = %{?epoch:%{epoch}:}%{version}-%{release}
%endif %endif
Requires: trinity-libsmoketqt = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libsmoketqt = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-libsmoketde = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libsmoketde = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: perl-dcop = %{?epoch:%{epoch}:}%{version}-%{release} Requires: perl-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{with_python}
Requires: python-dcop = %{?epoch:%{epoch}:}%{version}-%{release} Requires: python-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
Requires: trinity-libkjsembed1 = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libkjsembed1 = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-kjscmd = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kjscmd = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{?_with_java}" != ""
Requires: trinity-juic = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
Requires: trinity-libkorundum0-ruby = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libkorundum0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-libqt0-ruby = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libqt0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
@ -327,7 +332,8 @@ This package is part of the official TDE bindings module.
########## ##########
%if "%{?_with_java}" != "" %if 0%{?with_java}
%package -n trinity-libdcop3-java %package -n trinity-libdcop3-java
Summary: DCOP bindings for Java [Trinity] Summary: DCOP bindings for Java [Trinity]
Group: System/Libraries Group: System/Libraries
@ -344,11 +350,13 @@ This package is part of the official TDE bindings module.
%files -n trinity-libdcop3-java %files -n trinity-libdcop3-java
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/java/org/ %{tde_libdir}/java/org/
%endif %endif
########## ##########
%if "%{?_with_java}" != "" %if 0%{?with_java}
%package -n trinity-libdcop3-java-devel %package -n trinity-libdcop3-java-devel
Summary: DCOP bindings for Java (dcopidl2java program) [Trinity] Summary: DCOP bindings for Java (dcopidl2java program) [Trinity]
Group: Development/Languages/Java Group: Development/Languages/Java
@ -365,11 +373,13 @@ This package is part of the official TDE bindings module.
%files -n trinity-libdcop3-java-devel %files -n trinity-libdcop3-java-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/dcopidl2java %{tde_bindir}/dcopidl2java
%endif %endif
########## ##########
%if "%{?_with_java}" != "" %if 0%{?with_java}
%package -n trinity-libdcop3-jni %package -n trinity-libdcop3-jni
Summary: DCOP bindings for Java ( Native libraries ) [Trinity] Summary: DCOP bindings for Java ( Native libraries ) [Trinity]
Group: System/Libraries Group: System/Libraries
@ -386,11 +396,13 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/libjavadcop.la %{tde_libdir}/libjavadcop.la
%{tde_libdir}/libjavadcop.so %{tde_libdir}/libjavadcop.so
%endif %endif
########## ##########
%if "%{?_with_java}" != "" %if 0%{?with_java}
%package -n trinity-libqt3-java %package -n trinity-libqt3-java
Summary: Java bindings for Qt [Trinity] Summary: Java bindings for Qt [Trinity]
Group: System/Libraries Group: System/Libraries
@ -412,11 +424,13 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/java/qtjava*.jar %{tde_libdir}/java/qtjava*.jar
%{tde_tdedocdir}/HTML/en/javalib/ %{tde_tdedocdir}/HTML/en/javalib/
%endif %endif
########## ##########
%if "%{?_with_java}" != "" %if 0%{?with_java}
%package -n trinity-libtqt3-jni %package -n trinity-libtqt3-jni
Summary: Java bindings for TQt ( Native libraries ) [Trinity] Summary: Java bindings for TQt ( Native libraries ) [Trinity]
Group: System/Libraries Group: System/Libraries
@ -438,11 +452,13 @@ This package is part of the official TDE bindings module.
%{tde_libdir}/jni/lib*qtjava.la %{tde_libdir}/jni/lib*qtjava.la
%{tde_libdir}/jni/lib*qtjava.so.* %{tde_libdir}/jni/lib*qtjava.so.*
%doc qtjava/ChangeLog %doc qtjava/ChangeLog
%endif %endif
########## ##########
%if "%{?_with_java}" != "" %if 0%{?with_java}
%package -n trinity-libtqt3-jni-devel %package -n trinity-libtqt3-jni-devel
Summary: Development files fo Java bindings for TQt ( Native libraries ) [Trinity] Summary: Development files fo Java bindings for TQt ( Native libraries ) [Trinity]
Group: Development/Languages/Java Group: Development/Languages/Java
@ -460,11 +476,13 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/lib*qtjavasupport.so %{tde_libdir}/lib*qtjavasupport.so
%{tde_libdir}/jni/lib*qtjava.so %{tde_libdir}/jni/lib*qtjava.so
%endif %endif
########## ##########
%if "%{?_with_java}" != "" %if 0%{?with_java}
%package -n trinity-libtrinity-java %package -n trinity-libtrinity-java
Summary: Tdelibs bindings for Java [Trinity] Summary: Tdelibs bindings for Java [Trinity]
Group: System/Libraries Group: System/Libraries
@ -484,11 +502,13 @@ This package is part of the official TDE bindings module.
%files -n trinity-libtrinity-java %files -n trinity-libtrinity-java
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/java/koala*.jar %{tde_libdir}/java/koala*.jar
%endif %endif
########## ##########
%if "%{?_with_java}" != "" %if 0%{?with_java}
%package -n trinity-libtrinity-jni %package -n trinity-libtrinity-jni
Summary: Tdelibs bindings for java ( Native libraries ) [Trinity] Summary: Tdelibs bindings for java ( Native libraries ) [Trinity]
Group: System/Libraries Group: System/Libraries
@ -505,11 +525,13 @@ This package is part of the official TDE bindings module.
%{tde_libdir}/jni/libtdejava.la %{tde_libdir}/jni/libtdejava.la
%{tde_libdir}/jni/libtdejava.so.* %{tde_libdir}/jni/libtdejava.so.*
%doc tdejava/ChangeLog %doc tdejava/ChangeLog
%endif %endif
########## ##########
%if "%{?_with_java}" != "" %if 0%{?with_java}
%package -n trinity-libtrinity-jni-devel %package -n trinity-libtrinity-jni-devel
Summary: Development files for tdelibs bindings for java ( Native libraries ) [Trinity] Summary: Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
Group: Development/Languages/Java Group: Development/Languages/Java
@ -523,6 +545,7 @@ This package is part of the official TDE bindings module.
%files -n trinity-libtrinity-jni-devel %files -n trinity-libtrinity-jni-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/jni/libtdejava.so %{tde_libdir}/jni/libtdejava.so
%endif %endif
########## ##########
@ -648,6 +671,8 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
########## ##########
%if 0%{with_python}
%package -n python-dcop %package -n python-dcop
Summary: DCOP bindings for Python Summary: DCOP bindings for Python
Group: System/Libraries Group: System/Libraries
@ -670,6 +695,8 @@ This package is part of the official TDE bindings module.
%{python_sitearch}/pcop.so %{python_sitearch}/pcop.so
%{python_sitearch}/pydcop.py* %{python_sitearch}/pydcop.py*
%endif
########## ##########
%package -n trinity-libkjsembed1 %package -n trinity-libkjsembed1
@ -760,7 +787,7 @@ This package is part of the official TDE bindings module.
########## ##########
%if "%{?_with_java}" != "" %if 0%{?with_java}
%package -n trinity-juic %package -n trinity-juic
Summary: The Qt Java UI Compiler Summary: The Qt Java UI Compiler
Group: Development/Languages/Java Group: Development/Languages/Java
@ -1000,14 +1027,14 @@ Provides: trinity-kdebindings-devel = %{?epoch:%{epoch}:}%{version}-%{release}
# Metapackage # Metapackage
Requires: trinity-libsmoketqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libsmoketqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{?_with_java}" != "" %if 0%{?with_java}
Requires: trinity-libdcop3-java-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libdcop3-java-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%endif %endif
Requires: trinity-libsmoketde-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libsmoketde-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-libkjsembed-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libkjsembed-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-libxparts-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libxparts-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-libdcop-c-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libdcop-c-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{?_with_java}" != "" %if 0%{?with_java}
Requires: trinity-libtqt3-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libtqt3-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-libtrinity-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libtrinity-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%endif %endif
@ -1125,10 +1152,12 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_targe
\ \
--with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \ --with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \
--with-extra-libs=%{tde_libdir} \ --with-extra-libs=%{tde_libdir} \
%if 0%{with_python}
--with-pythondir=%{_usr} \ --with-pythondir=%{_usr} \
%endif
\ \
%{?_with_java} %{!?_with_java:--without-java} \ %{?with_java:--with-java=%{java_home}} %{!?with_java:--without-java} \
%{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} %{?with_qscintilla:--enable-qscintilla} %{!?with_qscintilla:--disable-qscintilla}
# Build dcopperl with specific options # Build dcopperl with specific options
pushd dcopperl pushd dcopperl
@ -1154,7 +1183,7 @@ export PATH="%{tde_bindir}:${PATH}"
find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
%if "%{?_with_java}" != "" %if 0%{?with_java}
# Installs juic # Installs juic
%__install -D -m 755 qtjava/designer/juic/bin/juic %{?buildroot}%{tde_bindir}/juic %__install -D -m 755 qtjava/designer/juic/bin/juic %{?buildroot}%{tde_bindir}/juic
%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common %__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common

@ -84,6 +84,10 @@ BuildRequires: net-snmp-devel
BuildRequires: gmp-devel BuildRequires: gmp-devel
# PYTHON support # PYTHON support
%if 0%{?sle_version} >= 150400
%define python python3
%define __python %__python3
%else
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
%define python python2 %define python python2
%define __python %__python2 %define __python %__python2
@ -91,6 +95,7 @@ BuildRequires: gmp-devel
%else %else
%define python python %define python python
%endif %endif
%endif
BuildRequires: %{python} BuildRequires: %{python}
BuildRequires: %{python}-devel BuildRequires: %{python}-devel

Loading…
Cancel
Save