RPM: update build scripts for Fedora 27, opensuse TW

pull/3/head
François Andriot 7 years ago
parent 2c6b5dc9b8
commit cdfe982606

@ -210,7 +210,8 @@ endif
endif
lcms:
ifneq ($(wildcard /boot/vmlinuz*.el7*),)
# Build on EL7, OSSTW
ifeq (,$(filter $(DIST),.el7 osstw))
$(call buildpkg,3rdparty/lcms)
endif
@ -246,7 +247,7 @@ endif
mp4v2:
# Build on OpenSUSE only
ifneq ($(wildcard /etc/SuSE-release),)
ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .osstw))
$(call buildpkg,3rdparty/mp4v2)
endif
@ -297,7 +298,7 @@ endif
wv2:
# Do NOT build on Mageia or openSUSE or PCLINUXOS
ifeq ($(wildcard /etc/mageia-release /etc/SuSE-release /etc/pclinuxos-release),)
ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .osstw .pclos))
$(call buildpkg,3rdparty/wv2)
endif
@ -610,7 +611,10 @@ ksquirrel: tdebase libkipi libksquirrel
$(call buildpkg,applications/ksquirrel)
kstreamripper: tdebase
# Do NOT build on Fedora >= 27 (problem with scons and python3)
ifeq (,$(filter $(DIST),.fc27))
$(call buildpkg,applications/kstreamripper)
endif
ksystemlog: tdebase
$(call buildpkg,applications/ksystemlog)
@ -783,7 +787,10 @@ ifeq ($(wildcard /boot/vmlinuz*.mga6*),)
endif
hk_classes:
# Not on Fedora 27, Opensuse TW
ifeq (,$(filter $(DIST),.fc27 .osstw))
$(call buildpkg,extras/hk_classes)
endif
icons-crystalsvg-updated:
$(call buildpkg,extras/icons-crystalsvg-updated)
@ -804,7 +811,10 @@ kdissert:
$(call buildpkg,extras/kdissert)
klamav:
# Not on Fedora 27, Opensuse TW
ifeq (,$(filter $(DIST),.fc27 .osstw))
$(call buildpkg,extras/klamav)
endif
klibido: pan
# Not on RHEL5
@ -813,7 +823,10 @@ ifeq (,$(filter $(DIST),.el5))
endif
knoda: hk_classes
# Not on Fedora 27, Opensuse TW
ifeq (,$(filter $(DIST),.fc27 .osstw))
$(call buildpkg,extras/knoda)
endif
kompose:
$(call buildpkg,extras/kompose)

@ -191,7 +191,7 @@ BuildRequires: libofa-devel
%if 0%{?mgaversion} && 0%{?mgaversion} <= 2
BuildRequires: libtunepimp-devel
%endif
%if 0%{?suse_version}
%if 0%{?suse_version} && 0%{?suse_version} != 1330
BuildRequires: libtunepimp-devel
%endif
%if 0%{?fedora} && 0%{?fedora} <= 23

