RPM: Update for final R14.1.3

Signed-off-by: François Andriot <albator78@libertysurf.fr>
r14.1.x
François Andriot 1 month ago
parent 3486112a8b
commit 7ac1265088

@ -158,11 +158,6 @@ ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .mga9 .oss151 .oss152 .oss1
$(call buildpkg,3rdparty/lcms)
endif
mp4v2:
ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw ))
$(call buildpkg,3rdparty/mp4v2)
endif
rdesktop:
ifneq (,$(filter $(DIST), .oss150 ))
$(call buildpkg,3rdparty/rdesktop)
@ -224,7 +219,7 @@ abakus: tdebase
adept: tdebase
$(call buildpkg,applications/system/adept)
amarok: tdebase mp4v2
amarok: tdebase
$(call buildpkg,applications/multimedia/amarok)
basket: tdebase tdepim
@ -474,7 +469,7 @@ ktorrent: tdebase
$(call buildpkg,applications/internet/ktorrent)
kvirc: tdebase
# $(call buildpkg,applications/internet/kvirc)
$(call buildpkg,applications/internet/kvirc)
kvkbd: tdebase
$(call buildpkg,applications/system/kvkbd)

@ -110,7 +110,11 @@ BuildRequires: libheimdal-devel
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?pclinuxos}
BuildRequires: %{_lib}udev1-devel
%else
BuildRequires: %{_lib}udev-devel
%endif
%else
BuildRequires: libudev-devel
%endif

@ -294,14 +294,6 @@ BuildRequires: libxine-devel
BuildRequires: trinity-akode-devel
%endif
# MP4V2 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?mdkver} < 5000000
%define with_mp4v2 1
BuildRequires: libmp4v2-devel
%endif
%endif
# ruby
BuildRequires: ruby
BuildRequires: ruby-devel
@ -551,7 +543,6 @@ fi
%{?with_mtp:-DWITH_MTP=ON} \
%{?with_karma:-DWITH_RIOKARMA=ON} \
%{!?with_daap:-DWITH_DAAP=OFF} \
%{?with_mp4v2:-DWITH_MP4V2=ON} \
%{?with_inotify:-DWITH_INOTIFY=ON} \
-DWITH_SYSTEM_SQLITE=ON \
-DBUILD_ALL=ON \

@ -126,8 +126,12 @@ BuildRequires: libxine-devel
# X11 stuff
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libxt-devel
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}xv-devel
%else
BuildRequires: libxv-devel
%endif
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
BuildRequires: libXv-devel
%endif

@ -227,6 +227,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/locolor/*/*/tderadio*.png
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo
%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo
%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo
%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo

@ -0,0 +1,152 @@
#
# spec file for package twin-style-mallory (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
%define tde_version 14.1.2
%endif
%define tde_pkg twin-style-mallory
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0.5
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TDE window decoration from SUSE 9.3
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
%description
This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE.
It features in additon to the original theme several new button
styles and a changeable titlebar image.
A color scheme for TDE is provided too.
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DBUILD_ALL=ON \
..
%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
%clean
%__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{tde_tdelibdir}/twin3_mallory.la
%{tde_tdelibdir}/twin3_mallory.so
%{tde_tdelibdir}/twin_mallory_config.la
%{tde_tdelibdir}/twin_mallory_config.so
%{tde_datadir}/apps/tdedisplay/color-schemes/Mallory*
%{tde_datadir}/apps/twin/mallory.desktop
%changelog

@ -41,7 +41,7 @@ if [ -d "${PATCHDIR}" ]; then
fi
fi
if [ "${DIST}" = ".fc41" ] || [ "${DIST}" = ".mga9" ] || [ "${DIST}" = ".omv5000" ] || [ "${DIST}" = ".osstw" ]; then
if [ "${DIST}" = ".fc41" ] || [ "${DIST}" = ".mga9" ] || [ "${DIST}" = ".omv5000" ] || [ "${DIST}" = ".osstw" ] || [ "${DIST:0:6}" = ".pclos" ]; then
sed -i "${TARGETDIR}/"*".spec" \
-e "s|%patch|%patch -P |g"
fi