@ -68,6 +68,10 @@ BuildRequires: libtool
BuildRequires: libqalculate-devel >= 0.9.6
%if 0%{?suse_version} == 1330
BuildRequires: cln-devel
%endif
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
@ -161,10 +165,4 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/hicolor/*/actions/qalculate_convert.png
%post
%postun
%changelog

@ -33,6 +33,10 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%if 0%{?fedora} >= 27
%define debug_package %{nil}
%endif
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
@ -112,11 +116,7 @@ BuildRequires: libdb-devel
BuildRequires: libdb-cxx-devel
%endif
%if 0%{?suse_version}
%if "%{?suse_version}" == "1310" || "%{?suse_version}" == "1320" || 0%{?sle_version} == 120200 || 0%{?sle_version} == 120300
BuildRequires: libdb-4_8-devel
%else
BuildRequires: libdb-5_1-devel
%endif
%endif
%if 0%{?rhel} && 0%{?rhel} <= 6
BuildRequires: db4-devel

@ -57,7 +57,7 @@ case "${PKGNAME}" in
"libkexiv2") PKGRUNTIME="${lib}kexiv2-5";;
"libkipi") PKGRUNTIME="${lib}kipi0";;
"libr") PKGRUNTIME="${lib}r";;
"mp4v2") PKGRUNTIME="${lib}mp4v2";;
"mp4v2") PKGRUNTIME="mp4v2";;
"tqscintilla") PKGRUNTIME="${lib}tqscintilla7";;
"tqca") PKGRUNTIME="${lib}tqca1";;
"tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;

@ -0,0 +1,22 @@
FROM fedora32:27
ARG TDE_VERSION=14.0.4
ARG ARCH=i686
# Add RPMFUSION repository
RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-27.noarch.rpm
# Install Trinity build dependencies
RUN setarch i686 dnf update -y
ADD packages /etc/yum.repos.d/packages
RUN setarch i686 dnf install -y texlive-base
RUN setarch i686 dnf install -y $(</etc/yum.repos.d/packages)
# Add YUM repository for locally built packages
ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity
RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
ADD rpmmacros /home/trinity/.rpmmacros

@ -0,0 +1,21 @@
FROM fedora:27
ARG TDE_VERSION=14.0.4
ARG ARCH=x86_64
# Add RPMFUSION repository
RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-27.noarch.rpm
# Install Trinity build dependencies
RUN dnf update -y
ADD packages /etc/yum.repos.d/packages
RUN dnf install -y $(</etc/yum.repos.d/packages)
# Add YUM repository for locally built packages
ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity
RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
ADD rpmmacros /home/trinity/.rpmmacros

@ -0,0 +1,214 @@
alsa-lib-devel
aspell
aspell-devel
audiofile-devel
autotrace
avahi-devel
bind-devel
binutils-devel
bison
boost-devel
bzip2-devel
ccache
ccrtp-devel
cdparanoia
cdparanoia-devel
chmlib-devel
chrpath
clamav
clamav-devel
clucene-core-devel
cmake
commoncpp2-devel
cpp
cppunit-devel
createrepo
cryptsetup-devel
cups-devel
db4-devel
dbus-glib-devel
djvulibre
djvulibre-devel
doxygen
dssi-devel
esound-devel
exempi-devel
exiv2-devel
fdupes
ffmpeg-devel
fftw-devel
file-devel
flac-devel
flex-static
fontpackages-devel
fribidi-devel
gamin-devel
gcc
gcc-c++
gettext-devel
glib-devel
gmime-devel
gmp-devel
gnokii-devel
gperf
gpgme-devel
gphoto2-devel
GraphicsMagick-devel
gsl-devel
gstreamer1-devel
gstreamer1-plugins-base-devel
gtk2-devel
gtk3-devel
gtk+-devel
gtk-doc
guile-devel
heimdal-devel
hspell-devel
htdig
html2ps
icu
ImageMagick-devel
imake
imlib-devel
imlib2-devel
intltool
jack-audio-connection-kit-devel
jasper-devel
java-1.8.0-openjdk-devel
java-devel
java-openjdk
lame-devel
lcms-devel
libacl-devel
libblkid-devel
libcap-devel
libcdio-devel
libcdio-paranoia-devel
libconfig-devel
libcurl-devel
libdb-cxx-devel
libdb-devel
libdvdread-devel
libfontenc-devel
libgadu-devel
libgpod-devel
libgsf-devel
libical-devel
libidn-devel
libifp-devel
liblo-devel
liblrdf-devel
libmad-devel
libmng-devel
libmp4v2-devel
libmpcdec-devel
libmtp-devel
libmusicbrainz5-devel
libnjb-devel
libofx-devel
libogg-devel
libotr-devel
libpaper-devel
libpqxx-devel
libqalculate-devel
libraw1394-devel
librsvg2
librsvg2-tools
libsamplerate-devel
libsmbclient-devel
libsndfile-devel
libssh2-devel
libtheora-devel
libtiff-devel
libtool
libtool-ltdl-devel
libudev-devel
libudisks2-devel
libutempter-devel
libv4l-devel
libvisual-devel
libvncserver-devel
libvorbis-devel
libwmf-devel
libwpd-devel
libXaw-devel
libXcomposite-devel
libXdamage-devel
libXdmcp-devel
libxkbfile-devel
libXScrnSaver-devel
libxslt-devel
libXtst-devel
libXv-devel
libXxf86dga-devel
libXxf86vm-devel
libzrtpcpp-devel
lirc-devel
lm_sensors-devel
meanwhile-devel
mftrace
mysql-devel
nas-devel
neon-devel
netpbm-progs
net-snmp-devel
net-tools
NetworkManager-glib-devel
nspr-devel
ocaml
ocaml(compiler)
OpenEXR-devel
openldap-devel
opensc
openslp-devel
opensp-devel
ortp-devel
pam-devel
pciutils-devel
pcre-devel
pcsc-lite-devel
perl
perl-devel
perl(ExtUtils::MakeMaker)
perl(XML::Parser)
pilot-link-devel
pkcs11-helper-devel
poppler-devel
postgresql
postgresql-devel
pulseaudio-libs-devel
qt4-devel
recode
redhat-rpm-config
rpm-build
ruby
ruby-devel
sane-backends-devel
scons
SDL-devel
sip-devel
speex-devel
sqlite-devel
subversion-devel
sudo
sword-devel
t1lib-devel
t1utils
taglib-devel
texinfo
torsocks
transfig
udisks-devel
unixODBC-devel
usbutils
valgrind
wireless-tools-devel
xbase-devel
xine-lib-devel
xmedcon
xmedcon-devel
xmlto
xorg-x11-font-utils
xscreensaver
xscreensaver-extras
xz-devel

@ -0,0 +1,11 @@
[rpmbuild.${ARCH}]
name=rpmbuild.${ARCH}
baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
enabled=1
gpgcheck=0
[rpmbuild.noarch]
name=rpmbuild.noarch
baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
enabled=1
gpgcheck=0

@ -0,0 +1,3 @@
%dist .fc27
%_smp_mflags -j8
%jobs 8

@ -0,0 +1,24 @@
FROM opensuse32:tumbleweed
ARG TDE_VERSION=14.0.4
ARG ARCH=i686
# Add PACKMAN repository
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
RUN setarch ${ARCH} zypper refresh
# Install Trinity build dependencies
ADD packages /etc/zypp/packages
RUN setarch ${ARCH} zypper remove -y openssl
RUN setarch ${ARCH} zypper install -l -y $(</etc/zypp/packages)
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity
RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
ADD rpmmacros /home/trinity/.rpmmacros
# Add YUM repository for locally built packages
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch

@ -0,0 +1,24 @@
FROM opensuse:tumbleweed
ARG TDE_VERSION=14.0.4
ARG ARCH=x86_64
# Add PACKMAN repository
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
RUN zypper refresh
# Install Trinity build dependencies
ADD packages /etc/zypp/packages
RUN zypper remove -y openssl
RUN zypper install -l -y $(</etc/zypp/packages)
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity
RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
ADD rpmmacros /home/trinity/.rpmmacros
# Add YUM repository for locally built packages
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch

@ -0,0 +1,177 @@
alsa-devel
aspell
aspell-devel
audiofile-devel
automake
bdftopcf
bind-devel
binutils-devel
bison
boost-devel
ccache
cdparanoia
cdparanoia-devel
chmlib-devel
cln-devel
chrpath
clamav
clucene-core-devel
cmake
createrepo
cups-devel
cyrus-sasl-devel
dbus-1-devel
dbus-1-glib-devel
djvulibre
docbook-utils
docbook-xsl-stylesheets
doxygen GraphicsMagick
dssi-devel
fdupes
ffmpeg-devel
fftw3-devel
file-devel
flac-devel
flex
freetype-devel
fribidi-devel
gamin-devel
gcc-c++
giflib-devel
glu-devel
gmime-devel
gmp-devel
gnokii-devel
gperf xmlto
GraphicsMagick-devel
gsl-devel
gstreamer-devel
gstreamer-plugins-base-devel
gtk2-devel
gtk3-devel
gtk-doc
htdig
html2ps
hunspell-devel
ImageMagick-devel
imlib2-devel
intltool
java-1_8_0-openjdk-devel
libacl-devel
libart_lgpl-devel
libavahi-devel
libavcodec-devel
libblkid-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
libgadu-devel
libgpgme-devel
libgphoto2-devel
libgpod-devel
libical-devel
libidn-devel
libiw-devel
libjack-devel
libjasper-devel
liblcms2-devel
liblo-devel
liblrdf-devel
libmad-devel
libmariadb-devel
libmng-devel
libmp3lame-devel
libmpcdec-devel
libmtp-devel
libmusicbrainz-devel
libneon-devel
libnjb-devel
libopenssl-1_1_0-devel
libofx-devel
libotr-devel
libpisock-devel
libpng16-devel
libpoppler-devel
libpqxx-devel
libpulse-devel
libqalculate-devel
libraw1394-devel
librsvg-devel
libsamplerate-devel
libSDL-devel
libsmbclient-devel
libsndfile-devel
libtag-devel
libtheora-devel
libtiff-devel
libtool
libtwolame-devel
libudev-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwmf-devel
libwpd-devel
libxine-devel
libxslt-devel
lilo
lirc-devel
make
meanwhile-devel
Mesa-devel
Mesa-libGL-devel
mozilla-nspr-devel
net-tools-deprecated
NetworkManager-devel
ocaml
openexr-devel
opensc
openslp-devel
opensp-devel
openssl-1_1_0
pam-devel
patch
pciutils-devel
pcre-devel
pcsc-lite-devel
pkcs11-helper-devel
postgresql
postgresql-devel
python-devel
python-sip-devel
recode
rpm-build
rsvg-view
ruby
ruby-devel
sane-backends-devel
scons
speex-devel
sqlite3-devel
subversion-devel
sudo
swig
sword-devel
torsocks
transfig
udisks2-devel
unixODBC-devel
update-desktop-files
usbutils
utempter-devel
valgrind
wireless-tools
wv2-devel
xcb-proto-devel
xscreensaver
xscreensaver-data
xscreensaver-data-extra
xz-devel

@ -0,0 +1,3 @@
%dist .osstw
%_smp_mflags -j8
%jobs 8

@ -72,7 +72,7 @@ BuildRequires: fdupes
BuildRequires: clamav
Requires: clamav
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} == 1330
BuildRequires: clamav-devel
%endif
@ -146,7 +146,6 @@ for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
/sbin/ldconfig
%postun
@ -154,7 +153,6 @@ for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
/sbin/ldconfig
%files -f %{tde_pkg}.lang

@ -100,7 +100,11 @@ BuildRequires: libgpod-devel >= 0.4.2
# LCMS support
%if 0%{?suse_version}
%if 0%{?suse_version} == 1330
BuildRequires: liblcms2-devel
%else
BuildRequires: liblcms-devel
%endif
%else
BuildRequires: lcms-devel
%endif

@ -67,7 +67,11 @@ BuildRequires: gettext
# LCMS support
%if 0%{?suse_version}
%if 0%{?suse_version} == 1330
BuildRequires: liblcms2-devel
%else
BuildRequires: liblcms-devel
%endif
%else
BuildRequires: lcms-devel
%endif

@ -74,7 +74,11 @@ BuildRequires: gcc-c++
# LCMS support
%if 0%{?suse_version}
%if 0%{?suse_version} == 1330
BuildRequires: liblcms2-devel
%else
BuildRequires: liblcms-devel
%endif
%else
BuildRequires: lcms-devel
%endif

@ -1034,7 +1034,7 @@ fi
EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
%endif
%if 0%{?suse_version} >= 1330
EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}"
EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu"
%endif
# Warning: GCC visibility causes FTBFS [Bug #1285]

@ -195,6 +195,10 @@ BuildRequires: libdrm-devel
BuildRequires: OpenEXR-devel
# POPPLER support
#if 0%{?suse_version} != 1330
%define with_pdf 1
#endif
%if 0%{?with_pdf}
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
BuildRequires: poppler-devel >= 0.12
%endif
@ -205,10 +209,15 @@ BuildRequires: %{_lib}poppler-devel
# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
BuildRequires: trinity-poppler-devel >= 0.12
%endif
%endif
# LCMS support
%if 0%{?suse_version}
BuildRequires: liblcms2-devel
%if 0%{?suse_version} == 1330
%else
BuildRequires: liblcms-devel
%endif
%else
BuildRequires: lcms-devel
%endif
@ -260,7 +269,9 @@ Requires: trinity-ksvg = %{version}-%{release}
Requires: trinity-kview = %{version}-%{release}
Requires: trinity-kviewshell = %{version}-%{release}
Requires: trinity-libkscan = %{version}-%{release}
%if 0%{?with_pdf}
Requires: trinity-libpoppler-tqt = %{version}-%{release}
%endif
%description
Graphics applications for the Trinity Desktop Environment, including
@ -364,8 +375,10 @@ tags, etc. all from within the file manager).
%{tde_tdelibdir}/tdefile_jpeg.so
%{tde_tdelibdir}/tdefile_pcx.la
%{tde_tdelibdir}/tdefile_pcx.so
%if 0%{?with_pdf}
%{tde_tdelibdir}/tdefile_pdf.la
%{tde_tdelibdir}/tdefile_pdf.so
%endif
%{tde_tdelibdir}/tdefile_png.la
%{tde_tdelibdir}/tdefile_png.so
%{tde_tdelibdir}/tdefile_pnm.la
@ -393,7 +406,9 @@ tags, etc. all from within the file manager).
%{tde_datadir}/services/tdefile_ico.desktop
%{tde_datadir}/services/tdefile_jpeg.desktop
%{tde_datadir}/services/tdefile_pcx.desktop
%if 0%{?with_pdf}
%{tde_datadir}/services/tdefile_pdf.desktop
%endif
%{tde_datadir}/services/tdefile_png.desktop
%{tde_datadir}/services/tdefile_pnm.desktop
%{tde_datadir}/services/tdefile_ps.desktop
@ -896,6 +911,7 @@ This package contains development files for Trinity's scanner library.
##########
%if 0%{?with_pdf}
%package -n trinity-libpoppler-tqt
Summary: TQt support for Poppler
Group: Productivity/Graphics/Viewers
@ -911,9 +927,11 @@ This library is used by the Trinity graphics file plugins for PDF support.
%files -n trinity-libpoppler-tqt
%defattr(-,root,root,-)
%{tde_libdir}/libpoppler-tqt.so.*
%endif
##########
%if 0%{?with_pdf}
%package -n trinity-libpoppler-tqt-devel
Summary: Development files for TQt support for Poppler
Group: Development/Libraries/Other
@ -935,6 +953,7 @@ This package contains the development files needed to compile applications again
%{tde_libdir}/libpoppler-tqt.la
%{tde_libdir}/libpoppler-tqt.so
%{tde_libdir}/pkgconfig/poppler-tqt.pc
%endif
##########
@ -947,7 +966,9 @@ Provides: trinity-kdegraphics-devel = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: trinity-libkscan-devel = %{version}-%{release}
%if 0%{?with_pdf}
Requires: trinity-libpoppler-tqt-devel = %{version}-%{release}
%endif
%description devel
This package contains the development files needed to compile
@ -1049,7 +1070,7 @@ fi
%{?with_paper:-DWITH_LIBPAPER=ON} \
-DWITH_TIFF=ON \
-DWITH_OPENEXR=ON \
-DWITH_PDF=ON \
-DWITH_PDF=%{?with_pdf:ON}%{?!with_pdf:OFF} \
-DBUILD_ALL=ON \
-DBUILD_KUICKSHOW=OFF \
%{!?build_kmrml:-DBUILD_KMRML=OFF} \

Loading…
Cancel
Save