@ -28,7 +28,7 @@ elif [ -x /usr/bin/dnf ]; then
REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)'
elif [ -x /usr/bin/zypper ]; then
REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${DIST}/ && cd /tmp/rpm${DIST}; umask 0000; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${DIST}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
#REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${DIST}/ && cd /tmp/rpm${DIST}; umask 0000; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${DIST}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
elif [ -x /usr/bin/yum ]; then
if [ "${DIST}" = ".el5" ]; then
REPOUPDATE='(cd ${RPMDIR}; ${createrepo} ${ARCH} & ${createrepo} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'

@ -83,7 +83,11 @@ BuildRequires: zlib-devel
# PNG support
%if 0%{?mdkver} || 0%{?mgaversion}
%if 0%{?pclinuxos}
%define libpng %{_lib}png1.6
%else
%define libpng %{_lib}png
%endif
%else
%define libpng libpng
%endif

@ -52,13 +52,10 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin
RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm
#RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \
# && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \
# && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/%forgeautosetup/ s|.*|%autosetup -p1 -n libunibreak-libunibreak_6_1|" -e "s|%forgesource|libunibreak-libunibreak_6_1.tar.gz|" \
# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec --define "forgemeta %nil" \
# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm
RUN set -x \
&& rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/39/Everything/source/tree/Packages/l/libunibreak-4.0-13.fc39.src.rpm --define "ldconfig_scriptlets %post -p /sbin/ldconfig" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{4,devel}*.rpm
RUN set -x \
&& rpmbuild --rebuild http://vault.almalinux.org/8.10/AppStream/Source/Packages/taglib-1.11.1-8.el8.src.rpm --define "ldconfig_scriptlets %post -p /sbin/ldconfig" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/taglib-{1,devel}*.rpm

@ -127,6 +127,7 @@ libtiff-devel
libtirpc-devel
libtool
libtool-ltdl-devel
libunibreak-devel
libutempter-devel
libv4l-devel
libvisual-devel

@ -102,6 +102,7 @@ lib64pcre-devel
lib64pkcs11-helper-devel
lib64poppler-devel
lib64pulseaudio-devel
lib64raptor-devel
lib64rsvg2-devel
lib64sane1-devel
lib64t1lib-devel

@ -136,10 +136,12 @@ libtool
libtwolame-devel
libudev1
libudisks2-0-devel
libunibreak-devel
libuuid-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwebp-devel
libwmf-devel
libwpd-devel
libXaw-devel
@ -176,6 +178,7 @@ pam-devel
patch
pciutils-devel
pcre-devel
pcre2-devel
pcsc-lite-devel
perl(JSON)
perl-PAR-Packer
@ -193,6 +196,7 @@ rpcgen
rpm-build
rpmlint
rsvg-convert
rsync
ruby
ruby-devel
sane-backends-devel

@ -43,7 +43,6 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/cscope-15.9-2.mga8.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm
@ -53,10 +52,11 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/rpcgen-1*.rpm
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/html2ps-2.0-3.b7.8.mga8.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/html2ps.spec -e "s|%patch|%patch -P |" \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/heimdal-7.8.0-2.mga9.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%autopatch|%patch1|" -e "/Conflicts: krb5-devel/ s|^|#|" \
&& sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%patch|%patch -P |" -e "/Conflicts: krb5-devel/ s|^|#|" -e "s|%mkrel 2|1%{?dist}|" \
&& LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm

@ -6,9 +6,10 @@ ARCH="$3"
[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2"
[ -z "${ARCH}" ] && ARCH="x86_64"
[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
FILE="${HOME}/tde/docker/${IMAGE}.tar.gz"
docker rmi -f "${IMAGE}"
${DOCKER} rmi -f "${IMAGE}"
rm -f "${FILE}"

Loading…
Cancel
Save