diff options
| author | François Andriot <albator78@libertysurf.fr> | 2025-11-02 18:41:29 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2025-11-02 18:41:29 +0100 |
| commit | 9a981abe36c5a5ee2f63812b86a2a58142c5106b (patch) | |
| tree | 662a3ce1eb0004fcc1c87d425ea881886eba4e1e | |
| parent | 16831320a4347e229656872bc54dac5dbb91369e (diff) | |
| download | tde-packaging-9a981abe.tar.gz tde-packaging-9a981abe.zip | |
RPM: update packaging for R14.1.5
Signed-off-by: François Andriot <albator78@libertysurf.fr>
351 files changed, 2634 insertions, 894 deletions
diff --git a/redhat/Makefile b/redhat/Makefile index 437a9c2c2..49a95c5ec 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -1,6 +1,6 @@ SHELL := /bin/bash PATH := $(PATH):$(shell pwd)/build -TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.4}) +TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.5}) TDE_GIT_DIR := $(shell cd ../..; pwd) TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd) RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))" @@ -24,10 +24,10 @@ buildpkg = \ all: dependencies core libraries applications i18n meta external -dependencies: tde-cmake tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt pytqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt +dependencies: tde-cmake tqt tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt pytqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt core: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions pytde -applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice kommando kompose konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tdealternatives tdebluez tde-ebook-reader tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdeknighttour tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-polyester tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-fahrenheit twin-style-machbunt twin-style-mallory twin-style-suse2 wlassistant yakuake +applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice kommando kompose konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tdealternatives tdebluez tde-ebook-reader tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdeknighttour tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-polyester tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdexsldbg tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-fahrenheit twin-style-machbunt twin-style-mallory twin-style-suse2 universal-indent-gui-tqt wlassistant xdg-desktop-portal-tde yakuake i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n ### Trinity Dependencies @@ -76,10 +76,10 @@ tqca: tqtinterface tqscintilla: tqca tdelibs $(call buildpkg,dependencies/tqscintilla) -tqt3: - $(call buildpkg,dependencies/tqt3) +tqt: + $(call buildpkg,dependencies/tqt) -tqtinterface: tqt3 +tqtinterface: tqt $(call buildpkg,dependencies/tqtinterface) # Core packages @@ -110,7 +110,7 @@ tdegames: tdebase tdemultimedia tdegraphics: tdebase lcms $(call buildpkg,core/tdegraphics) -tdelibs: brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl tde-cmake +tdelibs: brp-check-trinity tqt tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl tde-cmake $(call buildpkg,core/tdelibs) tdemultimedia: tdebase akode @@ -144,7 +144,7 @@ ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw endif htdig: -ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .fc40 .fc41 .fc42 .fc43 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv6000 . .osstw )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .el10 .fc38 .fc39 .fc40 .fc41 .fc42 .fc43 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv6000 .oss160 .osstw )) $(call buildpkg,extras/htdig) endif @@ -154,7 +154,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw )) endif lcms: -ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .oss160 .osstw )) $(call buildpkg,3rdparty/lcms) endif @@ -176,7 +176,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151)) endif wv2: -ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39 .fc40 .fc41 .fc42 .omv2490 .omv6000 .osstw)) +ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .el10 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39 .fc40 .fc41 .fc42 .omv2490 .omv6000 .oss160 .osstw)) $(call buildpkg,3rdparty/wv2) endif @@ -253,12 +253,12 @@ fusion-icon: tdebase $(call buildpkg,applications/misc/fusion-icon) gtk3-tqt-engine: tdebase -ifeq (,$(filter $(DIST),.el5 .el6)) +ifeq (,$(filter $(DIST), .el5 .el6)) $(call buildpkg,applications/themes/gtk3-tqt-engine) endif gtk-qt-engine: tdebase -ifeq (,$(filter $(DIST),.el5 .fc42 .fc43 .pclos2025)) +ifeq (,$(filter $(DIST), .el5 .fc42 .fc43 .oss160 .pclos2025)) $(call buildpkg,applications/themes/gtk-qt-engine) endif @@ -416,7 +416,7 @@ kpicosim: tdebase $(call buildpkg,applications/development/kpicosim) kpilot: tdebase tdepim -ifeq (,$(filter $(DIST),.el5 .oss154 .oss155 .oss156 .osstw)) +ifeq (,$(filter $(DIST), .el5 .el10 .oss154 .oss155 .oss156 .oss160 .osstw)) $(call buildpkg,applications/office/kpilot) endif @@ -498,12 +498,12 @@ qalculate-tde: tdebase $(call buildpkg,applications/utilities/qalculate-tde) qt4-tqt-theme-engine: tdebase -ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .omv2490 .omv6000 .oss153 .oss154 .oss155 .oss156 .osstw)) +ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .el10 .omv2490 .omv6000 .oss153 .oss154 .oss155 .oss156 .oss160 .osstw)) $(call buildpkg,applications/themes/qt4-tqt-theme-engine) endif rosegarden: tdebase -ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8 .el9)) +ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8 .el9 .el10)) $(call buildpkg,applications/multimedia/rosegarden) endif @@ -606,6 +606,11 @@ tdesvn: tdebase tde-systemsettings: tdebase $(call buildpkg,applications/settings/tde-systemsettings) +tdexsldbg: tdebase +ifeq (,$(filter $(DIST), .osstw)) + $(call buildpkg,applications/development/tdexsldbg) +endif + tdmtheme: tdebase $(call buildpkg,applications/tdmtheme) @@ -633,9 +638,15 @@ twin-style-mallory: tdebase twin-style-suse2: tdebase $(call buildpkg,applications/themes/twin-style-suse2) +universal-indent-gui-tqt: tdebase + $(call buildpkg,applications/development/universal-indent-gui-tqt) + wlassistant: tdebase $(call buildpkg,applications/settings/wlassistant) +xdg-desktop-portal-tde: tdebase + $(call buildpkg,applications/system/xdg-desktop-portal-tde) + yakuake: tdebase $(call buildpkg,applications/system/yakuake) @@ -661,12 +672,12 @@ fileshareset: $(call buildpkg,extras/fileshareset) libheimdal: -ifneq (,$(filter $(DIST), .osstw )) +ifneq (,$(filter $(DIST), .oss160 .osstw )) $(call buildpkg,extras/libheimdal) endif pinentry-tqt: tqtinterface -ifeq (,$(filter $(DIST), .el5 .el6 .el7 )) +ifeq (,$(filter $(DIST), .el5 .el6 .el7 .fc43 .osstw )) $(call buildpkg,extras/pinentry-tqt) endif diff --git a/redhat/applications/development/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec index a9d26e026..189c9c617 100644 --- a/redhat/applications/development/kdbg/kdbg.spec +++ b/redhat/applications/development/kdbg/kdbg.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kdbg %define tde_prefix /opt/trinity diff --git a/redhat/applications/development/kdiff3/kdiff3.spec b/redhat/applications/development/kdiff3/kdiff3.spec index 67cc2a32c..e22ba95d6 100644 --- a/redhat/applications/development/kdiff3/kdiff3.spec +++ b/redhat/applications/development/kdiff3/kdiff3.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kdiff3 %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kdiff3.desktop" Development RevisionControl %endif diff --git a/redhat/applications/development/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec index 24ba5d984..e8dd5f137 100644 --- a/redhat/applications/development/kpicosim/kpicosim.spec +++ b/redhat/applications/development/kpicosim/kpicosim.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kpicosim %define tde_prefix /opt/trinity @@ -157,7 +157,7 @@ fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -D kpicosim -C "%summary" kpicosim Development IDE %endif diff --git a/redhat/applications/development/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec index c1f8f27e0..f0243059c 100644 --- a/redhat/applications/development/kscope/kscope.spec +++ b/redhat/applications/development/kscope/kscope.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kscope %define tde_prefix /opt/trinity @@ -166,7 +166,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{tde_pkg} Development IDE %endif diff --git a/redhat/applications/development/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec index 93bdc0d11..95b6f9a8a 100644 --- a/redhat/applications/development/ktechlab/ktechlab.spec +++ b/redhat/applications/development/ktechlab/ktechlab.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg ktechlab %define tde_prefix /opt/trinity @@ -141,7 +141,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r -n ktechlab Science Math %endif diff --git a/redhat/applications/development/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec index 3d66d9006..f8b0dc79e 100644 --- a/redhat/applications/development/kxmleditor/kxmleditor.spec +++ b/redhat/applications/development/kxmleditor/kxmleditor.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kxmleditor %define tde_prefix /opt/trinity @@ -146,7 +146,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "XML Editor" -r "%{tde_pkg}" Utility Editor %endif diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec index 7aa506032..e53516bb4 100644 --- a/redhat/applications/development/piklab/piklab.spec +++ b/redhat/applications/development/piklab/piklab.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg piklab %define tde_prefix /opt/trinity @@ -84,7 +84,7 @@ BuildRequires: readline-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else -%if 0%{?fedora} >= 37 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else diff --git a/redhat/applications/development/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec index 7ee1b4307..c0e26b3a7 100644 --- a/redhat/applications/development/tdesvn/tdesvn.spec +++ b/redhat/applications/development/tdesvn/tdesvn.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdesvn %define tde_prefix /opt/trinity @@ -316,7 +316,7 @@ export PATH="%{_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "SVN Client" %{tde_pkg} Development RevisionControl %endif diff --git a/redhat/applications/development/tdexsldbg/tdexsldbg.spec b/redhat/applications/development/tdexsldbg/tdexsldbg.spec new file mode 100644 index 000000000..d0bd9a3b8 --- /dev/null +++ b/redhat/applications/development/tdexsldbg/tdexsldbg.spec @@ -0,0 +1,180 @@ +# +# spec file for package tdexsldbg (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.5 +%endif +%define tde_pkg tdexsldbg +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%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: %{tde_version} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Graphical XSLT debugger for TDE +Group: Applications/Multimedia +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: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# 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 + +Obsoletes: trinity-kxsldbg < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release} + +%description +KXSLDbg is a debugger for XSLT scripts. It includes a graphical user +interface as well as a text-based debugger. KXSLDbg can be run as a +standalone application or as an embedded TDE part. + +XSLT is an XML language for defining transformations of XML files from +XML to some other arbitrary format, such as XML, HTML, plain text, etc., +using standard XSLT stylesheets. + +This package is part of TDE, as a component of the TDE web development module. +See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information. + +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +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} -DFORCE_DEBUGGER" \ + -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} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang kxsldbg + +%files -f kxsldbg.lang +%defattr(-,root,root,-) +%{tde_bindir}/kxsldbg +%{tde_bindir}/xsldbg +%{tde_tdelibdir}/libkxsldbgpart.la +%{tde_tdelibdir}/libkxsldbgpart.so +%{tde_datadir}/applications/tde/kxsldbg.desktop +%{tde_datadir}/applnk/.hidden/xsldbg.desktop +%{tde_datadir}/apps/kxsldbg/kxsldbg_shell.rc +%{tde_datadir}/apps/kxsldbgpart/kxsldbg_part.rc +%lang(da) %{tde_tdedocdir}/HTML/da/kxsldbg/ +%lang(da) %{tde_tdedocdir}/HTML/da/xsldbg/ +%lang(de) %{tde_tdedocdir}/HTML/de/kxsldbg/ +%lang(en) %{tde_tdedocdir}/HTML/en/kxsldbg/ +%lang(en) %{tde_tdedocdir}/HTML/en/xsldbg/ +%lang(es) %{tde_tdedocdir}/HTML/es/kxsldbg/ +%lang(es) %{tde_tdedocdir}/HTML/es/xsldbg/ +%lang(et) %{tde_tdedocdir}/HTML/et/kxsldbg/ +%lang(et) %{tde_tdedocdir}/HTML/et/xsldbg/ +%lang(fr) %{tde_tdedocdir}/HTML/fr/kxsldbg/ +%lang(it) %{tde_tdedocdir}/HTML/it/kxsldbg/ +%lang(it) %{tde_tdedocdir}/HTML/it/xsldbg/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/kxsldbg/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/xsldbg/ +%lang(pt) %{tde_tdedocdir}/HTML/pt/kxsldbg/ +%lang(pt) %{tde_tdedocdir}/HTML/pt/xsldbg/ +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/kxsldbg/ +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/xsldbg/ +%lang(ru) %{tde_tdedocdir}/HTML/ru/kxsldbg/ +%lang(ru) %{tde_tdedocdir}/HTML/ru/xsldbg/ +%lang(sv) %{tde_tdedocdir}/HTML/sv/kxsldbg/ +%lang(sv) %{tde_tdedocdir}/HTML/sv/xsldbg/ +%{tde_datadir}/icons/hicolor/*/actions/*.png +%{tde_datadir}/icons/hicolor/*/apps/*.png +%{tde_datadir}/icons/locolor/*/apps/*.png +%{tde_mandir}/man1/kxsldbg.1* +%{tde_datadir}/services/kxsldbg_part.desktop + + +%clean +%__rm -rf %{buildroot} + + +%changelog diff --git a/redhat/applications/development/universal-indent-gui-tqt/universal-indent-gui-tqt.spec b/redhat/applications/development/universal-indent-gui-tqt/universal-indent-gui-tqt.spec new file mode 100644 index 000000000..254e8bad5 --- /dev/null +++ b/redhat/applications/development/universal-indent-gui-tqt/universal-indent-gui-tqt.spec @@ -0,0 +1,171 @@ +# +# spec file for package universal-indent-gui-tqt (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.5 +%endif +%define tde_pkg universal-indent-gui-tqt +%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.2.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: GUI frontend for several code beautifiers +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: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# 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 +UniversalIndentGui is a GUI fontend for several code beautifiers, currently +supporting: + * Artistic Styler + * BCPP + * Cobol Beautify + * CSSTidy + * Fortran 90 PPR + * GNU Indent + * GreatCode + * hindent + * HTB + * Javascript Decoder + * JSPPP + * Perl Tidy + * PHP_Beautifier + * PHP Code Beautifier + * PHP Stylist + * pindent + * Ruby Beautify + * Ruby Formatter + * Shell Indent + * (HTML) Tidy + * Uncrustify + * XML Indent + +UniversalIndentGui allows you to tune a beautifier's configuration and see +how the changes affects a source example live. It is especially useful to +compare different C/C++ beautifiers when you have to choose one of them. + +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +rm -f src/svnqt/CMakeLists.txt.orig +#rm -fr src/svnqt/cache/sqlite3/ + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" + +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} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DMAN_INSTALL_DIR=%{tde_mandir} \ + -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DBUILD_ALL="ON" \ + .. + +# SMP safe ! +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%files +%defattr(-,root,root,-) +%{tde_bindir}/universal-indent-gui-tqt +%{tde_datadir}/universal-indent-gui-tqt/ + + +%clean +%__rm -rf %{buildroot} + + +%changelog diff --git a/redhat/applications/games/knights/knights.spec b/redhat/applications/games/knights/knights.spec index 44a7c4465..9f849eaf7 100644 --- a/redhat/applications/games/knights/knights.spec +++ b/redhat/applications/games/knights/knights.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg knights %define tde_prefix /opt/trinity @@ -174,7 +174,7 @@ if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/knights.desktop" Game BoardGame %endif diff --git a/redhat/applications/games/tdeknighttour/tdeknighttour.spec b/redhat/applications/games/tdeknighttour/tdeknighttour.spec index a1d0e4f29..59f01f091 100644 --- a/redhat/applications/games/tdeknighttour/tdeknighttour.spec +++ b/redhat/applications/games/tdeknighttour/tdeknighttour.spec @@ -18,7 +18,7 @@ # Default version for this component %define tde_pkg tdeknighttour %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif # TDE specific building variables diff --git a/redhat/applications/games/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec index 1de244389..800b3770e 100644 --- a/redhat/applications/games/tdepacman/tdepacman.spec +++ b/redhat/applications/games/tdepacman/tdepacman.spec @@ -18,7 +18,7 @@ # Default version for this component %define tde_pkg tdepacman %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif # TDE specific building variables diff --git a/redhat/applications/graphics/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec index 3be1a9376..cbafb1194 100644 --- a/redhat/applications/graphics/digikam/digikam.spec +++ b/redhat/applications/graphics/digikam/digikam.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg digikam %define tde_prefix /opt/trinity @@ -65,7 +65,7 @@ BuildRequires: trinity-libkexiv2-devel BuildRequires: trinity-libkdcraw-devel BuildRequires: trinity-libkipi-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -91,7 +91,11 @@ BuildRequires: brp-check-trinity # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif @@ -310,7 +314,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %lang(de) %{tde_tdedocdir}/HTML/de/digikam/ %lang(de) %{tde_tdedocdir}/HTML/de/showfoto/ %lang(es) %{tde_tdedocdir}/HTML/es/digikam/ -%lang(es) %{tde_tdedocdir}/HTML/es/showfoto/ %lang(et) %{tde_tdedocdir}/HTML/et/digikam/ %lang(et) %{tde_tdedocdir}/HTML/et/showfoto/ %lang(it) %{tde_tdedocdir}/HTML/it/digikam/ @@ -333,37 +336,38 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +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 + +# Warning: GCC visibility causes FTBFS [Bug #1285] +%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_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ -%if 0%{?rhel} == 5 - --with-included-sqlite3 -%else - --without-included-sqlite3 -%endif + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -371,7 +375,7 @@ export PATH="%{tde_bindir}:${PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -382,7 +386,7 @@ echo "NoDisplay=true" >> "$RPM_BUILD_ROOT%{tde_tdeappdir}/showfoto.desktop" install -D -m 644 "%{SOURCE1}" "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file digikam Graphics Photography %suse_update_desktop_file showfoto Graphics Viewer %suse_update_desktop_file "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop" diff --git a/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec index 1d7d35f88..b2f179912 100644 --- a/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec +++ b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg gwenview-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec index ecd571d7e..ed9b7d2ba 100644 --- a/redhat/applications/graphics/gwenview/gwenview.spec +++ b/redhat/applications/graphics/gwenview/gwenview.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg gwenview %define tde_prefix /opt/trinity @@ -171,7 +171,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file gwenview RasterGraphics Viewer %endif diff --git a/redhat/applications/graphics/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec index f36105b1f..af48edc83 100644 --- a/redhat/applications/graphics/ksquirrel/ksquirrel.spec +++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg ksquirrel %define tde_prefix /opt/trinity @@ -64,7 +64,7 @@ BuildRequires: gettext BuildRequires: trinity-libkipi-devel BuildRequires: trinity-libksquirrel-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -117,55 +117,46 @@ OpenGL and dynamic format support. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export kde_confdir="%{tde_confdir}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build fi -# FIXME: error during ./configure solved by CXXFLAGS below -export CXXFLAGS="${CXXFLAGS} -I%{tde_tdeincludedir}" - -# FIXME: FTBFS during ./configure under rhel8/rhel9 -%if 0%{?rhel} >= 8 -export CXXFLAGS="${CXXFLAGS} -fPIC" -%endif - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +# Warning: GCC visibility causes FTBFS [Bug #1285] +%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_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -189,17 +180,11 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop %{tde_datadir}/apps/ksquirrel/ %{tde_datadir}/apps/ksquirrelpart/ -%config(noreplace) %{tde_confdir}/magic/x-ras.magic -%config(noreplace) %{tde_confdir}/magic/x-sun.magic -%config(noreplace) %{tde_confdir}/magic/x-utah.magic %{tde_tdedocdir}/HTML/*/ksquirrel %{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png %{tde_datadir}/mimelnk/image/*.desktop %{tde_datadir}/services/ksquirrelpart.desktop %{tde_mandir}/man1/ksquirrel.1 %{tde_mandir}/man1/ksquirrel-libs-configurator.1* -%config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc -%config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc -%config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc %changelog diff --git a/redhat/applications/graphics/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec index 3dadccc2a..94e8149c4 100644 --- a/redhat/applications/graphics/potracegui/potracegui.spec +++ b/redhat/applications/graphics/potracegui/potracegui.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg potracegui %define tde_prefix /opt/trinity @@ -156,7 +156,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file potracegui -G "Potrace GUI" Graphics VectorGraphics %endif diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec index c1542d124..c480bbd7d 100644 --- a/redhat/applications/internet/kasablanca/kasablanca.spec +++ b/redhat/applications/internet/kasablanca/kasablanca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kasablanca %define tde_prefix /opt/trinity @@ -95,7 +95,7 @@ BuildRequires: openssl-devel %endif # UTEMPTER support -%if 0%{?suse_version} && 0%{?suse_version} < 1699 +%if 0%{?suse_version} && 0%{?suse_version} < 1600 BuildRequires: utempter-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} @@ -175,7 +175,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Fix desktop files (openSUSE only) -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kasablanca Network FileTransfer %endif diff --git a/redhat/applications/internet/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec index 7da782cde..497e1732d 100644 --- a/redhat/applications/internet/kbiff/kbiff.spec +++ b/redhat/applications/internet/kbiff/kbiff.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kbiff %define tde_prefix /opt/trinity @@ -157,7 +157,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" Applet %endif diff --git a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec index 0099768f7..0c7137a4d 100644 --- a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec +++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kftpgrabber %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec index b04bf3f06..aed598825 100644 --- a/redhat/applications/internet/knmap/knmap.spec +++ b/redhat/applications/internet/knmap/knmap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg knmap %define tde_prefix /opt/trinity @@ -175,7 +175,7 @@ if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{tde_pkg} TDE System Network %endif diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec index 5fac3bbb0..64a732670 100644 --- a/redhat/applications/internet/konversation/konversation.spec +++ b/redhat/applications/internet/konversation/konversation.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg konversation %define tde_prefix /opt/trinity @@ -131,7 +131,7 @@ BuildRequires: libXi6-devel # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -232,7 +232,7 @@ fi -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ -DWITH_ALL_OPTIONS=ON \ - -DWITH_GCC_VISIBILITY=ON \ + %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ diff --git a/redhat/applications/internet/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec index 88309b15f..1d1a48a68 100644 --- a/redhat/applications/internet/kopete-otr/kopete-otr.spec +++ b/redhat/applications/internet/kopete-otr/kopete-otr.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kopete-otr %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec index 254ef1112..f27d0f0ad 100644 --- a/redhat/applications/internet/kshowmail/kshowmail.spec +++ b/redhat/applications/internet/kshowmail/kshowmail.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kshowmail %define tde_prefix /opt/trinity @@ -158,7 +158,7 @@ install -D -m 644 "pics/cr16-app-kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/i install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/48x48/apps/kshowmail.png" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kshowmail Network Email %endif diff --git a/redhat/applications/internet/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec index 3cab0b6c5..cfa9e272d 100644 --- a/redhat/applications/internet/kstreamripper/kstreamripper.spec +++ b/redhat/applications/internet/kstreamripper/kstreamripper.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kstreamripper %define tde_prefix /opt/trinity @@ -144,7 +144,7 @@ export PATH="%{tde_bindir}:${PATH}" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kstreamripper Audio Recorder %endif diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec index 406b2fe93..aea96d4d0 100644 --- a/redhat/applications/internet/ktorrent/ktorrent.spec +++ b/redhat/applications/internet/ktorrent/ktorrent.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg ktorrent %define tde_prefix /opt/trinity @@ -95,6 +95,9 @@ Requires: avahi %endif # GEOIP +%if 0%{?rhel} >= 9 || 0%{?suse_version} >= 1600 +%define builtin_geoip 1 +%else %if 0%{?suse_version} %if 0%{?suse_version} < 1550 BuildRequires: libGeoIP-devel @@ -102,6 +105,7 @@ BuildRequires: libGeoIP-devel %else BuildRequires: geoip-devel %endif +%endif %description KTorrent is a BitTorrent program for Trinity. Its features include speed capping @@ -147,7 +151,7 @@ fi \ -DBUILD_ALL=ON \ -DWITH_ALL_OPTIONS=ON \ -%if 0%{?suse_version} == 1699 +%if 0%{?builtin_geoip} -DWITH_BUILTIN_GEOIP=ON \ -DWITH_SYSTEM_GEOIP=OFF \ %endif diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec index 6337d0f1a..20aba0688 100644 --- a/redhat/applications/internet/kvirc/kvirc.spec +++ b/redhat/applications/internet/kvirc/kvirc.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kvirc %define tde_prefix /opt/trinity @@ -203,7 +203,7 @@ export PATH="%{tde_bindir}:${PATH}" %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kvirc Network IRCClient %endif diff --git a/redhat/applications/internet/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec index 4aa66f8af..c306e8fb9 100644 --- a/redhat/applications/internet/kvpnc/kvpnc.spec +++ b/redhat/applications/internet/kvpnc/kvpnc.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kvpnc %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec index 3f2aab4cb..2a3fa4c12 100644 --- a/redhat/applications/internet/smb4k/smb4k.spec +++ b/redhat/applications/internet/smb4k/smb4k.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg smb4k %define tde_prefix /opt/trinity @@ -187,7 +187,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %suse_update_desktop_file -r %{tde_pkg} System Network %endif diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec index 7245cda0b..1f9481087 100644 --- a/redhat/applications/internet/tork/tork.spec +++ b/redhat/applications/internet/tork/tork.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tork %define tde_prefix /opt/trinity @@ -86,7 +86,7 @@ BuildRequires: brp-check-trinity %endif # TORSOCKS support -BuildRequires: torsocks +#BuildRequires: torsocks # OPENSSL support %if 0%{?mdkver} @@ -96,15 +96,17 @@ BuildRequires: openssl-devel %endif # GEOIP +%if 0%{?rhel} >= 9 || 0%{?suse_version} >= 1600 +%define with_embedded_geoip 1 +%else %if 0%{?suse_version} %if 0%{?suse_version} < 1550 BuildRequires: libGeoIP-devel -%else -%define with_embedded_geoip 1 %endif %else BuildRequires: geoip-devel %endif +%endif %description diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec index 9be203a0c..08a81bfc2 100644 --- a/redhat/applications/misc/bibletime/bibletime.spec +++ b/redhat/applications/misc/bibletime/bibletime.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg bibletime %define tde_prefix /opt/trinity diff --git a/redhat/applications/misc/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec index 8f6daee6c..d719c6ea9 100644 --- a/redhat/applications/misc/fusion-icon/fusion-icon.spec +++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec @@ -1,6 +1,6 @@ # Default version for this component %define tde_pkg fusion-icon -%define tde_version 14.1.4 +%define tde_version 14.1.5 %if "%{?python2_sitelib}" == "" %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec index cf5ce74c7..cd43cae0a 100644 --- a/redhat/applications/misc/kcmldap/kcmldap.spec +++ b/redhat/applications/misc/kcmldap/kcmldap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kcmldap %define tde_prefix /opt/trinity @@ -213,7 +213,7 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ -%if 0%{?suse_version} == 1699 +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ %endif diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec index d5996eb48..1841a1d9c 100644 --- a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kcmldapcontroller %define tde_prefix /opt/trinity @@ -166,12 +166,10 @@ This is a TDE control center module to manage users, groups, and machines in Ker %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/primaryrccertupdater -%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?rhel} >= 7 -%if 0%{?pclinuxos} == 0 +%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || ( 0%{?rhel} >= 7 && 0%{?rhel} <= 9 ) %{tde_libdir}/slapi-acl-manager.la %{tde_libdir}/slapi-acl-manager.so %endif -%endif %{tde_tdelibdir}/kcm_ldapcontroller.la %{tde_tdelibdir}/kcm_ldapcontroller.so %{tde_tdeappdir}/ldapcontroller.desktop @@ -192,11 +190,6 @@ This is a TDE control center module to manage users, groups, and machines in Ker %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?pclinuxos} -%__rm -rf acl-updater -%endif - - %build unset QTDIR QTINC QTLIB @@ -209,7 +202,7 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ -%if 0%{?suse_version} == 1699 +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ %endif diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec index b367a7625..75e1f47e3 100644 --- a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kcmldapmanager %define tde_prefix /opt/trinity @@ -190,7 +190,7 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ -%if 0%{?suse_version} == 1699 +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ %endif diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec index 04937d4ef..a794555dd 100644 --- a/redhat/applications/misc/kerberostray/kerberostray.spec +++ b/redhat/applications/misc/kerberostray/kerberostray.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kerberostray %define tde_prefix /opt/trinity @@ -169,7 +169,7 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ -%if 0%{?suse_version} == 1699 +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ %endif diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec index 749692e05..01defb066 100644 --- a/redhat/applications/misc/krecipes/krecipes.spec +++ b/redhat/applications/misc/krecipes/krecipes.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg krecipes %define tde_prefix /opt/trinity @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -76,7 +76,11 @@ BuildRequires: brp-check-trinity %endif # MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else BuildRequires: mysql-devel +%endif # POSTGRESQL support BuildRequires: postgresql @@ -112,36 +116,38 @@ databases. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +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 + +# Warning: GCC visibility causes FTBFS [Bug #1285] +%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_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --with-sqlite \ - --with-mysql \ - --with-postgresql + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -149,17 +155,12 @@ export PATH="%{tde_bindir}:${PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build -for f in %{?buildroot}%{tde_datadir}/locale/*/LC_MESSAGES/%{name}-*.mo; do mv -fv $f ${f%/*}/krecipes.mo; done %find_lang %{tde_pkg} -# Fix desktop file location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/krecipes.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r krecipes Education Chemistry %endif diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index 04c1f0995..b8f059362 100644 --- a/redhat/applications/multimedia/amarok/amarok.spec +++ b/redhat/applications/multimedia/amarok/amarok.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg amarok %define tde_prefix /opt/trinity @@ -111,15 +111,23 @@ BuildRequires: libtool BuildRequires: libtool-ltdl-devel %endif -%if 0%{?fedora} >= 37 +# LIBUSB support +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else BuildRequires: libusb-devel %endif -BuildRequires: mysql-devel + BuildRequires: taglib-devel +# MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else +BuildRequires: mysql-devel +%endif + # SDL support %if 0%{?mdkver} BuildRequires: %{_lib}SDL-devel @@ -211,7 +219,7 @@ BuildRequires: libmtp-devel %endif # Creative Nomad Jukebox -%if ( 0%{?fedora} >= 19 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 +%if ( 0%{?fedora} >= 19 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?suse_version} >= 1220 && 0%{?suse_version} < 1600 ) %define with_njb 1 %if 0%{?mdkver} BuildRequires: %{_lib}njb-devel @@ -221,7 +229,7 @@ BuildRequires: libnjb-devel %endif # VISUAL support -%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if ( 0%{?rhel} >= 4 && 0%{?rhel} <= 9 ) || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_libvisual 1 %if 0%{?mdkver} BuildRequires: %{_lib}visual-devel @@ -565,6 +573,10 @@ fi # Removes '.so' to avoid automatic -devel dependency %__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so +%if 0%{?with_libvisual} == 0 +%__rm -f $RPM_BUILD_ROOT%{tde_mandir}/man1/amarok_libvisual.1* +%endif + # Locales %find_lang %{tde_pkg} diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec index 5535d81f5..d14c72503 100644 --- a/redhat/applications/multimedia/codeine/codeine.spec +++ b/redhat/applications/multimedia/codeine/codeine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg codeine %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec index 4e7579dbe..0ddcdcf41 100644 --- a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec +++ b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg k3b-i18n %define tde_prefix /opt/trinity @@ -393,6 +393,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot}%{tde_datadir}/locale/cs %__rm -rf %{buildroot}%{tde_datadir}/locale/cy %__rm -rf %{buildroot}%{tde_datadir}/locale/en_GB +%__rm -rf %{buildroot}%{tde_datadir}/locale/es_AR %__rm -rf %{buildroot}%{tde_datadir}/locale/eu %__rm -rf %{buildroot}%{tde_datadir}/locale/fa %__rm -rf %{buildroot}%{tde_datadir}/locale/fi diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec index 86b10e545..354901af0 100644 --- a/redhat/applications/multimedia/k3b/k3b.spec +++ b/redhat/applications/multimedia/k3b/k3b.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg k3b %define tde_prefix /opt/trinity @@ -84,7 +84,6 @@ BuildRequires: %{_lib}asound-devel BuildRequires: alsa-lib-devel %endif -BuildRequires: audiofile-devel BuildRequires: gettext BuildRequires: taglib-devel BuildRequires: zlib-devel @@ -139,17 +138,21 @@ Requires(postun): coreutils Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29 +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29 || 0%{?rhel} >= 10 Requires: wodim REquires: genisoimage %else Requires: cdrecord REquires: mkisofs %endif + +# dvd+rw-tools support +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) Requires: dvd+rw-tools +%endif # CDRDAO support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) Requires: cdrdao %endif @@ -273,7 +276,7 @@ BuildRequires: ffmpeg-devel %endif # MUSEPACK -%if 0%{?fedora} == 0 || 0%{?fedora} <= 37 +%if 0%{?fedora} <= 37 && 0%{?rhel} <= 9 # Looking for mpc_decoder_setup in mpcdec - not found %define with_musepack 1 %if 0%{?mdkversion} || 0%{?mgaversion} diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec index 743176af6..b8f3f2448 100644 --- a/redhat/applications/multimedia/k9copy/k9copy.spec +++ b/redhat/applications/multimedia/k9copy/k9copy.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg k9copy %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec index 28fe7fc02..f035a39ec 100644 --- a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec +++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec @@ -19,7 +19,7 @@ %define tde_pkg kaffeine-mozilla %define tde_prefix /opt/trinity %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif # TDE specific building variables diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec index b14ecd110..0b4a2abed 100644 --- a/redhat/applications/multimedia/kaffeine/kaffeine.spec +++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kaffeine %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec index 135a4bd69..670b70fa2 100644 --- a/redhat/applications/multimedia/kmplayer/kmplayer.spec +++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kmplayer %define tde_prefix /opt/trinity @@ -337,7 +337,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video %endif diff --git a/redhat/applications/multimedia/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec index 8325ea14a..e263a6432 100644 --- a/redhat/applications/multimedia/kplayer/kplayer.spec +++ b/redhat/applications/multimedia/kplayer/kplayer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kplayer %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec index 0b6b596a1..e38b4ad93 100644 --- a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg mplayerthumbs %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec index c2f34079e..8eef7280e 100644 --- a/redhat/applications/multimedia/rosegarden/rosegarden.spec +++ b/redhat/applications/multimedia/rosegarden/rosegarden.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg rosegarden %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec index 394fccd42..aed3ac741 100644 --- a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec +++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg soundkonverter %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec index 2c1899459..412e1a05a 100644 --- a/redhat/applications/multimedia/tderadio/tderadio.spec +++ b/redhat/applications/multimedia/tderadio/tderadio.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tderadio %define tde_prefix /opt/trinity @@ -193,7 +193,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner %endif diff --git a/redhat/applications/office/basket/basket.spec b/redhat/applications/office/basket/basket.spec index a5292b68b..c2033e7aa 100644 --- a/redhat/applications/office/basket/basket.spec +++ b/redhat/applications/office/basket/basket.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg basket %define tde_prefix /opt/trinity @@ -143,7 +143,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Extended Clipboard" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility %endif diff --git a/redhat/applications/office/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec index 158214e2c..72069c21f 100644 --- a/redhat/applications/office/kbibtex/kbibtex.spec +++ b/redhat/applications/office/kbibtex/kbibtex.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kbibtex %define tde_prefix /opt/trinity @@ -164,7 +164,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Bibliography Manager" "%{?buildroot}%{tde_tdeappdir}/kbibtex.desktop" TDE Office Database %endif diff --git a/redhat/applications/office/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec index 668aade19..033dee446 100644 --- a/redhat/applications/office/kbookreader/kbookreader.spec +++ b/redhat/applications/office/kbookreader/kbookreader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kbookreader %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbookreader.desktop" Office Viewer %endif diff --git a/redhat/applications/office/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec index 173065957..bc4993c08 100644 --- a/redhat/applications/office/keximdb/keximdb.spec +++ b/redhat/applications/office/keximdb/keximdb.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg keximdb %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/kile/kile.spec b/redhat/applications/office/kile/kile.spec index 1a3831de4..0f2f9027e 100644 --- a/redhat/applications/office/kile/kile.spec +++ b/redhat/applications/office/kile/kile.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kile %define tde_prefix /opt/trinity @@ -190,7 +190,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kile Office WordProcessor %endif diff --git a/redhat/applications/office/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec index 43039385c..990b88cc3 100644 --- a/redhat/applications/office/kmymoney/kmymoney.spec +++ b/redhat/applications/office/kmymoney/kmymoney.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kmymoney %define tde_prefix /opt/trinity @@ -37,9 +37,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# Required for Mageia >= 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.5 @@ -88,11 +85,16 @@ BuildRequires: html2ps BuildRequires: recode # OFX support +%if 0%{?rhel} <= 9 +%define with_libofx 1 +%endif +%if 0%{?with_libofx} %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}ofx-devel %else BuildRequires: libofx-devel %endif +%endif # OPENSP support %if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion} @@ -135,8 +137,10 @@ support. %{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop %{tde_datadir}/servicetypes/kmymoneyplugin.desktop %{tde_libdir}/*.so.* +%if 0%{?with_libofx} %{tde_tdelibdir}/kmm_ofximport.la %{tde_tdelibdir}/kmm_ofximport.so +%endif ########## @@ -155,21 +159,13 @@ have '%{name}' package installed, you will hardly find this package useful. %{tde_datadir}/apps/kmymoney2/ %{tde_datadir}/config.kcfg/kmymoney2.kcfg %{tde_datadir}/icons/hicolor/*/*/*.png -#%dir %{tde_datadir}/icons/Tango/ -#%dir %{tde_datadir}/icons/Tango/*/ -#%dir %{tde_datadir}/icons/Tango/*/*/ -#%{tde_datadir}/icons/Tango/*/*/*.png -#%{tde_datadir}/icons/Tango/scalable/*.svgz %{tde_datadir}/icons/locolor/*/*/*.png -#%dir %{tde_datadir}/icons/oxygen/ -#%dir %{tde_datadir}/icons/oxygen/*/ -#%dir %{tde_datadir}/icons/oxygen/*/*/ -#%{tde_datadir}/icons/oxygen/*/*/*.png -#%{tde_datadir}/icons/oxygen/scalable/*.svgz %{tde_tdedocdir}/HTML/en/kmymoney2/ %{tde_mandir}/man1/kmymoney2.* +%if 0%{?with_libofx} %{tde_datadir}/apps/kmm_ofximport/ %{tde_datadir}/services/kmm_ofximport.desktop +%endif ########## @@ -236,6 +232,7 @@ fi -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ \ -DWITH_ALL_OPTIONS=ON \ + %{!?with_libofx:-DWITH_LIBOFX=OFF} \ \ -DBUILD_ALL=ON \ \ diff --git a/redhat/applications/office/knowit/knowit.spec b/redhat/applications/office/knowit/knowit.spec index 9cf4c959d..c2e34d49b 100644 --- a/redhat/applications/office/knowit/knowit.spec +++ b/redhat/applications/office/knowit/knowit.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg knowit %define tde_prefix /opt/trinity @@ -148,7 +148,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{tde_pkg} Utility Applet X-SuSE-DesktopUtility %endif diff --git a/redhat/applications/office/koffice-i18n/koffice-i18n.spec b/redhat/applications/office/koffice-i18n/koffice-i18n.spec index 1ca8705f1..11adeaa25 100644 --- a/redhat/applications/office/koffice-i18n/koffice-i18n.spec +++ b/redhat/applications/office/koffice-i18n/koffice-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg koffice-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec index 47c1dccb6..12208ccb8 100644 --- a/redhat/applications/office/koffice/koffice.spec +++ b/redhat/applications/office/koffice/koffice.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg koffice %define tde_prefix /opt/trinity @@ -102,12 +102,18 @@ BuildRequires: fontconfig-devel BuildRequires: libart_lgpl-devel BuildRequires: zlib-devel BuildRequires: gettext-devel -BuildRequires: mysql-devel BuildRequires: perl BuildRequires: doxygen BuildRequires: aspell-devel BuildRequires: readline-devel +# MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else +BuildRequires: mysql-devel +%endif + # PCRE2 support %if 0%{?mdkver} BuildRequires: %{_lib}pcre2-devel @@ -149,11 +155,14 @@ BuildRequires: openssl-devel %endif # OPENEXR support +%define with_openexr 0 +%if 0%{?with_openexr} %if 0%{?mdkver} BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif +%endif # TIFF support %if 0%{?mdkver} @@ -185,7 +194,11 @@ BuildRequires: %{python}-devel # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif @@ -232,7 +245,7 @@ BuildRequires: libpng-devel %endif # GRAPHICSMAGICK support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) %define with_graphicsmagick 1 %if 0%{?suse_version} BuildRequires: GraphicsMagick >= 1.1.0 @@ -251,7 +264,7 @@ BuildRequires: GraphicsMagick-devel >= 1.1.0 %endif # UTEMPTER support -%if 0%{?suse_version} && 0%{?suse_version} < 1699 +%if 0%{?suse_version} && 0%{?suse_version} < 1600 BuildRequires: utempter-devel %endif %if 0%{?rhel} == 4 @@ -1075,15 +1088,17 @@ This package is part of the TDE Office Suite. %{tde_tdelibdir}/libchalkgmagickexport.so %{tde_tdelibdir}/libchalkgmagickimport.la %{tde_tdelibdir}/libchalkgmagickimport.so +%endif %{tde_tdelibdir}/libchalkjpegexport.la %{tde_tdelibdir}/libchalkjpegexport.so %{tde_tdelibdir}/libchalkjpegimport.la %{tde_tdelibdir}/libchalkjpegimport.so -%endif +%if 0%{?with_openexr} %{tde_tdelibdir}/libchalk_openexr_export.la %{tde_tdelibdir}/libchalk_openexr_export.so %{tde_tdelibdir}/libchalk_openexr_import.la %{tde_tdelibdir}/libchalk_openexr_import.so +%endif %{tde_tdelibdir}/libchalkpart.la %{tde_tdelibdir}/libchalkpart.so %{tde_tdelibdir}/libchalkpdfimport.la @@ -1094,12 +1109,10 @@ This package is part of the TDE Office Suite. %{tde_tdelibdir}/libchalkpngimport.so %{tde_tdelibdir}/libchalk_raw_import.la %{tde_tdelibdir}/libchalk_raw_import.so -%if 0%{?with_graphicsmagick} %{tde_tdelibdir}/libchalktiffexport.la %{tde_tdelibdir}/libchalktiffexport.so %{tde_tdelibdir}/libchalktiffimport.la %{tde_tdelibdir}/libchalktiffimport.so -%endif %{tde_libdir}/libtdeinit_chalk.so %{tde_libdir}/libchalk_cmyk_*.so.* %{tde_libdir}/libchalkcolor.so.* @@ -1234,7 +1247,7 @@ fi %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kudesigner Office FlowChart %suse_update_desktop_file kivio Office FlowChart %suse_update_desktop_file kchart Office FlowChart diff --git a/redhat/applications/office/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec index cfaab1cde..882ca67fe 100644 --- a/redhat/applications/office/kpilot/kpilot.spec +++ b/redhat/applications/office/kpilot/kpilot.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kpilot %define tde_prefix /opt/trinity @@ -183,7 +183,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{tde_includedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/ # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kpilot.desktop Utility PDA SyncUtility X-KDE-Utilities-Peripherals %suse_update_desktop_file -u -r %{?buildroot}%{tde_tdeappdir}/kpalmdoc.desktop Utility PDA X-TDE-Utilities-File %endif diff --git a/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec b/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec index fe2881236..afa01db80 100644 --- a/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec +++ b/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-ebook-reader %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec index bfe74e656..6f54b47da 100644 --- a/redhat/applications/office/tellico/tellico.spec +++ b/redhat/applications/office/tellico/tellico.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tellico %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/kima/kima.spec b/redhat/applications/settings/kima/kima.spec index 008defd38..2371631d5 100644 --- a/redhat/applications/settings/kima/kima.spec +++ b/redhat/applications/settings/kima/kima.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kima %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec index 4b41f0ec8..85ad76ac6 100644 --- a/redhat/applications/settings/kiosktool/kiosktool.spec +++ b/redhat/applications/settings/kiosktool/kiosktool.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kiosktool %define tde_prefix /opt/trinity @@ -165,7 +165,7 @@ EOF # Updates applications categories for openSUSE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System SystemSetup %endif diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec index 149714cf9..ad2da69f5 100644 --- a/redhat/applications/settings/kkbswitch/kkbswitch.spec +++ b/redhat/applications/settings/kkbswitch/kkbswitch.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity @@ -176,7 +176,7 @@ if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System TrayIcon %endif diff --git a/redhat/applications/settings/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec index 3d5a65f1b..6766a57c6 100644 --- a/redhat/applications/settings/klcddimmer/klcddimmer.spec +++ b/redhat/applications/settings/klcddimmer/klcddimmer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg klcddimmer %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index c4ce51382..9828d3cb6 100644 --- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec +++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kmyfirewall %define tde_prefix /opt/trinity @@ -225,7 +225,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{tde_pkg}" System Network %endif diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index c01cd0e4e..5b8235ad7 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-guidance %define tde_prefix /opt/trinity @@ -99,7 +99,7 @@ BuildRequires: trinity-pytqt-tools # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec index 3c2c768a3..dd1a0fa8a 100644 --- a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec +++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-systemsettings %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/tdealternatives/tdealternatives.spec b/redhat/applications/settings/tdealternatives/tdealternatives.spec index 8a451b126..7c1b5446f 100644 --- a/redhat/applications/settings/tdealternatives/tdealternatives.spec +++ b/redhat/applications/settings/tdealternatives/tdealternatives.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdealternatives %define tde_prefix /opt/trinity @@ -113,16 +113,14 @@ fi -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWITH_GCC_VISIBILITY=OFF \ + -DWITH_GCC_VISIBILITY=ON \ \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - -DWITH_ALL_OPTIONS=ON \ - -DWITH_GCC_VISIBILITY=ON \ - \ -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ -DWITH_DISTRIBUTION_RPM=ON \ \ .. diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec index a0ced6807..f4c901415 100644 --- a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdenetworkmanager %define tde_prefix /opt/trinity @@ -263,7 +263,7 @@ fi %__make install DESTDIR=%{?buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet %endif diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec index 23a6eb40a..acd876c35 100644 --- a/redhat/applications/settings/tdesudo/tdesudo.spec +++ b/redhat/applications/settings/tdesudo/tdesudo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdesudo %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec index 18078908e..16cb9ed35 100644 --- a/redhat/applications/settings/wlassistant/wlassistant.spec +++ b/redhat/applications/settings/wlassistant/wlassistant.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg wlassistant %define tde_prefix /opt/trinity @@ -183,7 +183,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network %endif diff --git a/redhat/applications/system/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec index 648395e22..e49b41b63 100644 --- a/redhat/applications/system/dolphin/dolphin.spec +++ b/redhat/applications/system/dolphin/dolphin.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg dolphin %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/katapult/katapult.spec b/redhat/applications/system/katapult/katapult.spec index 5364e67bd..9c6520b48 100644 --- a/redhat/applications/system/katapult/katapult.spec +++ b/redhat/applications/system/katapult/katapult.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg katapult %define tde_prefix /opt/trinity @@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}" # Fix desktop files (openSUSE only) echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Application Launcher" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility %endif diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec index 48d7811fd..9d0804f57 100644 --- a/redhat/applications/system/kbfx/kbfx.spec +++ b/redhat/applications/system/kbfx/kbfx.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kbfx %define tde_prefix /opt/trinity @@ -189,7 +189,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build VERBOSE=1 # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "KBFX Configuration Utility" kbfxconfigapp -r KDE Utility DesktopUtility %suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop %suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop diff --git a/redhat/applications/system/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec index e1be1cf08..e7aa00d1d 100644 --- a/redhat/applications/system/kcmautostart/kcmautostart.spec +++ b/redhat/applications/system/kcmautostart/kcmautostart.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kcmautostart %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec index 3fdbedaa2..514772030 100644 --- a/redhat/applications/system/kdbusnotification/kdbusnotification.spec +++ b/redhat/applications/system/kdbusnotification/kdbusnotification.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kdbusnotification %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec index 441673249..92718e09f 100644 --- a/redhat/applications/system/klamav/klamav.spec +++ b/redhat/applications/system/klamav/klamav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg klamav %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec index 93f583e7a..4783492a7 100644 --- a/redhat/applications/system/knemo/knemo.spec +++ b/redhat/applications/system/knemo/knemo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg knemo %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec index 96bfd45ed..b10d0d876 100644 --- a/redhat/applications/system/knetload/knetload.spec +++ b/redhat/applications/system/knetload/knetload.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg knetload %define tde_prefix /opt/trinity @@ -160,7 +160,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{tde_pkg} System Monitor %endif diff --git a/redhat/applications/system/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec index 89b7bb713..cb0be10b4 100644 --- a/redhat/applications/system/knetstats/knetstats.spec +++ b/redhat/applications/system/knetstats/knetstats.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg knetstats %define tde_prefix /opt/trinity @@ -155,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{tde_pkg} System Monitor %endif diff --git a/redhat/applications/system/kooldock/kooldock.spec b/redhat/applications/system/kooldock/kooldock.spec index 24902487a..ed2e8af2a 100644 --- a/redhat/applications/system/kooldock/kooldock.spec +++ b/redhat/applications/system/kooldock/kooldock.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kooldock %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec index 847ac5346..afb27d894 100644 --- a/redhat/applications/system/krusader/krusader.spec +++ b/redhat/applications/system/krusader/krusader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg krusader %define tde_prefix /opt/trinity @@ -147,7 +147,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %suse_update_desktop_file krusader System FileManager %suse_update_desktop_file krusader_root-mode System FileManager diff --git a/redhat/applications/system/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec index 4f1647c81..9444e6b59 100644 --- a/redhat/applications/system/kshutdown/kshutdown.spec +++ b/redhat/applications/system/kshutdown/kshutdown.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kshutdown %define tde_prefix /opt/trinity @@ -160,7 +160,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop" %suse_update_desktop_file %{tde_pkg} Utility DesktopUtility %endif diff --git a/redhat/applications/system/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec index 7696f360a..b409f7c1d 100644 --- a/redhat/applications/system/ksystemlog/ksystemlog.spec +++ b/redhat/applications/system/ksystemlog/ksystemlog.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg ksystemlog %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec index 22f52c17b..30ec471b5 100644 --- a/redhat/applications/system/kvkbd/kvkbd.spec +++ b/redhat/applications/system/kvkbd/kvkbd.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kvkbd %define tde_prefix /opt/trinity @@ -155,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r kvkbd Utility Accessibility %endif diff --git a/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec index 693f1f064..eb45042cf 100644 --- a/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec +++ b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg polkit-agent-tde %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec index e807face8..896252109 100644 --- a/redhat/applications/system/smartcardauth/smartcardauth.spec +++ b/redhat/applications/system/smartcardauth/smartcardauth.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg smartcardauth %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/tastymenu/tastymenu.spec b/redhat/applications/system/tastymenu/tastymenu.spec index 7090e089d..71537ac3e 100644 --- a/redhat/applications/system/tastymenu/tastymenu.spec +++ b/redhat/applications/system/tastymenu/tastymenu.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tastymenu %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/tdebluez/tdebluez.spec b/redhat/applications/system/tdebluez/tdebluez.spec index b89642529..8aa137873 100644 --- a/redhat/applications/system/tdebluez/tdebluez.spec +++ b/redhat/applications/system/tdebluez/tdebluez.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdebluez %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec index d56c73e1b..bf540686b 100644 --- a/redhat/applications/system/tdedocker/tdedocker.spec +++ b/redhat/applications/system/tdedocker/tdedocker.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdedocker %define tde_prefix /opt/trinity @@ -184,7 +184,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdedocker.desktop Utility DesktopUtility %endif diff --git a/redhat/applications/system/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec index 4af8a839e..3f4585fd9 100644 --- a/redhat/applications/system/tdepowersave/tdepowersave.spec +++ b/redhat/applications/system/tdepowersave/tdepowersave.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdepowersave %define tde_prefix /opt/trinity @@ -97,7 +97,7 @@ BuildRequires: libudev-devel # Disabled on RHEL4 # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?rhel} == 5 BuildRequires: xorg-x11-proto-devel @@ -268,7 +268,6 @@ fi %lang(en) %{tde_tdedocdir}/HTML/en/tdepowersave/ %lang(fi) %{tde_tdedocdir}/HTML/fi/tdepowersave/ %lang(hu) %{tde_tdedocdir}/HTML/hu/tdepowersave/ -%lang(nb) %dir %{tde_tdedocdir}/HTML/nb %lang(nb) %{tde_tdedocdir}/HTML/nb/tdepowersave/ diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec index fe4876756..4f7057001 100644 --- a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec +++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdesshaskpass %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/xdg-desktop-portal-tde/xdg-desktop-portal-tde.spec b/redhat/applications/system/xdg-desktop-portal-tde/xdg-desktop-portal-tde.spec new file mode 100644 index 000000000..82ec3f500 --- /dev/null +++ b/redhat/applications/system/xdg-desktop-portal-tde/xdg-desktop-portal-tde.spec @@ -0,0 +1,146 @@ +# +# spec file for package xdg-desktop-portal-tde (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.5 +%endif +%define tde_pkg xdg-desktop-portal-tde +%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: 0.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: An implementation of the FreeDesktop Portals API for TDE +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: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# 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 +Exposes TDE APIs to applications which use the Portals API. +As a result, these applications can transparently use native TDE APIs and dialogs. + +########## + +%if 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 \ + -DWITH_GCC_VISIBILITY=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,-) +%{tde_tdelibdir}/libexec/xdg-desktop-portal-tde +%{tde_tdeappdir}/xdg-desktop-portal-tde.desktop +%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.tde.service +%{_datadir}/xdg-desktop-portal/portals/tde.portal +%{_datadir}/xdg-desktop-portal/tde-portals.conf + + +%changelog diff --git a/redhat/applications/system/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec index 6b638cddc..191435537 100644 --- a/redhat/applications/system/yakuake/yakuake.spec +++ b/redhat/applications/system/yakuake/yakuake.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg yakuake %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec index 12725cf80..865b88834 100644 --- a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec +++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-appinfo %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec index 5f2bdb681..ff455c2e8 100644 --- a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec +++ b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-apt %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec index 9986a073d..52e9e0dff 100644 --- a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-ftps %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec index 382d3914c..0f2f781ea 100644 --- a/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec +++ b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-gopher %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec index 48c64c00f..6c82ad625 100644 --- a/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec +++ b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-locate %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec index ef9e5258e..ac58ddc34 100644 --- a/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec +++ b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-sword %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec index 1b5891279..d286dff41 100644 --- a/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec +++ b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-umountwrapper %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec index 43d96bfb9..688150d5e 100644 --- a/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec +++ b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg gtk-qt-engine %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec index 49f9915a8..72214053e 100644 --- a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec +++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg gtk3-tqt-engine %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec index b1072adbb..ca8cf9680 100644 --- a/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec +++ b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kgtk-qt3 %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec index e4c0e3d0e..91412e637 100644 --- a/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec +++ b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg ksplash-engine-moodin %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec index 3250b0ea3..987292123 100644 --- a/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec +++ b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg qt4-tqt-theme-engine %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec index 58bcf6e79..af82b6367 100644 --- a/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec +++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-baghira %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/tde-style-domino/tde-style-domino.spec b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec index 825133991..ae62d271c 100644 --- a/redhat/applications/themes/tde-style-domino/tde-style-domino.spec +++ b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-domino %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec index 7d7f64183..a7399d6bd 100644 --- a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec +++ b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-ia-ora %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec index 434e5ef6d..a663ee74f 100644 --- a/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec +++ b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-lipstik %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec index fa5454887..3c8978421 100644 --- a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec +++ b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-polyester %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec index f090b2ae4..1855c89d5 100644 --- a/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec +++ b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-qtcurve %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/tdmtheme/tdmtheme.spec b/redhat/applications/themes/tdmtheme/tdmtheme.spec index f7f03201a..ea7b092c3 100644 --- a/redhat/applications/themes/tdmtheme/tdmtheme.spec +++ b/redhat/applications/themes/tdmtheme/tdmtheme.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdmtheme %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec index 630461d79..5824a0cec 100644 --- a/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec +++ b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-crystal %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec index dfcfa8ab3..9817a1a3e 100644 --- a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec +++ b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-dekorator %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec index 904223021..0b3ed6ac9 100644 --- a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec +++ b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-fahrenheit %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec index 900bb506c..fca87ced8 100644 --- a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec +++ b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-machbunt %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec b/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec index 01526d34e..34bf2a4b2 100644 --- a/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec +++ b/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-mallory %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec index fa18a3075..f91e549fc 100644 --- a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec +++ b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-suse2 %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec index 636ba5f6b..e6e6e0fe8 100644 --- a/redhat/applications/utilities/abakus/abakus.spec +++ b/redhat/applications/utilities/abakus/abakus.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg abakus %define tde_prefix /opt/trinity @@ -160,7 +160,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/abakus.desktop" Utility Calculator %endif diff --git a/redhat/applications/utilities/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec index b6c9ec19d..2bb64f4ea 100644 --- a/redhat/applications/utilities/filelight/filelight.spec +++ b/redhat/applications/utilities/filelight/filelight.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg filelight %define tde_prefix /opt/trinity @@ -168,7 +168,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/filelight.desktop FileManager %endif diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec index b59b70835..1bf1af63d 100644 --- a/redhat/applications/utilities/kbarcode/kbarcode.spec +++ b/redhat/applications/utilities/kbarcode/kbarcode.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kbarcode %define tde_prefix /opt/trinity @@ -218,7 +218,7 @@ export PATH="%{tde_bindir}:${PATH}" %__sed -i "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" -e "s|Icon=.*|Icon=kbarcode|" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" Utility PrintingUtility %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-batch.desktop" Utility PrintingUtility %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-editor.desktop" Utility PrintingUtility diff --git a/redhat/applications/utilities/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec index ae46ada21..1d6f39e9b 100644 --- a/redhat/applications/utilities/kchmviewer/kchmviewer.spec +++ b/redhat/applications/utilities/kchmviewer/kchmviewer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kchmviewer %define tde_prefix /opt/trinity @@ -190,7 +190,7 @@ fi # Updates applications categories for openSUSE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Compressed HTML Viewer" kchmviewer Office Viewer %endif diff --git a/redhat/applications/utilities/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec index 15466b6ee..411554323 100644 --- a/redhat/applications/utilities/kcpuload/kcpuload.spec +++ b/redhat/applications/utilities/kcpuload/kcpuload.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kcpuload %define tde_prefix /opt/trinity @@ -153,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}" # Fix desktop files (openSUSE only) echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System Monitor %endif diff --git a/redhat/applications/utilities/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec index d2dfdb333..01f7b35ae 100644 --- a/redhat/applications/utilities/kdirstat/kdirstat.spec +++ b/redhat/applications/utilities/kdirstat/kdirstat.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kdirstat %define tde_prefix /opt/trinity @@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" Filesystem %endif diff --git a/redhat/applications/utilities/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec index 371bea26b..9b2b08137 100644 --- a/redhat/applications/utilities/keep/keep.spec +++ b/redhat/applications/utilities/keep/keep.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg keep %define tde_prefix /opt/trinity @@ -162,7 +162,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/keep.desktop" System Backup %endif diff --git a/redhat/applications/utilities/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec index c226eeeb0..c54ba9a48 100644 --- a/redhat/applications/utilities/knutclient/knutclient.spec +++ b/redhat/applications/utilities/knutclient/knutclient.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg knutclient %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/kommando/kommando.spec b/redhat/applications/utilities/kommando/kommando.spec index eb68f76fa..8f248a69a 100644 --- a/redhat/applications/utilities/kommando/kommando.spec +++ b/redhat/applications/utilities/kommando/kommando.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kommando %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec index 6bafb034c..da5a2644b 100644 --- a/redhat/applications/utilities/kompose/kompose.spec +++ b/redhat/applications/utilities/kompose/kompose.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kompose %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec index d6b5d9442..e381bd4bf 100644 --- a/redhat/applications/utilities/krename/krename.spec +++ b/redhat/applications/utilities/krename/krename.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg krename %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file krename System FileManager %suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop %suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop diff --git a/redhat/applications/utilities/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec index 214bd0add..679f5ca13 100644 --- a/redhat/applications/utilities/ksensors/ksensors.spec +++ b/redhat/applications/utilities/ksensors/ksensors.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg ksensors %define tde_prefix /opt/trinity @@ -157,7 +157,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Sensors Frontend" %{tde_pkg} System Monitor %endif diff --git a/redhat/applications/utilities/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec index 2c7cba4d6..07924e461 100644 --- a/redhat/applications/utilities/mathemagics/mathemagics.spec +++ b/redhat/applications/utilities/mathemagics/mathemagics.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg mathemagics %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec index f695029a0..542d92b7b 100644 --- a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg qalculate-tde %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang qalculate_tde # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file qalculate_tde -r TDE Utility Calculator %endif diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 9d7aeb3bd..e6351d336 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -6,7 +6,7 @@ PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" PATH="$(cd $(dirname $0); pwd):${PATH}" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh index 2cc3eccd7..279db3238 100755 --- a/redhat/build/configure_repository.sh +++ b/redhat/build/configure_repository.sh @@ -1,6 +1,6 @@ #!/bin/bash -TDE_VERSION="${1:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${1:-${TDE_VERSION:-14.1.5}}" ARCH=$(rpm -E %_target_cpu) RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index bfe5a2f55..78c457cbf 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -5,7 +5,7 @@ PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" DIST="$(rpmdist.sh --dist)" @@ -41,7 +41,7 @@ if [ -d "${PATCHDIR}" ]; then fi fi -if [ "${DIST}" = ".fc41" ] || [ "${DIST}" = ".fc42" ] || [ "${DIST}" = ".fc43" ] || [ "${DIST}" = ".mga9" ] || [ "${DIST:0:4}" = ".omv" ] || [ "${DIST}" = ".osstw" ] || [ "${DIST:0:6}" = ".pclos" ]; then +if [ "${DIST}" = ".fc41" ] || [ "${DIST}" = ".fc42" ] || [ "${DIST}" = ".fc43" ] || [ "${DIST}" = ".mga9" ] || [ "${DIST:0:4}" = ".omv" ] || [ "${DIST}" = ".oss160" ] || [ "${DIST}" = ".osstw" ] || [ "${DIST:0:6}" = ".pclos" ]; then sed -i "${TARGETDIR}/"*".spec" \ -e "s|%patch|%patch -P |g" fi diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh index 45af7de56..e89bea2f9 100755 --- a/redhat/build/get_installed_package_version.sh +++ b/redhat/build/get_installed_package_version.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Sample package name: trinity-tdelibs-14.1.4-0_pre727+6be06b3d.mga3.opt +# Sample package name: trinity-tdelibs-14.1.x-0_pre727+6be06b3d.mga3.opt PKGNAME="${1##*/}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh index 89db815da..5a3965d09 100755 --- a/redhat/build/get_latest_built_package_filename.sh +++ b/redhat/build/get_latest_built_package_filename.sh @@ -2,7 +2,7 @@ PKGNAME="$1" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})" RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)" diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh index ed4e2ba13..09623fb2d 100755 --- a/redhat/build/get_latest_built_package_version.sh +++ b/redhat/build/get_latest_built_package_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="$1" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index 492507847..b92ef69f7 100755 --- a/redhat/build/get_latest_tarball_filename.sh +++ b/redhat/build/get_latest_tarball_filename.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/ diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh index 829d0cd0d..9e9911b3d 100755 --- a/redhat/build/get_latest_tarball_version.sh +++ b/redhat/build/get_latest_tarball_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 70ab03468..415bdba9f 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -20,7 +20,7 @@ case "${PKGNAME}" in # In case prefix is already there, don't add it again. "trinity-"*) PREFIX="";; # Most TDE dependencies have no prefix - "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"polkit-tqt"|"pytqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";; + "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"polkit-tqt"|"pytqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";; # 3rd party dependencies "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"libheimdal"|"mp4v2"|"pinentry-tqt"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; # Extra build stuff @@ -63,7 +63,7 @@ case "${PKGNAME}" in "tqscintilla") PKGRUNTIME="${lib}tqscintilla7";; "tqca") PKGRUNTIME="${lib}tqca1";; "tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";; - "tqt3") PKGRUNTIME="${lib}tqt3-mt";; + "tqt"|"tqt3") PKGRUNTIME="${lib}tqt3-mt";; "tqtinterface") PKGRUNTIME="${lib}tqt4";; "trinity-desktop") PKGRUNTIME="${PKGNAME}-all";; "yaz") PKGRUNTIME="${lib}yaz";; @@ -116,7 +116,7 @@ if [ -n "${DEVEL}" ]; then "polkit-tqt") PKGDEVEL="${lib}polkit-tqt-devel";; "tqca") PKGDEVEL="${lib}tqca-devel";; "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";; - "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";; + "tqt"|"tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";; "yaz") PKGDEVEL="${lib}yaz-devel";; # Default case: development package has same name as runtime package, plus '-devel' suffix. *) PKGDEVEL="${PKGRUNTIME}-devel";; diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index 9b21b6edf..ed3ffc0c5 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" DIST="$3" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh index f7bed72ee..7c1b65cc8 100755 --- a/redhat/build/get_spec_version.sh +++ b/redhat/build/get_spec_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh index cc92c2e87..39d6bdbb2 100755 --- a/redhat/build/get_specfile.sh +++ b/redhat/build/get_specfile.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh index 4ca712484..5271c31ec 100755 --- a/redhat/build/is_latest_package_built.sh +++ b/redhat/build/is_latest_package_built.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" BUILT="$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})" TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})" diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh index cab59d096..6849d13d4 100755 --- a/redhat/build/is_latest_package_installed.sh +++ b/redhat/build/is_latest_package_installed.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION}) TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION}) diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh index 48aa64db8..3653321d6 100755 --- a/redhat/build/rpmdist.sh +++ b/redhat/build/rpmdist.sh @@ -24,9 +24,10 @@ case $a in DIST=".mdv${d}" MDKVERSION="201100" ;; + # AlmaLinux release 10.0 (Purple Lion) # CentOS release 5.7 (Final) # CentOS Linux release 6.0 (Final) - CentOS*|Rocky*) + AlmaLinux*|CentOS*|Rocky*) if [ $c = "release" ]; then RHEL="${d%%.*}"; DIST=".el${RHEL}" else diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh index 4670285f5..ff9b9f30d 100755 --- a/redhat/build/update_repository.sh +++ b/redhat/build/update_repository.sh @@ -1,7 +1,7 @@ #!/bin/bash WORKERS=$(getconf _NPROCESSORS_ONLN) -TDE_VERSION="${2:-${TDE_VERSION:-14.1.4}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.5}}" LOCKFILE="/tmp/lock.${0##*/}" while [ -e "${LOCKFILE}" ]; do @@ -25,14 +25,14 @@ fi if [ -x /usr/sbin/urpmi ]; then REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)' 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)' + REPOUPDATE='(cd ${RPMDIR}; rm -fr {${ARCH},noarch}/.repodata; ${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}; rm -rf */.repodata; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)' + REPOUPDATE='(cd ${RPMDIR}; rm -rf */.repodata; rm -fr {${ARCH},noarch}/.repodata; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; 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*")' + REPOUPDATE='(cd ${RPMDIR}; rm -fr {${ARCH},noarch}/.repodata; ${createrepo} ${ARCH} & ${createrepo} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' else - REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' + REPOUPDATE='(cd ${RPMDIR}; rm -fr {${ARCH},noarch}/.repodata; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' fi elif [ -x /usr/bin/apt-get ]; then REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir --topdir=$PWD i586 x86_64 noarch; sudo apt-get update)' diff --git a/redhat/core/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec index 0ad0405bf..c8d84b8b5 100644 --- a/redhat/core/tde-i18n/tde-i18n.spec +++ b/redhat/core/tde-i18n/tde-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-i18n %define tde_prefix /opt/trinity diff --git a/redhat/core/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec index a4aa14850..c997fc0c6 100644 --- a/redhat/core/tdeaccessibility/tdeaccessibility.spec +++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeaccessibility %define tde_prefix /opt/trinity @@ -82,7 +82,13 @@ BuildRequires: brp-check-trinity %endif # AUDIOFILE support +%if 0%{?rhel} >= 10 +%else +%define with_audiofile 1 +%endif +%if 0%{?with_audiofile} BuildRequires: audiofile-devel +%endif # AKODE support %define with_akode 1 @@ -505,7 +511,7 @@ popd %__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r kmag Utility Accessibility %suse_update_desktop_file kmousetool Utility Accessibility %suse_update_desktop_file kmouth Utility Accessibility diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec index 3ace7fea1..7e8b40ad6 100644 --- a/redhat/core/tdeaddons/tdeaddons.spec +++ b/redhat/core/tdeaddons/tdeaddons.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeaddons %define tde_prefix /opt/trinity @@ -777,7 +777,7 @@ export PATH="%{tde_bindir}:${PATH}" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file atlantikdesigner Game BoardGame %suse_update_desktop_file -r ksig Network Email %endif diff --git a/redhat/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec index 26dbd84d2..fde9f070d 100644 --- a/redhat/core/tdeadmin/tdeadmin.spec +++ b/redhat/core/tdeadmin/tdeadmin.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeadmin %define tde_prefix /opt/trinity @@ -286,10 +286,10 @@ Group: System/GUI/Other %if 0%{?with_consolehelper} # package 'usermode' provides '/usr/bin/consolehelper-gtk' -%if 0%{?rhel} || 0%{?fedora} +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?fedora} Requires: usermode-gtk %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 10 Requires: usermode %endif %endif @@ -465,7 +465,7 @@ done %endif # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kdat System Backup %suse_update_desktop_file kpackage System PackageManager %suse_update_desktop_file kcron System ServiceConfiguration diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec index fcd26df2d..4e561a097 100644 --- a/redhat/core/tdeartwork/tdeartwork.spec +++ b/redhat/core/tdeartwork/tdeartwork.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeartwork %define tde_prefix /opt/trinity @@ -110,7 +110,7 @@ BuildRequires: libart_lgpl-devel # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -159,9 +159,12 @@ BuildRequires: xscreensaver-gl %if 0%{?mgaversion} || 0%{?mdkversion} %define jack_devel %{_lib}jack-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?fedora} %define jack_devel jack-audio-connection-kit-devel %endif +%if 0%{?rhel} >= 10 +%define jack_devel pipewire-jack-audio-connection-kit-devel +%endif %if 0%{?suse_version} %define jack_devel libjack-devel %endif diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.el10 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el10 new file mode 120000 index 000000000..dab729b22 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el10 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.el7
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.el10 b/redhat/core/tdebase/pamd.kdm-trinity-np.el10 new file mode 120000 index 000000000..3415e7d55 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el10 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.el7
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.el10 b/redhat/core/tdebase/pamd.kdm-trinity.el10 new file mode 120000 index 000000000..f85413ec6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.el10 @@ -0,0 +1 @@ +pamd.kdm-trinity.el7
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.el10 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el10 new file mode 120000 index 000000000..a5fab9e3e --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el10 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.el7
\ No newline at end of file diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index 1c6265fd0..9e9274e9c 100644 --- a/redhat/core/tdebase/tdebase.spec +++ b/redhat/core/tdebase/tdebase.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdebase %define tde_prefix /opt/trinity @@ -93,7 +93,7 @@ Source7: xdm%{?dist} # audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te # audit2allow -i /tmp/file -M tdm.fc17 -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1600 %define with_selinux_policy 1 Source8: tdm%{?dist}.te %endif @@ -130,18 +130,17 @@ BuildRequires: brp-check-trinity # Fedora Theme %if 0%{?fedora} -%if 0%{?fedora} >= 42 -Requires: f41-backgrounds-base -%else -Requires: f%{?fedora}-backgrounds-base -%endif -%if 0%{?fedora} >= 39 -%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/f%{?fedora}-01-day.png -%else -%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/standard/%{?fedora}.png -%endif +Requires: desktop-backgrounds-compat +%define tde_bg /usr/share/backgrounds/default.png Requires: fedora-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png + +# Starting with Fedora 42, the default background is provided in JXL format, not PNG. +# We need to convert it during package build, since TDE does not support JXL. +%if 0%{?fedora} >= 42 +BuildRequires: desktop-backgrounds-compat +BuildRequires: ImageMagick +%endif %endif # RHEL 4 Theme @@ -175,16 +174,25 @@ Requires: redhat-logos # RHEL 8 Theme %if 0%{?rhel} == 8 -Requires: redhat-logos -%define tde_bg /usr/share/backgrounds/c8/default/normalish/c8.png +Requires: system-backgrounds +Requires: system-logos +%define tde_bg /usr/share/backgrounds/default.jpg %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png %endif # RHEL 9 Theme %if 0%{?rhel} == 9 -#Requires: redhat-backgrounds -Requires: redhat-logos -%define tde_bg /usr/share/backgrounds/rocky-default-9-abstract-1-day.png +Requires: system-backgrounds +Requires: system-logos +%define tde_bg /usr/share/backgrounds/default.png +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png +%endif + +# RHEL 10 Theme +%if 0%{?rhel} == 10 +Requires: system-backgrounds +Requires: system-logos +%define tde_bg /usr/share/backgrounds/default.png %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png %endif @@ -214,18 +222,10 @@ Requires: desktop-common-data %define tde_starticon /usr/share/icons/pclinuxos.png %endif -# OpenSuse 15.x Theme -%if "%{?suse_version}" == "1500" -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 -%if "%{?suse_version}" == "1699" +# OpenSuse 15.x (and later) Theme +%if 0%{?suse_version} >= 1500 Requires: wallpaper-branding -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/default.png Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -251,7 +251,13 @@ Requires: openssl %endif # AUDIOFILE support +%if 0%{?rhel} >= 10 +%else +%define with_audiofile 1 +%endif +%if 0%{?with_audiofile} BuildRequires: audiofile-devel +%endif # ALSA supportl %if 0%{?mdkver} >= 5000000 @@ -283,7 +289,7 @@ BuildRequires: %{libvorbis_devel} BuildRequires: glib2-devel # PCRE support -%if 0%{?suse_version} == 0 +%if 0%{?suse_version} == 0 && 0%{?rhel} <= 9 BuildRequires: pcre-devel %endif @@ -314,7 +320,7 @@ BuildRequires: pam-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else -%if 0%{?fedora} >= 37 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else @@ -407,15 +413,16 @@ BuildRequires: hal-devel >= 0.5 %endif # OPENEXR support -# Disabled on RHEL4 +#define with_openexr 1 +%if 0%{?with_openexr} %if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version} -%define with_exr 1 %if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif %endif +%endif # XSCREENSAVER support # RHEL 4: disabled @@ -424,7 +431,7 @@ BuildRequires: OpenEXR-devel # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -516,7 +523,7 @@ BuildRequires: libsmbclient-devel %endif # IMAKE -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1220 +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1220 BuildRequires: imake %endif @@ -642,11 +649,17 @@ BuildRequires: libr-devel >= 0.6.0 %if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 || 0%{?pclinuxos} BuildRequires: libtirpc-devel BuildRequires: rpcgen -%if 0%{?fedora} +%endif + +# NSL support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28 BuildRequires: libnsl2-devel -%else +%endif +%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1600 BuildRequires: libnsl-devel %endif +%if 0%{?mdkver} || 0%{?mgaversion} +BuildRequires: %{_lib}nsl-devel %endif # ATTR support @@ -658,9 +671,11 @@ BuildRequires: libnsl-devel BuildRequires: %{libattr_devel} # SELINUX support -%if 0%{?rhel} >= 6 || 0%{?fedora} +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} >= 1600 BuildRequires: checkpolicy BuildRequires: selinux-policy-devel +# Require the 'semanage' utility +Requires: policycoreutils-python-utils %endif # LIBSSH support @@ -1300,10 +1315,12 @@ Group: System/GUI/Other Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pam %if 0%{?rhel} >= 7 -Requires: xorg-x11-server-Xorg -Requires: xorg-x11-drv-evdev Requires: dejavu-sans-fonts %endif +%if 0%{?rhel} >= 7 && 0%{?rhel} <= 9 +Requires: xorg-x11-drv-evdev +Requires: xorg-x11-server-Xorg +%endif Provides: tdebase-bin = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: tdebase-bin < %{?epoch:%{epoch}:}%{version}-%{release} @@ -1929,7 +1946,7 @@ group. %{tde_tdedocdir}/HTML/en/tdeioslave/ %{tde_mandir}/man1/ktrash.1* %{tde_mandir}/man1/tdeio_media_mounthelper.1* -%if 0%{?with_exr} +%if 0%{?with_openexr} %{tde_tdelibdir}/exrthumbnail.la %{tde_tdelibdir}/exrthumbnail.so %{tde_datadir}/services/exrthumbnail.desktop @@ -2136,7 +2153,7 @@ Requires: xorg-x11 %if 0%{?suse_version} >= 1220 Requires: xdm %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 0 ) || 0%{?fedora} Requires: xorg-x11-xinit %endif @@ -2185,9 +2202,6 @@ already. Most users won't need this. %{tdm_datadir}/sessions/*.desktop %{tdm_datadir}/themes/ %config(noreplace) %{tde_confdir}/%{tdm} -%if 0%{?with_selinux_policy} -%exclude %{tde_confdir}/%{tdm}/tdm.pp -%endif %{tde_tdedocdir}/HTML/en/%{tdm}/ %if 0%{?suse_version} == 0 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity @@ -2216,7 +2230,7 @@ already. Most users won't need this. %if 0%{?suse_version} >= 1210 /usr/lib/X11/displaymanagers/ %endif -%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?pclinuxos} || 0%{?rhel} >= 7 +%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?suse_version} >= 1600 || 0%{?pclinuxos} || 0%{?rhel} >= 7 /usr/lib/systemd/system/tdm.service %endif %if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} @@ -2229,11 +2243,6 @@ already. Most users won't need this. %{_datadir}/X11/dm.d/45TDE.conf %endif -# SELINUX policy -%if 0%{?with_selinux_policy} -%config %{tde_confdir}/%{tdm}/tdm.pp -%endif - # Logrotate configuration %config %{_sysconfdir}/logrotate.d/trinity-tdm @@ -2266,16 +2275,11 @@ fi %make_session %endif -# SELINUX context for tdm %if 0%{?with_selinux_policy} +# SELINUX context for tdm /usr/sbin/semodule -i "%{tde_confdir}/%{tdm}/tdm.pp" -%endif - -%if 0%{?fedora} == 21 || 0%{?rhel} >= 7 -if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then - echo "%{tde_bindir}/tdm -- system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local" - restorecon "%{tde_bindir}/tdm" -fi +semanage fcontext -a -t xdm_exec_t "%{tde_bindir}/tdm" +restorecon "%{tde_bindir}/tdm" %endif # Sets default user icon in TDM @@ -2291,13 +2295,15 @@ if [ "$1" = "1" ]; then fi fi +%if 0%{?suse_version} # openSUSE 11.4 tdm's startup script if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm" fi +%endif -# openSUSE 15.0 alternatives %if 0%{?suse_version} >= 1500 +# openSUSE 15.0 alternatives update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager default-displaymanager /usr/lib/X11/displaymanagers/tdm 30 || : %endif @@ -2313,6 +2319,11 @@ fi %make_session %endif +%if 0%{?with_selinux_policy} +# SELINUX context for tdm +/usr/sbin/semodule -R "tdm" +%endif + # openSUSE 15.0 alternatives %if 0%{?suse_version} >= 1500 if [ "$1" = "0" ]; then @@ -2930,6 +2941,9 @@ TDE will start, but many good defaults will not be set. %{tde_datadir}/apps/tdeconf_update/move_session_config.sh %{tde_datadir}/apps/ksmserver/ %{tde_mandir}/man1/starttde.1* +%if 0%{?fedora} >= 42 +%{_datadir}/backgrounds/default.png +%endif %post -n trinity-ksmserver # openSUSE 15.0 alternatives @@ -2937,6 +2951,28 @@ TDE will start, but many good defaults will not be set. update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || : %endif +%if 0%{?rhel} >= 8 +if [ ! -r "[% tde_bg %]" ]; then + # Update wallpaper at install time, if required + # AlmaLinux 8 / AlmaLinux 9 + if [ -r "/usr/share/backgrounds/Alma-dark-1800x1440.jpg" ]; then + ln -sfv "/usr/share/backgrounds/Alma-dark-1800x1440.jpg" "[% tde_bg %]" + # AlmaLinux 10 + elif [ -r "/usr/share/backgrounds/almalinux-day.jpg" ]; then + ln -sfv "/usr/share/backgrounds/almalinux-day.jpg" "[% tde_bg %]" + # RockyLinux 8 + elif [ -r "/usr/share/backgrounds/rocky8/default/standard/logo-dark.png" ]; then + ln -sfv "/usr/share/backgrounds/rocky8/default/standard/logo-dark.png" "[% tde_bg %]" + # RockyLinux 9 + elif [ -r "/usr/share/backgrounds/rocky-default-9-abstract-1-day.png" ]; then + ln -sfv "/usr/share/backgrounds/rocky-default-9-abstract-1-day.png" "[% tde_bg %]" + # RockyLinux 10 + elif [ -r "/usr/share/backgrounds/rocky-default-10-abstract-1-day.png" ]; then + ln -sfv "/usr/share/backgrounds/rocky-default-10-abstract-1-day.png" "[% tde_bg %]" + fi +fi +%endif + %postun -n trinity-ksmserver %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %if 0%{?mdkver} < 5000000 @@ -3261,7 +3297,7 @@ Windows and Samba shares. %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} # Applies an optional distro-specific graphical theme -%if "%{?tde_bg}" != "" +%if "%{?tde_bg}" != "" && 0%{?rhel} <= 7 # TDM Background %__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \ -e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|' @@ -3397,7 +3433,7 @@ fi -DWITH_SASL=ON \ -DWITH_LDAP=ON \ -DWITH_SAMBA=ON \ - %{?!with_exr:-DWITH_OPENEXR=OFF} \ + %{?!with_openexr:-DWITH_OPENEXR=OFF} \ -DWITH_XCOMPOSITE=ON \ -DWITH_XCURSOR=ON \ -DWITH_XFIXES=ON \ @@ -3440,7 +3476,7 @@ fi %if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320 -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \ %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver} || 0%{?pclinuxos} +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver} || 0%{?suse_version} >= 1600 || 0%{?pclinuxos} -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \ %endif \ @@ -3541,13 +3577,19 @@ fi %__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g" %endif -# SELINUX policy for RHEL / Fedora +# SELINUX policy %if 0%{?with_selinux_policy} %__cp -f "%{SOURCE8}" "tdm.te" %__make -f "%{_datadir}/selinux/devel/Makefile" %__install -D -m 644 -D "tdm.pp" "%{?buildroot}%{tde_confdir}/%{tdm}/tdm.pp" %endif +# Fedora 42 background conversion to PNG +%if 0%{?fedora} >= 42 +%__install -d "%{?buildroot}%{_datadir}/backgrounds" +magick "%{_datadir}/backgrounds/default.jxl" "%{?buildroot}%{_datadir}/backgrounds/default.png" +%endif + # Mageia icon for TDE menu %if 0%{?mgaversion} >= 3 %__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/icons/oxygen/scalable/mgabutton.svg" @@ -3616,7 +3658,7 @@ for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i popd # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Help.desktop Documentation Viewer %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Home.desktop System FileManager core %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kate.desktop TextEditor diff --git a/redhat/core/tdebase/tdm.el10.te b/redhat/core/tdebase/tdm.el10.te new file mode 120000 index 000000000..034e33247 --- /dev/null +++ b/redhat/core/tdebase/tdm.el10.te @@ -0,0 +1 @@ +tdm.el8.te
\ No newline at end of file diff --git a/redhat/core/tdebase/tdm.el8.te b/redhat/core/tdebase/tdm.el8.te index 519ca0506..598a11d0d 100644 --- a/redhat/core/tdebase/tdm.el8.te +++ b/redhat/core/tdebase/tdm.el8.te @@ -2,10 +2,10 @@ module tdm 1.0; require { - type fprintd_t; - type init_t; - class dbus send_msg; + type etc_t; + type xdm_t; + class file { create write }; } -#============= fprintd_t ============== -allow fprintd_t init_t:dbus send_msg; +#============= xdm_t ============== +allow xdm_t etc_t:file { create write }; diff --git a/redhat/core/tdebase/tdm.fc39.te b/redhat/core/tdebase/tdm.fc39.te index fec9320bb..5aaab7775 100644 --- a/redhat/core/tdebase/tdm.fc39.te +++ b/redhat/core/tdebase/tdm.fc39.te @@ -3,28 +3,22 @@ module tdm 1.0; require { type etc_t; - type fprintd_t; - type init_t; type tmp_t; - type unconfined_service_t; - type unconfined_t; type var_lib_t; type var_run_t; type xdm_t; - class capability2 mac_admin; - class dbus send_msg; - class fifo_file { getattr open read setattr unlink }; + class dir watch; + class fifo_file { getattr open read unlink }; class file { create entrypoint getattr lock map open read rename unlink write }; class lnk_file unlink; - class process transition; + class sock_file unlink; } -allow fprintd_t init_t:dbus send_msg; -allow unconfined_service_t unconfined_t:process transition; -allow unconfined_t self:capability2 mac_admin; allow xdm_t etc_t:file { create entrypoint rename unlink write }; -allow xdm_t tmp_t:fifo_file { getattr open read setattr unlink }; +allow xdm_t tmp_t:dir watch; +allow xdm_t tmp_t:fifo_file { getattr open read unlink }; allow xdm_t tmp_t:file { map open unlink }; allow xdm_t tmp_t:lnk_file unlink; +allow xdm_t tmp_t:sock_file unlink; allow xdm_t var_lib_t:file { unlink }; allow xdm_t var_run_t:file { getattr lock open read write }; diff --git a/redhat/core/tdebase/tdm.oss160.te b/redhat/core/tdebase/tdm.oss160.te new file mode 100644 index 000000000..115c7ae12 --- /dev/null +++ b/redhat/core/tdebase/tdm.oss160.te @@ -0,0 +1,27 @@ +module tdm 1.0; + +require { + type xdm_t; + type net_conf_t; + type etc_t; + type var_run_t; + type tmp_t; + class file { create entrypoint getattr lock open read write }; + class dir { add_name create watch }; + class lnk_file unlink; + class fifo_file { create getattr open read setattr unlink write }; + class sock_file { create setattr }; +} + +#============= xdm_t ============== + +allow xdm_t etc_t:file { create write }; +allow xdm_t net_conf_t:dir { add_name create }; +allow xdm_t net_conf_t:fifo_file { create open read setattr write }; +allow xdm_t net_conf_t:file { create write }; +allow xdm_t net_conf_t:sock_file { create setattr }; + +allow xdm_t tmp_t:dir watch; +allow xdm_t tmp_t:fifo_file { getattr open read unlink }; +allow xdm_t tmp_t:lnk_file unlink; +allow xdm_t var_run_t:file { getattr lock open read write }; diff --git a/redhat/core/tdebase/tdm.osstw.te b/redhat/core/tdebase/tdm.osstw.te new file mode 120000 index 000000000..39f6f213d --- /dev/null +++ b/redhat/core/tdebase/tdm.osstw.te @@ -0,0 +1 @@ +tdm.oss160.te
\ No newline at end of file diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index 6ee4ee126..d887870d3 100644 --- a/redhat/core/tdebindings/tdebindings.spec +++ b/redhat/core/tdebindings/tdebindings.spec @@ -27,7 +27,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdebindings %define tde_prefix /opt/trinity @@ -246,16 +246,16 @@ BuildRequires: java-devel # Others use OpenJDK BuildRequires: java-openjdk BuildRequires: java-devel >= 1.4.2 -%if 0%{?suse_version} >= 1320 +%if 0%{?suse_version} >= 1320 && 0%{?suse_version} < 1600 BuildRequires: java-1_8_0-openjdk-devel %endif -%if 0%{?fedora} >= 42 +%if 0%{?fedora} >= 42 || 0%{?rhel} >= 10 || 0%{?suse_version} >= 1600 BuildRequires: java-21-openjdk-devel %endif -%if ( 0%{?fedora} >= 21 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8 +%if ( 0%{?fedora} >= 21 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} >= 5 || ( 0%{?rhel} >= 8 && 0%{?rhel} <= 9 ) BuildRequires: java-1.8.0-openjdk-devel %endif -%if 0%{?fedora} == 17 || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7 +%if ( 0%{?fedora} >= 17 && 0%{?fedora} <= 20 ) || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7 BuildRequires: java-1.7.0-openjdk-devel %endif %if 0%{?rhel} == 5 || 0%{?rhel} == 6 @@ -1193,7 +1193,7 @@ if grep "LIBPYTHON=''" "config.log"; then exit 1 fi -%if 0%{?mdkver} +%if 0%{?mdkversion} && 0%{?pclinuxos} == 0 # Something weird in openmandriva autotools: # we need to update generated files timestamps to avoid autotools infinite loop touch subdirs acinclude.m4 aclocal.m4 Makefile.am Makefile.in Makefile configure config.status @@ -1256,7 +1256,7 @@ if [ ! -d "%{?buildroot}%{python_sitearch}" ] && [ -d "%{?buildroot}%{python_sit fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -u kjscmd Development %suse_update_desktop_file -u embedjs Development %endif diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec index f5f690a6d..bc845b2d0 100644 --- a/redhat/core/tdeedu/tdeedu.spec +++ b/redhat/core/tdeedu/tdeedu.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeedu %define tde_prefix /opt/trinity @@ -102,7 +102,7 @@ BuildRequires: openssl-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else -%if 0%{?fedora} >= 37 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else @@ -1206,7 +1206,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r khangman Education Languages Game KidsGame %suse_update_desktop_file kiten Education Languages %suse_update_desktop_file klatin Education Languages diff --git a/redhat/core/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec index 7a7a4dbe4..f6945bb0a 100644 --- a/redhat/core/tdegames/tdegames.spec +++ b/redhat/core/tdegames/tdegames.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdegames %define tde_prefix /opt/trinity @@ -1233,7 +1233,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{?buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r kasteroids Game ArcadeGame %suse_update_desktop_file -r KGoldrunner Game ArcadeGame %suse_update_desktop_file -r ksnake Game ArcadeGame diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec index 17caa2150..43147a6f6 100644 --- a/redhat/core/tdegraphics/tdegraphics.spec +++ b/redhat/core/tdegraphics/tdegraphics.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdegraphics %define tde_prefix /opt/trinity @@ -87,7 +87,7 @@ BuildRequires: gamin-devel %endif # LIBUSB support -%if 0%{?fedora} >= 37 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else @@ -227,11 +227,14 @@ BuildRequires: libdrm-devel %endif # OPENEXR support +#define with_openexr 1 +%if 0%{?with_openexr} %if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif +%endif # POPPLER support %define with_pdf 1 @@ -254,7 +257,11 @@ BuildRequires: trinity-poppler-devel >= 0.12 # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif @@ -404,8 +411,10 @@ tags, etc. all from within the file manager). %{tde_tdelibdir}/tdefile_dds.so %{tde_tdelibdir}/tdefile_dvi.la %{tde_tdelibdir}/tdefile_dvi.so +%if 0%{?with_openexr} %{tde_tdelibdir}/tdefile_exr.la %{tde_tdelibdir}/tdefile_exr.so +%endif %{tde_tdelibdir}/tdefile_gif.la %{tde_tdelibdir}/tdefile_gif.so %{tde_tdelibdir}/tdefile_ico.la @@ -440,7 +449,9 @@ tags, etc. all from within the file manager). %{tde_datadir}/services/tdefile_bmp.desktop %{tde_datadir}/services/tdefile_dds.desktop %{tde_datadir}/services/tdefile_dvi.desktop +%if 0%{?with_openexr} %{tde_datadir}/services/tdefile_exr.desktop +%endif %{tde_datadir}/services/tdefile_gif.desktop %{tde_datadir}/services/tdefile_ico.desktop %{tde_datadir}/services/tdefile_jpeg.desktop @@ -1122,7 +1133,7 @@ fi %{?with_t1lib:-DWITH_T1LIB=ON} \ %{?with_paper:-DWITH_LIBPAPER=ON} \ -DWITH_TIFF=ON \ - -DWITH_OPENEXR=ON \ + -DWITH_OPENEXR=%{?with_openexr:ON}%{?!with_openexr:OFF} \ -DWITH_PDF=%{?with_pdf:ON}%{?!with_pdf:OFF} \ -DBUILD_ALL=ON \ -DBUILD_KUICKSHOW=OFF \ @@ -1145,7 +1156,7 @@ for i in {16,32,48,64}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$i" popd # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpovmodeler.desktop Graphics 3DGraphics %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kolourpaint.desktop Graphics RasterGraphics %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/tdeiconedit.desktop Graphics RasterGraphics diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec index 74595c84b..922481dc8 100644 --- a/redhat/core/tdelibs/tdelibs.spec +++ b/redhat/core/tdelibs/tdelibs.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdelibs %define tde_prefix /opt/trinity @@ -170,7 +170,7 @@ BuildRequires: gamin-devel %endif # PCRE support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if ( 0%{?rhel} >=5 && 0%{?rhel} <= 9 ) || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define with_pcre 1 %if 0%{?mgaversion} >= 9 BuildRequires: %{_lib}pcre-devel @@ -214,7 +214,7 @@ BuildRequires: libutempter-devel %define with_utempter 1 BuildRequires: utempter %endif -%if 0%{?suse_version} && 0%{?suse_version} < 1699 +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %define with_utempter 1 BuildRequires: utempter-devel %endif @@ -254,13 +254,15 @@ Requires: avahi %endif # OPENEXR support +#define with_openexr 1 +%if 0%{?with_openexr} %if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} -%define with_openexr 1 %if 0%{?mdkver} BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif +%endif %if 0%{?pclinuxos} BuildRequires: libpthread-stubs @@ -294,7 +296,7 @@ BuildRequires: iceauth %endif # Xorg -%if 0%{?rhel} >= 5 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) Requires: xorg-x11-server-utils BuildRequires: xorg-x11-server-utils %endif @@ -318,7 +320,7 @@ BuildRequires: xz-devel %if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: ca-certificates Requires: ca-certificates -%if 0%{?fedora} >= 20 || 0%{?rhel} >= 6 +%if ( 0%{?fedora} >= 20 && 0%{?fedora} <= 42 ) || 0%{?rhel} >= 6 %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %endif %if 0%{?fedora} == 18 || 0%{?fedora} == 19 @@ -343,7 +345,7 @@ Requires: openssl BuildRequires: ca-certificates Requires: ca-certificates %endif -%if "%{cacert}" != "" +%if "%{?cacert}" != "" Requires: %{cacert} %endif @@ -812,7 +814,7 @@ fi %fdupes -s "%{?buildroot}" # Fix 'tderesources.desktop' (openSUSE only) -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop %endif diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec index 5fd5a7b47..a147eaf52 100644 --- a/redhat/core/tdemultimedia/tdemultimedia.spec +++ b/redhat/core/tdemultimedia/tdemultimedia.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdemultimedia %define tde_prefix /opt/trinity @@ -110,8 +110,16 @@ BuildRequires: zlib-devel #define with_musicbrainz 1 #BuildRequires: libmusicbrainz-devel libtunepimp-devel -# Audio libraries +# AUDIOFILE support +%if 0%{?rhel} >= 10 +%else +%define with_audiofile 1 +%endif +%if 0%{?with_audiofile} BuildRequires: audiofile-devel +%endif + +# Audio libraries BuildRequires: cdparanoia #BuildRequires: libmpg123-devel @@ -290,7 +298,7 @@ Requires: trinity-kmix = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-krec = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kscd = %{?epoch:%{epoch}:}%{version}-%{release} %{?with_akode:Requires: trinity-libarts-akode = %{?epoch:%{epoch}:}%{version}-%{release}} -Requires: trinity-libarts-audiofile = %{?epoch:%{epoch}:}%{version}-%{release} +%{?with_audiofile:Requires: trinity-libarts-audiofile = %{?epoch:%{epoch}:}%{version}-%{release}} %{?with_mpeg:Requires: trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}} %{?with_xine:Requires: trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}} Requires: trinity-libkcddb = %{?epoch:%{epoch}:}%{version}-%{release} @@ -825,6 +833,8 @@ This package contains akode plugins for aRts. ########## +%if 0%{?with_audiofile} + %package -n trinity-libarts-audiofile Summary: Audiofile plugin for aRts Group: Productivity/Multimedia/Other @@ -840,6 +850,8 @@ This package contains audiofile plugins for aRts. %{tde_libdir}/mcop/audiofilearts.mcopclass %{tde_libdir}/mcop/audiofilearts.mcoptype +%endif + ########## %if 0%{?with_mpeg} @@ -1058,7 +1070,9 @@ noatun plugins. %if 0%{?with_akode} %{tde_libdir}/libarts_akode.so %endif +%if 0%{?with_audiofile} %{tde_libdir}/libarts_audiofile.so +%endif %if 0%{?with_mpeg} %{tde_libdir}/libarts_mpeglib.so %{tde_libdir}/libarts_mpeglib-0.3.0.so @@ -1153,7 +1167,7 @@ fi -DWITH_ALL_OPTIONS=ON \ -DWITH_ALSA=ON \ -DWITH_ARTS_AKODE=ON \ - -DWITH_ARTS_AUDIOFILE=ON \ + -DWITH_ARTS_AUDIOFILE=%{?with_audiofile:ON}%{!?with_audiofile:OFF} \ -DWITH_ARTS_MPEGLIB=ON \ -DWITH_ARTS_XINE=ON \ -DWITH_CDPARANOIA=ON \ @@ -1193,7 +1207,7 @@ export PATH="%{tde_bindir}:${PATH}" %endif # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file krec AudioVideo Recorder %suse_update_desktop_file tdemid AudioVideo Midi %suse_update_desktop_file artsbuilder AudioVideo AudioVideoEditing diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec index b40e1595c..aff32921c 100644 --- a/redhat/core/tdenetwork/tdenetwork.spec +++ b/redhat/core/tdenetwork/tdenetwork.spec @@ -26,7 +26,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdenetwork %define tde_prefix /opt/trinity @@ -131,7 +131,7 @@ BuildRequires: sqlite-devel %endif # GADU support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || ( 0%{?suse_version} && 0%{?suse_version} < 1600 ) %define with_gadu 1 %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}gadu-devel @@ -177,7 +177,7 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel %endif # Other stuff -%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 +%if 0%{?fedora} >= 5 || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) BuildRequires: libXScrnSaver-devel BuildRequires: libXxf86vm-devel %endif @@ -288,6 +288,10 @@ BuildRequires: speex-devel Requires: xinetd %endif +%if 0%{?rhel} >= 10 +BuildRequires: libgcrypt-devel +%endif + # Avoids relinking, which breaks consolehelper %define dont_relink 1 %endif @@ -814,10 +818,10 @@ Requires: ppp %if 0%{?with_consolehelper} # package 'usermode' provides '/usr/bin/consolehelper-gtk' -%if 0%{?rhel} || 0%{?fedora} +%if ( 0%{?rhel} && 0%{?rhel} <= 9 ) || 0%{?fedora} Requires: usermode-gtk %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 10 Requires: usermode %endif %endif @@ -1235,7 +1239,7 @@ done %endif # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kcmkrfb %suse_update_desktop_file fileshare %suse_update_desktop_file kopete Network InstantMessaging diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec index 60153a589..8abd667f1 100644 --- a/redhat/core/tdepim/tdepim.spec +++ b/redhat/core/tdepim/tdepim.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdepim %define tde_prefix /opt/trinity @@ -183,7 +183,7 @@ BuildRequires: libXcomposite-devel # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -1935,7 +1935,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{?buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/akregator.desktop Network RSS-News %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/groupwarewizard.desktop Utility DesktopSettings X-TDE-Utilities-PIM %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kaddressbook.desktop diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec index aab12da8e..6f063b45c 100644 --- a/redhat/core/tdesdk/tdesdk.spec +++ b/redhat/core/tdesdk/tdesdk.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdesdk %define tde_prefix /opt/trinity @@ -1189,7 +1189,7 @@ rm -rf kapptemplate popd # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kuiviewer Development GUIDesigner %suse_update_desktop_file umbrello Development Design %suse_update_desktop_file kbugbuster Development Debugger diff --git a/redhat/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec index fb358a9da..99ed0f0ee 100644 --- a/redhat/core/tdetoys/tdetoys.spec +++ b/redhat/core/tdetoys/tdetoys.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdetoys %define tde_prefix /opt/trinity @@ -449,7 +449,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{buildroot}%{tde_tdeincludedir}/AmorIface.h # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r kworldclock Utility Clock %suse_update_desktop_file -r kteatime Applet %suse_update_desktop_file -r amor Amusement diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec index b54faa8fe..da09173da 100644 --- a/redhat/core/tdeutils/tdeutils.spec +++ b/redhat/core/tdeutils/tdeutils.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeutils %define tde_prefix /opt/trinity @@ -154,7 +154,7 @@ BuildRequires: libacl-devel # XSCREENSAVER support # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} BuildRequires: libXScrnSaver-devel @@ -566,10 +566,10 @@ Requires: trinity-kcontrol %if 0%{?with_consolehelper} # package 'usermode' provides '/usr/bin/consolehelper-gtk' -%if 0%{?rhel} || 0%{?fedora} +%if ( 0%{?rhel} && 0%{?rhel} <= 9 ) || 0%{?fedora} Requires: usermode-gtk %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 10 Requires: usermode %endif %endif @@ -1004,7 +1004,7 @@ if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file KEdit Utility TextEditor %if 0%{?build_superkaramba} %suse_update_desktop_file superkaramba Utility DesktopUtility diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec index fabc84a68..664fafbff 100644 --- a/redhat/core/tdevelop/tdevelop.spec +++ b/redhat/core/tdevelop/tdevelop.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdevelop %define tde_prefix /opt/trinity diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec index a55d0cb36..6dd6b593f 100644 --- a/redhat/core/tdewebdev/tdewebdev.spec +++ b/redhat/core/tdewebdev/tdewebdev.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdewebdev %define tde_prefix /opt/trinity @@ -97,12 +97,6 @@ BuildRequires: libgcrypt-devel # PERL support BuildRequires: perl -# KXSLDBG requires libxml2 -#if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || ( 0%{?fedora} > 0 && %{?fedora} <= 17 ) || 0%{?suse_version} -%define build_kxsldbg 1 -BuildRequires: libxml2-devel -#endif - # ICU support %if 0%{?mdkver} BuildRequires: %{_lib}icu-devel @@ -125,7 +119,6 @@ Requires: trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release} -%{?build_kxsldbg:Requires: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release}} %description Web development applications, including: @@ -133,7 +126,6 @@ Web development applications, including: * klinkstatus: link checker * kommander: visual dialog building tool * quanta+: web development -%{?build_kxsldbg:* kxsldbg: xslt Debugger} %files %defattr(-,root,root,-) @@ -148,7 +140,6 @@ Requires: trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release} #Requires: trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release} -#Requires: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release} Requires: tidy %description -n trinity-quanta @@ -348,53 +339,6 @@ This package is part of TDE, as a component of the TDE web development module. ########## -%if 0%{?build_kxsldbg} - -%package -n trinity-kxsldbg -Summary: graphical XSLT debugger for TDE [Trinity] -Group: Applications/Development - -%description -n trinity-kxsldbg -KXSLDbg is a debugger for XSLT scripts. It includes a graphical user -interface as well as a text-based debugger. KXSLDbg can be run as a -standalone application or as an embedded TDE part. - -XSLT is an XML language for defining transformations of XML files from -XML to some other arbitrary format, such as XML, HTML, plain text, etc., -using standard XSLT stylesheets. - -This package is part of TDE, as a component of the TDE web development module. - -%files -n trinity-kxsldbg -%defattr(-,root,root,-) -%{tde_bindir}/kxsldbg -%{tde_bindir}/xsldbg -%{tde_tdelibdir}/libkxsldbgpart.la -%{tde_tdelibdir}/libkxsldbgpart.so -%{tde_tdeappdir}/kxsldbg.desktop -%{tde_datadir}/applnk/.hidden/xsldbg.desktop -%{tde_datadir}/apps/kxsldbg/ -%{tde_datadir}/apps/kxsldbgpart/ -%{tde_tdedocdir}/HTML/en/kxsldbg/ -%{tde_tdedocdir}/HTML/en/xsldbg/ -%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png -%{tde_datadir}/icons/hicolor/*/actions/configure.png -%{tde_datadir}/icons/hicolor/*/actions/system-log-out.png -%{tde_datadir}/icons/hicolor/*/actions/system-run.png -%{tde_datadir}/icons/hicolor/*/actions/hash.png -%{tde_datadir}/icons/hicolor/*/actions/mark.png -%{tde_datadir}/icons/hicolor/*/actions/next.png -%{tde_datadir}/icons/hicolor/*/actions/step.png -%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png -%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png -%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png -%{tde_datadir}/services/kxsldbg_part.desktop -%{tde_mandir}/man1/kxsldbg.1* - -%endif - -########## - %if 0%{?build_tdefilereplace} %package -n trinity-tdefilereplace @@ -458,10 +402,6 @@ Requires: trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -a 2 -a 3 -a 4 -%if 0%{?build_kxsldbg} == 0 -%__rm -rf kxsldbg/ doc/kxsldbg/ doc/xsldbg/ -%endif - %build unset QTDIR QTLIB QTINC @@ -527,11 +467,8 @@ done cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/ # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r klinkstatus Office WebDevelopment -%if 0%{?build_kxsldbg} -%suse_update_desktop_file -r kxsldbg Office WebDevelopment -%endif %suse_update_desktop_file -r kimagemapeditor Office WebDevelopment %suse_update_desktop_file kmdr-editor Development GUIDesigner %suse_update_desktop_file kmdr-executor Development GUIDesigner diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec index 008e7db44..947c5030d 100644 --- a/redhat/dependencies/akode/akode.spec +++ b/redhat/dependencies/akode/akode.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -89,7 +89,10 @@ BuildRequires: flac-devel %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}jack-devel %endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} >= 10 +BuildRequires: pipewire-jack-audio-connection-kit-devel +%endif +%if ( 0%{?rhel} && 0%{?rhel} <= 9 ) || 0%{?fedora} || 0%{?suse_version} BuildRequires: jack-audio-connection-kit-devel %endif %endif diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index f34fd0f70..a37281728 100644 --- a/redhat/dependencies/arts/arts.spec +++ b/redhat/dependencies/arts/arts.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg arts %define tde_prefix /opt/trinity @@ -71,10 +71,18 @@ BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: audiofile-devel BuildRequires: glib2-devel BuildRequires: gsl-devel +# AUDIOFILE support +%if 0%{?rhel} >= 10 +%else +%define with_audiofile 1 +%endif +%if 0%{?with_audiofile} +BuildRequires: audiofile-devel +%endif + # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} %if 0%{?pclinuxos} @@ -107,6 +115,9 @@ BuildRequires: esound-devel %if 0%{?rhel} >= 5 || 0%{?fedora} %define jack_devel jack-audio-connection-kit-devel %endif +%if 0%{?rhel} >= 10 +%define jack_devel pipewire-jack-audio-connection-kit-devel +%endif %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define jack_devel libjack-devel %endif @@ -199,7 +210,9 @@ Obsoletes: arts-devel < %{?epoch:%{epoch}:}%{version}-%{release} %endif Requires: %{alsa_devel} +%if 0%{?with_audiofile} Requires: audiofile-devel +%endif %{?libvorbis_devel:Requires: %{libvorbis_devel}} %{?with_esound:Requires: esound-devel} %{?with_libmad:Requires: %{mad_devel}} @@ -289,7 +302,7 @@ fi -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ \ -DWITH_ALSA=ON \ - -DWITH_AUDIOFILE=ON \ + %{?with_audiofile:-DWITH_AUDIOFILE=ON} %{!?with_audiofile:-DWITH_AUDIOFILE=OFF} \ -DWITH_VORBIS=ON \ %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \ %{?with_esound:-DWITH_ESOUND=ON} %{!?with_esound:-DWITH_ESOUND=OFF} \ diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 17ee70516..f062fc28a 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec index 55e9a46f1..57c5d4b2e 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec index 8aa6a3954..18f370cd2 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index 880ed2fb7..b17172a72 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec @@ -19,7 +19,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 05d80239a..7347242de 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index bb66ea887..7f7360bd7 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index 1a1ce5875..111bdd5a5 100644 --- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec +++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg polkit-tqt diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec index 6a9b07588..9c16a15b2 100644 --- a/redhat/dependencies/pytqt/pytqt.spec +++ b/redhat/dependencies/pytqt/pytqt.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg pytqt %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index cc4141eb7..2768474cd 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec @@ -28,7 +28,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/tde-cmake/tde-cmake.spec b/redhat/dependencies/tde-cmake/tde-cmake.spec index bdcff5902..bbc7d30f0 100644 --- a/redhat/dependencies/tde-cmake/tde-cmake.spec +++ b/redhat/dependencies/tde-cmake/tde-cmake.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-cmake diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index ce8e70f29..5e9e04a1e 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tqca-tls %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec index 13501feaa..6a255b386 100644 --- a/redhat/dependencies/tqca/tqca.spec +++ b/redhat/dependencies/tqca/tqca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tqca %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec index e7367e9eb..1fd3beefd 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tqscintilla diff --git a/redhat/dependencies/tqt3/build-examples.sh b/redhat/dependencies/tqt/build-examples.sh index f62d83b85..f62d83b85 100644 --- a/redhat/dependencies/tqt3/build-examples.sh +++ b/redhat/dependencies/tqt/build-examples.sh diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt/tqt.spec index eb9e23cc4..a1fa8950e 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt/tqt.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -27,7 +27,7 @@ %endif -Name: trinity-tqt3 +Name: trinity-tqt Version: 3.5.0 Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt GUI Library, Version 3 @@ -48,7 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: build-examples.sh -Source2: trinity-tqt3-rpmlintrc +Source2: trinity-tqt-rpmlintrc BuildRequires: glibc-devel %if "%{?c_compiler}" != "clang" @@ -83,11 +83,7 @@ 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 @@ -280,7 +276,11 @@ BuildRequires: Mesa-libGLU-devel %endif # MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else BuildRequires: mysql-devel +%endif # unixODBC support BuildRequires: unixODBC-devel @@ -312,22 +312,32 @@ BuildRequires: %{_lib}fbclient-devel %endif # NIS support +%if 0%{?suse_version} >= 1600 +%else %define with_nis 1 +%endif # RPC support %if 0%{?rhel} >= 8 || 0%{?fedora} >= 28 -BuildRequires: libnsl2-devel BuildRequires: libtirpc-devel %endif %if 0%{?suse_version} >= 1500 -BuildRequires: libnsl-devel BuildRequires: libtirpc-devel %endif %if 0%{?mdkver} || 0%{?mgaversion} -BuildRequires: %{_lib}nsl-devel BuildRequires: %{_lib}tirpc-devel %endif +# NSL support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28 +BuildRequires: libnsl2-devel +%endif +%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1600 +BuildRequires: libnsl-devel +%endif +%if 0%{?mdkver} || 0%{?mgaversion} +BuildRequires: %{_lib}nsl-devel +%endif # x86_64 specific stuff %if "%{_lib}" != "lib" %if 0%{?mdkversion} || ( 0%{?mgaversion} && 0%{?mgaversion} <= 2) @@ -1505,7 +1515,7 @@ for i in designer/designer assistant linguist/linguist; do popd done -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file tqassistant Documentation %suse_update_desktop_file tqdesigner GUIDesigner %suse_update_desktop_file tqlinguist Translation diff --git a/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc b/redhat/dependencies/tqt/trinity-tqt-rpmlintrc index d131ff5e9..d131ff5e9 100644 --- a/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc +++ b/redhat/dependencies/tqt/trinity-tqt-rpmlintrc diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index 29b285b3f..48e1489f3 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tqtinterface diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index 12a77f133..b7ff950a0 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.5" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker [ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip diff --git a/redhat/docker/el10/Dockerfile.x86_64 b/redhat/docker/el10/Dockerfile.x86_64 new file mode 100644 index 000000000..f5afce13e --- /dev/null +++ b/redhat/docker/el10/Dockerfile.x86_64 @@ -0,0 +1,44 @@ +FROM almalinux:10 + +ARG TDE_VERSION=14.1.5 +ARG ARCH=x86_64 + +# Enable proxy +# Install OVL plugin for DNF +# Update distribution packages +# Add EPEL repository +# Add RPMFUSION repository +# Enable supplementary repositories +# Install Trinity build dependencies +COPY packages /packages +RUN set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && curl -o /usr/lib/python3.12/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \ + && dnf -y update \ + && dnf -y almalinux-release-devel \ + && dnf -y install epel-release \ + && dnf -y install https://download1.rpmfusion.org/free/el/updates/10/x86_64/r/rpmfusion-free-release-10-1.noarch.rpm \ + && dnf -y install dnf-plugins-core \ + && dnf config-manager --enable crb \ + && dnf -y --enableplugin=ovl install $(</packages) \ + && rm -rf /usr/share/doc* /var/cache/dnf/* + +# Add YUM repository for locally built packages +COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN set -x \ + && sed -i /etc/yum.repos.d/rpmbuild.repo -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN set -x \ + && chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN set -x \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros +RUN set -x \ + && mkdir -p ${HOME}/rpmbuild/{BUILD,BUILDROOT,SOURCES,SPECS,RPMS/{noarch,x86_64},SRPMS} \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>${HOME}/.bashrc diff --git a/redhat/docker/el10/Jenkinsfile b/redhat/docker/el10/Jenkinsfile new file mode 100644 index 000000000..0f69083e5 --- /dev/null +++ b/redhat/docker/el10/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent any; + environment { + def docker_image = "trinity.el9.x86_64" + def TDE_VERSION = "14.1.5" + def ARCH = "x86_64" + } + stages { + stage('build') { + agent { + docker { + alwaysPull true + args '-v /net/pinas/tde:/tde' + image docker_image + registryUrl 'https://registry:5000' + reuseNode true + } + } + steps { + sh ''' + cd /tde/redhat + make + ''' + } + } + } +} diff --git a/redhat/docker/el10/external-packages.sh b/redhat/docker/el10/external-packages.sh new file mode 100755 index 000000000..932eeab35 --- /dev/null +++ b/redhat/docker/el10/external-packages.sh @@ -0,0 +1,110 @@ +#!/bin/bash -ex + +# Build supplementary development tools (EPEL) + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/i/iceauth-1.0.8-4.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/iceauth-1*.rpm + +wget -nv \ + https://archives.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/paper-2.3-6.el9.x86_64.rpm \ + https://archives.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/psutils-2.07-1.el9.noarch.rpm \ + && sudo rpm -Uvh psutils-2.07-1.el9.noarch.rpm paper-2.3-6.el9.x86_64.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/g/gnulib-0-53.20250704git.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnulib-devel-0*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/paper-2.3-6.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/paper-2*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/psutils-2.07-1.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-2*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/a/audiofile-0.3.6-36.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/audiofile{,-devel}-0*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-10.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/h/html2ps-1.0-0.53.b7.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/html2ps-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-38.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/perl-PAR-1.017-6.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/perl-PAR-Dist-0.51-5.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Dist-0*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-24.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/l/lirc-0.10.0-36.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lirc-{core,devel,libs}-0*.rpm + + +# Build supplementary development tools (Fedora 42) + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/c/cvs-1.11.23-73.fc42.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cvs-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/t/transfig-3.2.9-7.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/transfig-3*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/l/lcms-1.19-41.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lcms{,-libs,-devel}-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/h/heimdal-7.8.0-9.fc40.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/heimdal{-libs,-devel}-7*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/l/libvisual-0.4.1-5.fc41.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libvisual{,-devel}-0*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/c/clucene-2.3.3.4-51.20130812.e8e3d20git.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/clucene-{core,contribs-lib,core-devel}-2*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/s/sword-1.9.0-29.fc42.src.rpm --undefine "__cmake_in_source_build" --define "__cmake_builddir build" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/y/yaz-5.34.4-1.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/c/chmlib-0.40-45.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/l/librevenge-0.0.5-9.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/librevenge{,-devel}-0*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/l/libwpd-0.10.3-22.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libwpd{,-devel}-0*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/l/libotr-4.1.1-23.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libotr{,-devel}-4*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/t/torsocks-2.4.0-9.fc42.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/torsocks-2*.rpm + +# Build supplementary development tools (Fedora archives) + +#rpm -ivh https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ +# && sed -i ${HOME}/rpmbuild/SPECS/pilot-link.spec -e "s|libusb-devel|libusb1-devel|" \ +# && rpmbuild -bb ${HOME}/rpmbuild/SPECS/pilot-link.spec \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm + +#wget -nv -P ${HOME}/rpmbuild/RPMS/x86_64 \ +# http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \ +# http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib{icu69,yaz}-*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm diff --git a/redhat/docker/el10/packages b/redhat/docker/el10/packages new file mode 100644 index 000000000..bc183f795 --- /dev/null +++ b/redhat/docker/el10/packages @@ -0,0 +1,223 @@ +alsa-lib-devel +aspell +aspell-devel +avahi-devel +bc +bdftopcf +bind-devel +binutils-devel +bison +bluez-libs-devel +boost-devel +boost-python3-devel +byacc +bzip2-devel +cdparanoia +cdparanoia-devel +cdrskin +chrpath +clamav +clamav-devel +cln-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +docbook2X +doxygen +emacs +exempi-devel +exiv2-devel +expect +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-devel +fontforge +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +gcc-gfortran +gettext-devel +giflib-devel +glibc-langpack-fr +gmp-devel +gperf +gpgme-devel +gphoto2-devel +groff +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk-doc +help2man +hiredis +hiredis-devel +hspell-devel +icu +ImageMagick-devel +imlib2-devel +intltool +jasper-devel +java-devel +java-openjdk +kernel +lame-devel +lcms2-devel +libacl-devel +libao-devel +libarchive-devel +libassuan-devel +libblkid-devel +libcap-devel +libcap-ng-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-devel +libdb-cxx-devel +libdvdread-devel +libedit-devel +libfontenc-devel +libftdi-devel +libgcrypt-devel +libgsf-devel +libical-devel +libidn-devel +libjpeg-turbo-utils +libjxl +libksba-devel +libmad-devel +libmemcached-devel +libmng-devel +libmpcdec-devel +libmtp-devel +libnsl2-devel +libogg-devel +libpaper-devel +libpcap-devel +libqalculate-devel +libraw1394-devel +librsvg2-tools +librsync-devel +libsamplerate-devel +libsecret-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libunibreak-devel +libusb1-devel +libusb-compat-0.1-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvorbis-devel +libwebp-devel +libwmf-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libudisks2-devel +lirc-devel +lm_sensors-devel +man2html-core +mariadb-devel +mesa-libGL-devel +meson +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +openldap-devel +opensc +opensp-devel +pam-devel +pciutils-devel +pcre2-devel +pcsc-lite-devel +perl +perl-devel +perl-generators +perl(ExtUtils::MakeMaker) +perl(inc::Module::Install) +perl(IPC::Run3) +perl(JSON) +perl(Module::Signature) +perl(Test::Pod) +perl(Test::Pod::Coverage) +perl(XML::Parser) +pigz +pipewire-jack-audio-connection-kit-devel +pkcs11-helper-devel +polkit-devel +poppler-devel +portaudio-devel +postgresql +postgresql-server-devel +ppp +psutils +pulseaudio-libs-devel +python3-devel +python3-pyxattr +rdesktop +rdiff-backup +readline-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +SDL-devel +selinux-policy-devel +socat +speex-devel +sqlite-devel +subversion-devel +sudo +swig +systemd-devel +taglib-devel +tcl +texinfo +texinfo-tex +texlive-collection-basic +unixODBC-devel +usbutils +valgrind +wget +xine-lib-devel +xkeyboard-config-devel +xmlto +xorg-x11-util-macros +xz-devel diff --git a/redhat/docker/el10/rpmbuild.repo b/redhat/docker/el10/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/el10/rpmbuild.repo @@ -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 diff --git a/redhat/docker/el10/rpmmacros b/redhat/docker/el10/rpmmacros new file mode 100644 index 000000000..99695e7de --- /dev/null +++ b/redhat/docker/el10/rpmmacros @@ -0,0 +1,10 @@ +%dist .el10 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index 977c175f1..2cfb23953 100644 --- a/redhat/docker/el5/Dockerfile.i686 +++ b/redhat/docker/el5/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM centos32:5 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Add local repositories diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index 151860eb4..c72de7c23 100644 --- a/redhat/docker/el5/Dockerfile.x86_64 +++ b/redhat/docker/el5/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:5 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add local repositories diff --git a/redhat/docker/el5/packages b/redhat/docker/el5/packages index 90d09f929..cc7cc9e0e 100644 --- a/redhat/docker/el5/packages +++ b/redhat/docker/el5/packages @@ -155,7 +155,6 @@ netpbm-progs net-snmp-devel NetworkManager-glib-devel ocaml -OpenEXR-devel openldap24-libs-devel openldap-devel opensc diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 023519fc7..52341f23f 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM centos32:6 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Enable proxy diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index e854b5704..b155d0424 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:6 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Enable proxy diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages index 78e50226a..3db987323 100644 --- a/redhat/docker/el6/packages +++ b/redhat/docker/el6/packages @@ -157,7 +157,6 @@ net-tools NetworkManager-glib-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index afa39f46b..3a1826919 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:7 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Enable proxy diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index 034c786c8..ed142b5d9 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -161,7 +161,6 @@ NetworkManager-glib-devel NetworkManager-libnm-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index f78cc317f..0bc0c135f 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM rockylinux:8 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Enable custom repository @@ -40,28 +40,6 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity +RUN set -x \ + && mkdir -p ${HOME}/rpmbuild COPY rpmmacros /home/trinity/.rpmmacros - -# Build supplementary development tools - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm - -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 sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.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:/" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm diff --git a/redhat/docker/el8/Jenkinsfile b/redhat/docker/el8/Jenkinsfile new file mode 100644 index 000000000..fb6efa2c1 --- /dev/null +++ b/redhat/docker/el8/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent any; + environment { + def docker_image = "trinity.el8.x86_64" + def TDE_VERSION = "14.1.3" + def ARCH = "x86_64" + } + stages { + stage('build') { + agent { + docker { + alwaysPull true + args '-v /net/pinas/tde:/tde' + image docker_image + registryUrl 'https://registry:5000' + reuseNode true + } + } + steps { + sh ''' + cd /tde/redhat + make + ''' + } + } + } +} diff --git a/redhat/docker/el8/external-packages.sh b/redhat/docker/el8/external-packages.sh new file mode 100644 index 000000000..1d8088e41 --- /dev/null +++ b/redhat/docker/el8/external-packages.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# Build supplementary development tools + +#RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm + +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 + +sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm + +#RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +#RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +#RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm + +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:/" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index 173497991..911f28227 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -160,7 +160,6 @@ net-tools nspr-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc opensp-devel @@ -176,6 +175,7 @@ perl(ExtUtils::MakeMaker) perl(inc::Module::Install) perl(IPC::Run3) perl(PAR::Dist) +perl-PAR-Packer perl(Module::Signature) perl(Test::Pod) perl(Test::Pod::Coverage) diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 index abcb3110d..fad06d3a2 100644 --- a/redhat/docker/el9/Dockerfile.x86_64 +++ b/redhat/docker/el9/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM quay.io/rockylinux/rockylinux:9 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Enable proxy @@ -36,40 +36,6 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity +RUN set -x \ + && mkdir -p ${HOME}/rpmbuild COPY rpmmacros /home/trinity/.rpmmacros - -# Build supplementary development tools - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm - -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 wget -nv -P ${HOME}/rpmbuild/RPMS/x86_64 \ - http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \ - http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib{icu69,yaz}-*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP-GeoLite-data-2*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-1.6.12-11.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP{,-devel}-1*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-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:/" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm diff --git a/redhat/docker/el9/Jenkinsfile b/redhat/docker/el9/Jenkinsfile new file mode 100644 index 000000000..0f69083e5 --- /dev/null +++ b/redhat/docker/el9/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent any; + environment { + def docker_image = "trinity.el9.x86_64" + def TDE_VERSION = "14.1.5" + def ARCH = "x86_64" + } + stages { + stage('build') { + agent { + docker { + alwaysPull true + args '-v /net/pinas/tde:/tde' + image docker_image + registryUrl 'https://registry:5000' + reuseNode true + } + } + steps { + sh ''' + cd /tde/redhat + make + ''' + } + } + } +} diff --git a/redhat/docker/el9/external-packages.sh b/redhat/docker/el9/external-packages.sh new file mode 100755 index 000000000..f6f884782 --- /dev/null +++ b/redhat/docker/el9/external-packages.sh @@ -0,0 +1,37 @@ +#!/bin/bash -ex + +# Build supplementary development tools + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm + +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 + +wget -nv -P ${HOME}/rpmbuild/RPMS/x86_64 \ + http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \ + http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib{icu69,yaz}-*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP-GeoLite-data-2*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-1.6.12-11.fc36.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP{,-devel}-1*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm + +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:/" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages index cdaa1f70a..1aec4bc4a 100644 --- a/redhat/docker/el9/packages +++ b/redhat/docker/el9/packages @@ -163,7 +163,6 @@ net-tools nspr-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc opensp-devel diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64 index e739f9311..658afdc47 100644 --- a/redhat/docker/f25/Dockerfile.x86_64 +++ b/redhat/docker/f25/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:25 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f25/packages b/redhat/docker/f25/packages index 7578b0a9c..78e0cacf6 100644 --- a/redhat/docker/f25/packages +++ b/redhat/docker/f25/packages @@ -155,7 +155,6 @@ net-tools NetworkManager-glib-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 index 30e296e49..362774d77 100644 --- a/redhat/docker/f26/Dockerfile.i686 +++ b/redhat/docker/f26/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:26 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64 index bfc7fad08..328f53f30 100644 --- a/redhat/docker/f26/Dockerfile.x86_64 +++ b/redhat/docker/f26/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:26 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f26/packages b/redhat/docker/f26/packages index fd881d1fb..dc13b8297 100644 --- a/redhat/docker/f26/packages +++ b/redhat/docker/f26/packages @@ -155,7 +155,6 @@ net-tools NetworkManager-glib-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686 index c0ecbe472..a57cb62a7 100644 --- a/redhat/docker/f27/Dockerfile.i686 +++ b/redhat/docker/f27/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:27 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64 index b5e533488..cfda60aca 100644 --- a/redhat/docker/f27/Dockerfile.x86_64 +++ b/redhat/docker/f27/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:27 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f27/packages b/redhat/docker/f27/packages index 4ed40b178..304010acd 100644 --- a/redhat/docker/f27/packages +++ b/redhat/docker/f27/packages @@ -156,7 +156,6 @@ NetworkManager-glib-devel nspr-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 index 65d8670d6..4c217e8d8 100644 --- a/redhat/docker/f28/Dockerfile.i686 +++ b/redhat/docker/f28/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:28 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64 index 5435d452e..e12484da9 100644 --- a/redhat/docker/f28/Dockerfile.x86_64 +++ b/redhat/docker/f28/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:28 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f28/packages b/redhat/docker/f28/packages index 39096bfee..1f3fdbb4d 100644 --- a/redhat/docker/f28/packages +++ b/redhat/docker/f28/packages @@ -159,7 +159,6 @@ NetworkManager-glib-devel nspr-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f29/Dockerfile.i686 b/redhat/docker/f29/Dockerfile.i686 index 331dc9e91..f7cf6b6c3 100644 --- a/redhat/docker/f29/Dockerfile.i686 +++ b/redhat/docker/f29/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:29 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f29/Dockerfile.x86_64 b/redhat/docker/f29/Dockerfile.x86_64 index 2a6de8ae7..789d2c096 100644 --- a/redhat/docker/f29/Dockerfile.x86_64 +++ b/redhat/docker/f29/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:29 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f29/packages b/redhat/docker/f29/packages index d15aab174..28c52731a 100644 --- a/redhat/docker/f29/packages +++ b/redhat/docker/f29/packages @@ -160,7 +160,6 @@ net-tools nspr-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686 index 72d3882c6..987f38182 100644 --- a/redhat/docker/f30/Dockerfile.i686 +++ b/redhat/docker/f30/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:30 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64 index fdc589f7e..f3819408c 100644 --- a/redhat/docker/f30/Dockerfile.x86_64 +++ b/redhat/docker/f30/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:30 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f30/packages b/redhat/docker/f30/packages index 8b9d76b4c..f93a95194 100644 --- a/redhat/docker/f30/packages +++ b/redhat/docker/f30/packages @@ -167,7 +167,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64 index 092b8dbbb..2cc541e25 100644 --- a/redhat/docker/f31/Dockerfile.x86_64 +++ b/redhat/docker/f31/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:31 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f31/packages b/redhat/docker/f31/packages index bf07064e8..fe4f3d22a 100644 --- a/redhat/docker/f31/packages +++ b/redhat/docker/f31/packages @@ -167,7 +167,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64 index 919f323bf..11c4f3acb 100644 --- a/redhat/docker/f32/Dockerfile.x86_64 +++ b/redhat/docker/f32/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:32 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f32/packages b/redhat/docker/f32/packages index 4bd975a1e..4508eb07a 100644 --- a/redhat/docker/f32/packages +++ b/redhat/docker/f32/packages @@ -167,7 +167,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f33/Dockerfile.x86_64 b/redhat/docker/f33/Dockerfile.x86_64 index 228e64fb7..1bbf882f6 100644 --- a/redhat/docker/f33/Dockerfile.x86_64 +++ b/redhat/docker/f33/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:33 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f33/packages b/redhat/docker/f33/packages index 2839b6997..52c76fe18 100644 --- a/redhat/docker/f33/packages +++ b/redhat/docker/f33/packages @@ -166,7 +166,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64 index b86b93250..0b5b5ead4 100644 --- a/redhat/docker/f34/Dockerfile.x86_64 +++ b/redhat/docker/f34/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:34 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f34/packages b/redhat/docker/f34/packages index 84825b0a8..f7cc8ea97 100644 --- a/redhat/docker/f34/packages +++ b/redhat/docker/f34/packages @@ -168,7 +168,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64 index dbb42b2a9..a658ef538 100644 --- a/redhat/docker/f35/Dockerfile.x86_64 +++ b/redhat/docker/f35/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:35 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages index f541aa930..e60235a10 100644 --- a/redhat/docker/f35/packages +++ b/redhat/docker/f35/packages @@ -168,7 +168,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f36/Dockerfile.x86_64 b/redhat/docker/f36/Dockerfile.x86_64 index 49807b214..f45979163 100644 --- a/redhat/docker/f36/Dockerfile.x86_64 +++ b/redhat/docker/f36/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:36 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f36/packages b/redhat/docker/f36/packages index e9fa47a55..4113a856e 100644 --- a/redhat/docker/f36/packages +++ b/redhat/docker/f36/packages @@ -171,7 +171,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64 index 5967079e2..52337881a 100644 --- a/redhat/docker/f37/Dockerfile.x86_64 +++ b/redhat/docker/f37/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:37 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f37/packages b/redhat/docker/f37/packages index 6fd5a4f15..9aa2648f0 100644 --- a/redhat/docker/f37/packages +++ b/redhat/docker/f37/packages @@ -173,7 +173,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f38/Dockerfile.x86_64 b/redhat/docker/f38/Dockerfile.x86_64 index 27e949922..e08a6f1e3 100644 --- a/redhat/docker/f38/Dockerfile.x86_64 +++ b/redhat/docker/f38/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:38 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f38/packages b/redhat/docker/f38/packages index 828222df7..d10c04685 100644 --- a/redhat/docker/f38/packages +++ b/redhat/docker/f38/packages @@ -174,7 +174,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f39/Dockerfile.x86_64 b/redhat/docker/f39/Dockerfile.x86_64 index 7b5a2d23f..1ca718408 100644 --- a/redhat/docker/f39/Dockerfile.x86_64 +++ b/redhat/docker/f39/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:39 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f39/packages b/redhat/docker/f39/packages index 75f39fda1..3a1ef8f55 100644 --- a/redhat/docker/f39/packages +++ b/redhat/docker/f39/packages @@ -176,7 +176,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f40/Dockerfile.x86_64 b/redhat/docker/f40/Dockerfile.x86_64 index e40dcb324..2222c3fbf 100644 --- a/redhat/docker/f40/Dockerfile.x86_64 +++ b/redhat/docker/f40/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:40 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f40/packages b/redhat/docker/f40/packages index f409831a4..94d951930 100644 --- a/redhat/docker/f40/packages +++ b/redhat/docker/f40/packages @@ -175,7 +175,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f41/Dockerfile.x86_64 b/redhat/docker/f41/Dockerfile.x86_64 index c41ef09a6..9f10153b4 100644 --- a/redhat/docker/f41/Dockerfile.x86_64 +++ b/redhat/docker/f41/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:41 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f41/packages b/redhat/docker/f41/packages index 1bd6d53b2..0b38ca173 100644 --- a/redhat/docker/f41/packages +++ b/redhat/docker/f41/packages @@ -173,7 +173,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f42/Dockerfile.x86_64 b/redhat/docker/f42/Dockerfile.x86_64 index 18761130b..47749fbc9 100644 --- a/redhat/docker/f42/Dockerfile.x86_64 +++ b/redhat/docker/f42/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:42 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption @@ -30,8 +30,3 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ USER trinity COPY rpmmacros /home/trinity/.rpmmacros - -RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* diff --git a/redhat/docker/f42/external-packages.sh b/redhat/docker/f42/external-packages.sh new file mode 100755 index 000000000..c11281bd9 --- /dev/null +++ b/redhat/docker/f42/external-packages.sh @@ -0,0 +1,6 @@ +#!/bin/bash -ex + +rpm -ivh https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* diff --git a/redhat/docker/f42/packages b/redhat/docker/f42/packages index 872963678..8367d3d92 100644 --- a/redhat/docker/f42/packages +++ b/redhat/docker/f42/packages @@ -28,6 +28,7 @@ createrepo_c cryptsetup-devel cups-devel dbus-glib-devel +desktop-backgrounds-compat djvulibre djvulibre-devel dnf-plugin-ovl @@ -172,7 +173,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f43/Dockerfile.x86_64 b/redhat/docker/f43/Dockerfile.x86_64 new file mode 100644 index 000000000..1211b0298 --- /dev/null +++ b/redhat/docker/f43/Dockerfile.x86_64 @@ -0,0 +1,36 @@ +FROM fedora:43 + +ARG TDE_VERSION=14.1.5 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-43.noarch.rpm \ + && dnf -y --enableplugin=ovl update \ + && dnf -y --enableplugin=ovl install --skip-broken $(</packages) + +# Add YUM repository for locally built packages +COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN set -x \ + && sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN set -x \ + && chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN set -x \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +USER trinity +RUN set -x \ + && mkdir -p ${HOME}/rpmbuild +COPY rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/docker/f43/external-packages.sh b/redhat/docker/f43/external-packages.sh new file mode 100755 index 000000000..0c0b96e31 --- /dev/null +++ b/redhat/docker/f43/external-packages.sh @@ -0,0 +1,12 @@ +#!/bin/bash -ex + +rpm -ivh https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +#RUN set -x \ +# && rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ +# && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \ +# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2* diff --git a/redhat/docker/f43/packages b/redhat/docker/f43/packages new file mode 100644 index 000000000..e3cdc3c41 --- /dev/null +++ b/redhat/docker/f43/packages @@ -0,0 +1,237 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +boost-python3-devel +byacc +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +desktop-backgrounds-compat +djvulibre +djvulibre-devel +dnf-plugin-ovl +docbook2X +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +geoip-devel +gettext-devel +giflib-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +harfbuzz-devel +heimdal-devel +hspell-devel +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-21-openjdk-devel +lame-devel +lcms-devel +less +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 +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libunibreak-devel +libusb-compat-0.1-devel +libusb1-devel +libutempter-devel +libuuid-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 +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mesa-libGL-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +ocaml-facile-devel +openldap-devel +opensc +openslp-devel +opensp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(PAR::Packer) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +polkit-devel +poppler-devel +postgresql +postgresql-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python3 +python3-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texlive-newunicodechar +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +xbase-devel +xine-lib-devel +xkeyboard-config-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f43/rpmbuild.repo b/redhat/docker/f43/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f43/rpmbuild.repo @@ -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 diff --git a/redhat/docker/f43/rpmmacros b/redhat/docker/f43/rpmmacros new file mode 100644 index 000000000..0b82d6547 --- /dev/null +++ b/redhat/docker/f43/rpmmacros @@ -0,0 +1,10 @@ +%dist .fc43 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%source_date_epoch_from_changelog 0 +%python python3 diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64 index 54b5362bb..9eea7729a 100644 --- a/redhat/docker/mga5/Dockerfile.x86_64 +++ b/redhat/docker/mga5/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:5.1 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga5/packages.x86_64 b/redhat/docker/mga5/packages.x86_64 index 4cdd228c6..37ef73ef8 100644 --- a/redhat/docker/mga5/packages.x86_64 +++ b/redhat/docker/mga5/packages.x86_64 @@ -183,7 +183,6 @@ net-snmp-devel NetworkManager-glib-devel notification-daemon ocaml -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index 435522a03..5c446b323 100644 --- a/redhat/docker/mga6/Dockerfile.i686 +++ b/redhat/docker/mga6/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:6 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Reset URPMI repositories to default diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64 index 922b018eb..36adc55e6 100644 --- a/redhat/docker/mga6/Dockerfile.x86_64 +++ b/redhat/docker/mga6/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:6 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686 index 85ed2ec06..5538aa4d6 100644 --- a/redhat/docker/mga6/packages.i686 +++ b/redhat/docker/mga6/packages.i686 @@ -191,7 +191,6 @@ net-snmp-devel NetworkManager-glib-devel notification-daemon ocaml -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64 index f499915be..96eaabd1a 100644 --- a/redhat/docker/mga6/packages.x86_64 +++ b/redhat/docker/mga6/packages.x86_64 @@ -191,7 +191,6 @@ net-snmp-devel NetworkManager-glib-devel notification-daemon ocaml -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 index 9fbfdff1b..c39a5c347 100644 --- a/redhat/docker/mga7/Dockerfile.i686 +++ b/redhat/docker/mga7/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:7 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Reset URPMI repositories to default diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64 index 06503d530..419361938 100644 --- a/redhat/docker/mga7/Dockerfile.x86_64 +++ b/redhat/docker/mga7/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:7 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686 index f94a02efd..fc1fdfe18 100644 --- a/redhat/docker/mga7/packages.i686 +++ b/redhat/docker/mga7/packages.i686 @@ -179,7 +179,6 @@ NetworkManager-glib-devel notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64 index 0c84baf4c..91a45b8d8 100644 --- a/redhat/docker/mga7/packages.x86_64 +++ b/redhat/docker/mga7/packages.x86_64 @@ -194,7 +194,6 @@ NetworkManager-glib-devel notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686 index 68e213fc0..dfc0a1565 100644 --- a/redhat/docker/mga8/Dockerfile.i686 +++ b/redhat/docker/mga8/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:8 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/Dockerfile.x86_64 b/redhat/docker/mga8/Dockerfile.x86_64 index 300a39c63..a7c7a99d8 100644 --- a/redhat/docker/mga8/Dockerfile.x86_64 +++ b/redhat/docker/mga8/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:8 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/packages.i686 b/redhat/docker/mga8/packages.i686 index c44677fa0..253fee3fe 100644 --- a/redhat/docker/mga8/packages.i686 +++ b/redhat/docker/mga8/packages.i686 @@ -193,7 +193,6 @@ net-snmp-devel notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64 index 22bc88e76..fd2861f9f 100644 --- a/redhat/docker/mga8/packages.x86_64 +++ b/redhat/docker/mga8/packages.x86_64 @@ -196,7 +196,6 @@ net-snmp-devel notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686 index f01eb5406..edaba68b8 100644 --- a/redhat/docker/mga9/Dockerfile.i686 +++ b/redhat/docker/mga9/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:9 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64 index 3e1e79c36..70d4deaaf 100644 --- a/redhat/docker/mga9/Dockerfile.x86_64 +++ b/redhat/docker/mga9/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:9 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686 index ec31bc8f1..f6a3cb3df 100644 --- a/redhat/docker/mga9/packages.i686 +++ b/redhat/docker/mga9/packages.i686 @@ -197,7 +197,6 @@ net-snmp-devel notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64 index cfd8f46bc..edeb0f95e 100644 --- a/redhat/docker/mga9/packages.x86_64 +++ b/redhat/docker/mga9/packages.x86_64 @@ -202,7 +202,6 @@ net-tools notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/omv6/Dockerfile.x86_64 b/redhat/docker/omv6/Dockerfile.x86_64 index 3bb061a55..ac6be8e2d 100644 --- a/redhat/docker/omv6/Dockerfile.x86_64 +++ b/redhat/docker/omv6/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM openmandriva:6.0 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 COPY packages /packages diff --git a/redhat/docker/omv6/packages b/redhat/docker/omv6/packages index 873ca4609..0f82b10c0 100644 --- a/redhat/docker/omv6/packages +++ b/redhat/docker/omv6/packages @@ -138,8 +138,7 @@ lib64npth-devel lib64nsl-devel lib64nspr-devel lib64ofx-devel -lib64openexr-devel -lib64otr-devel +lib64lib64otr-devel lib64paper-devel lib64pcre-devel lib64pcsclite-devel diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64 index b237c4192..8cfeed1c4 100644 --- a/redhat/docker/omvcooker/Dockerfile.x86_64 +++ b/redhat/docker/omvcooker/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM openmandriva/cooker:latest -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 COPY packages /packages @@ -27,19 +27,19 @@ RUN set -x \ USER trinity COPY rpmmacros /home/trinity/.rpmmacros -RUN set -x \ - && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdesktop-1.9.0-6.mga9.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/rdesktop.spec -e "s|%{_rpmconfigdir}/%{_real_vendor}|/usr/share/libtool/config|" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec --define "mkrel %nil" \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm +#RUN set -x \ +# && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdesktop-1.9.0-6.mga9.src.rpm \ +# && sed -i ${HOME}/rpmbuild/SPECS/rdesktop.spec -e "s|%{_rpmconfigdir}/%{_real_vendor}|/usr/share/libtool/config|" \ +# && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec --define "mkrel %nil" \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm -RUN set -x \ - && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-13.mga10.src.rpm \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm +#RUN set -x \ +# && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-13.mga10.src.rpm \ +# && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm RUN set -x \ - && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.34.4-2.mga10.src.rpm --define "mkrel %nil" --nodeps \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.35.1-1.mga10.src.rpm --define "mkrel %nil" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm RUN set -x \ @@ -48,8 +48,12 @@ RUN set -x \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm RUN set -x \ - && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm --define "mkrel %nil" \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm + && rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/a/audiofile-0.3.6-36.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/audiofile{,-devel}-0*.rpm + +#RUN set -x \ +# && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm --define "mkrel %nil" \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-Getopt-ArgvFile-1.110.0-10.mga9.src.rpm \ diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages index 873ca4609..69b1c654f 100644 --- a/redhat/docker/omvcooker/packages +++ b/redhat/docker/omvcooker/packages @@ -15,6 +15,7 @@ clamav-devel cmake createrepo_c ctags +cscope cups-devel curl-devel db5-devel @@ -138,8 +139,7 @@ lib64npth-devel lib64nsl-devel lib64nspr-devel lib64ofx-devel -lib64openexr-devel -lib64otr-devel +lib64lib64otr-devel lib64paper-devel lib64pcre-devel lib64pcsclite-devel @@ -160,6 +160,7 @@ lib64sasl-devel lib64SDL-devel lib64smbclient-devel lib64sndfile-devel +lib64sword-devel lib64t1lib-devel lib64tasn1-devel lib64theora-devel @@ -236,6 +237,7 @@ python-pylibacl python-pyyaml python-setuptools_scm pyxattr +rdesktop readline-devel recode rpm-build diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64 index 2f53dc4c5..5909202f7 100644 --- a/redhat/docker/oss131/Dockerfile.x86_64 +++ b/redhat/docker/oss131/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:13.1 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss131/packages b/redhat/docker/oss131/packages index 31065e63f..e31147dbd 100644 --- a/redhat/docker/oss131/packages +++ b/redhat/docker/oss131/packages @@ -136,7 +136,6 @@ mozilla-nspr-devel mysql-devel NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64 index 24120029b..b0a7cd8af 100644 --- a/redhat/docker/oss132/Dockerfile.x86_64 +++ b/redhat/docker/oss132/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:13.2 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss132/packages b/redhat/docker/oss132/packages index 5043e7483..945f90f3f 100644 --- a/redhat/docker/oss132/packages +++ b/redhat/docker/oss132/packages @@ -131,7 +131,6 @@ mozilla-nspr-devel mysql-devel NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64 index 82f4a69b2..69aeceb77 100644 --- a/redhat/docker/oss150/Dockerfile.x86_64 +++ b/redhat/docker/oss150/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.0 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss150/packages b/redhat/docker/oss150/packages index 259133a11..49f4462f9 100644 --- a/redhat/docker/oss150/packages +++ b/redhat/docker/oss150/packages @@ -145,7 +145,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64 index 0513b395e..ee2b0ea5f 100644 --- a/redhat/docker/oss151/Dockerfile.x86_64 +++ b/redhat/docker/oss151/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.1 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss151/packages b/redhat/docker/oss151/packages index 0d75fd57e..1a8fdbe46 100644 --- a/redhat/docker/oss151/packages +++ b/redhat/docker/oss151/packages @@ -152,7 +152,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64 index 5615f8483..8a73f5522 100644 --- a/redhat/docker/oss152/Dockerfile.x86_64 +++ b/redhat/docker/oss152/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.2 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages index ec21f7f6b..1d5529dd6 100644 --- a/redhat/docker/oss152/packages +++ b/redhat/docker/oss152/packages @@ -150,7 +150,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64 index f7b8efd9e..6e4a47816 100644 --- a/redhat/docker/oss153/Dockerfile.x86_64 +++ b/redhat/docker/oss153/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.3 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages index 1b18b1d8b..421917b0b 100644 --- a/redhat/docker/oss153/packages +++ b/redhat/docker/oss153/packages @@ -167,7 +167,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64 index b443cbcda..d31a278c7 100644 --- a/redhat/docker/oss154/Dockerfile.x86_64 +++ b/redhat/docker/oss154/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.4 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages index 0eeaa3da6..fb81e1d32 100644 --- a/redhat/docker/oss154/packages +++ b/redhat/docker/oss154/packages @@ -168,7 +168,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss155/Dockerfile.x86_64 b/redhat/docker/oss155/Dockerfile.x86_64 index ec70a4649..1a94f67ca 100644 --- a/redhat/docker/oss155/Dockerfile.x86_64 +++ b/redhat/docker/oss155/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.5 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss155/packages b/redhat/docker/oss155/packages index 5d827fe6e..7cc1025c7 100644 --- a/redhat/docker/oss155/packages +++ b/redhat/docker/oss155/packages @@ -170,7 +170,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss156/Dockerfile.x86_64 b/redhat/docker/oss156/Dockerfile.x86_64 index 9e3685946..2a0df375d 100644 --- a/redhat/docker/oss156/Dockerfile.x86_64 +++ b/redhat/docker/oss156/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.6 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository @@ -29,14 +29,3 @@ 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 - -RUN rpm -Uvh http://download.opensuse.org/source/distribution/leap/15.5/repo/oss/src/perl-PAR-Packer-1.057-bp155.1.4.src.rpm \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ - && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer"*".rpm" - -# Install heimdal development files -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/libheimdal-7.8.0-bp156.4.4.src.rpm \ - && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ - && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ - && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ - && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install diff --git a/redhat/docker/oss156/external-packages.sh b/redhat/docker/oss156/external-packages.sh new file mode 100644 index 000000000..b03f5b080 --- /dev/null +++ b/redhat/docker/oss156/external-packages.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +rpm -Uvh http://download.opensuse.org/source/distribution/leap/15.5/repo/oss/src/perl-PAR-Packer-1.057-bp155.1.4.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer"*".rpm" + +# Install heimdal development files +rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/libheimdal-7.8.0-bp156.4.4.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install diff --git a/redhat/docker/oss156/packages b/redhat/docker/oss156/packages index f330fcecb..876496d61 100644 --- a/redhat/docker/oss156/packages +++ b/redhat/docker/oss156/packages @@ -169,7 +169,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss160/Dockerfile.x86_64 b/redhat/docker/oss160/Dockerfile.x86_64 new file mode 100644 index 000000000..e55b7c7be --- /dev/null +++ b/redhat/docker/oss160/Dockerfile.x86_64 @@ -0,0 +1,39 @@ +FROM opensuse/leap:16.0 + +ARG TDE_VERSION=14.1.5 +ARG ARCH=x86_64 + +# Add PACKMAN repository +# Install Trinity build dependencies +COPY packages /packages +RUN set -x \ + && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \ + && echo HTTP_PROXY="http://proxy.vtf:3128/" >>/etc/sysconfig/proxy \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.6/ packman \ + && zypper -n refresh \ + && zypper al permissions \ + && zypper -n update \ + && zypper -n install -l $(</packages) + +RUN set -x \ + && ln -sfv python3.6m /usr/include/python3.6 + +## WTF in /usr/bin/libtool !!!! should be gcc15 not gcc13 ! +#sys_lib_search_path_spec="/usr/lib64/gcc/x86_64-suse-linux/13 /usr/lib64 /lib64 /usr/x86_64-suse-linux/lib /lib /usr/lib " +RUN set -x \ + && sed -i /usr/bin/libtool -e "s|x86_64-suse-linux/13|x86_64-suse-linux/15|g" + +# Add non-root user to build packages +RUN set -x \ + && 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 set -x \ + && 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 diff --git a/redhat/docker/oss160/external-packages.sh b/redhat/docker/oss160/external-packages.sh new file mode 100755 index 000000000..87b162315 --- /dev/null +++ b/redhat/docker/oss160/external-packages.sh @@ -0,0 +1,39 @@ +#!/bin/bash -ex + +# Build supplementary development tools + +# heimdal +#rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/16.0/repo/oss/src/libheimdal-7.8.0-160000.3.2.src.rpm +#wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" +#sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" +#rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec +#sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install +sudo rpm -Uvh --force /home/trinity/rpmbuild/RPMS.tde-14.1.5/x86_64/*-7.8.0-1.oss160.x86_64.rpm + +# nmap +wget -nv \ + https://rpmfind.net/linux/opensuse/distribution/leap/15.6/repo/oss/x86_64/liblua5_3-5-5.3.6-3.6.1.x86_64.rpm \ + https://rpmfind.net/linux/opensuse/distribution/leap/15.6/repo/oss/x86_64/nmap-7.92-150600.7.3.x86_64.rpm \ +&& sudo rpm -Uvh liblua5_3-5-5.3.6-3.6.1.x86_64.rpm nmap-7.92-150600.7.3.x86_64.rpm + +# perl-Getopt-ArgvFile +rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/perl-Getopt-ArgvFile-1.11-bp156.3.1.src.rpm --define "perl_requires %nil"\ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/perl-Getopt-ArgvFile-"*".rpm" + +# perl-PAR-Packer +rpm -Uvh http://download.opensuse.org/source/distribution/leap/15.5/repo/oss/src/perl-PAR-Packer-1.057-bp155.1.4.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer"*".rpm" + +# sword +rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/sword-1.8.1-bp156.3.7.src.rpm \ + && sed -i "${HOME}/rpmbuild/SPECS/sword.spec" -e "s|^%patch|%patch -P |" \ + && rpmbuild -ba "${HOME}/rpmbuild/SPECS/sword.spec" \ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/"{libsword,sword,sword-devel}"-"*".rpm" + +# torsocks +rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/torsocks-2.4.0-bp156.2.4.src.rpm + +# +zypper ar --no-gpgcheck trinity.noarch https://repo/rpmbuild/RPMS/RPMS.oss160.tde-14.1.5/noarch/ +zypper ar --no-gpgcheck trinity.x86_64 https://repo/rpmbuild/RPMS/RPMS.oss160.tde-14.1.5/x86_64/ diff --git a/redhat/docker/oss160/packages b/redhat/docker/oss160/packages new file mode 100644 index 000000000..766bdd784 --- /dev/null +++ b/redhat/docker/oss160/packages @@ -0,0 +1,230 @@ +alsa-devel +aspell +aspell-devel +audiofile-devel +automake +bdftopcf +binutils-devel +bison +boost-devel +brp-check-suse +ccache +cdparanoia +cdparanoia-devel +checkpolicy +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 +dos2unix +doxygen GraphicsMagick +dssi-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +font-util +freetype-devel +fribidi-devel +gcc-c++ +giflib-devel +git +glu-devel +gmime-devel +gmp-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gstreamer-devel +gtk2-devel +gtk3-devel +gtk-doc +html2ps +hunspell-devel +iceauth +ImageMagick-devel +imake +imlib2-devel +intltool +java-devel +less +libacl-devel +libao-devel +libart_lgpl-devel +libattr-devel +libavahi-devel +libavcodec-devel +libblkid-devel +libboost_python3-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 +libgpgme-devel +libgphoto2-devel +libgpod-devel +libgsf-devel +libical-devel +libICE-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +libjpeg8-devel +liblcms2-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libmysqld-devel +libneon-devel +libofx-devel +libotr-devel +libpaper-devel +libpcap-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpulse-devel +libqalculate-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libsensors4-devel +libSM-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtag-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtwolame-devel +libudisks2-0-devel +libuuid-devel +libunibreak-devel +libusb-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwebp-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 +lirc-devel +Lua(devel) +make +makeinfo +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +net-snmp-devel +net-tools +net-tools-deprecated +NetworkManager-devel +ocaml +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +perl(Archive::Zip) +perl(IPC::Run3) +perl(JSON) +perl(Module::ScanDeps) +perl(PAR) +perl(PAR::Dist) +perl(Test::Pod) +perl(Test::Pod::Coverage) +perl-macros +perl-pcsc +pkcs11-helper-devel +pkgconfig(cppunit) +pkgconfig(libcurl) +polkit-devel +postgresql +postgresql-devel +postgresql-server-devel +ppp +python3-devel +python3-sip-devel +recode +rpcgen +rpm-build +rpm-devel +rpmlint +rsvg-convert +rsync +ruby +ruby-devel +sane-backends-devel +scons +selinux-policy-devel +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +texinfo +transfig +unixODBC-devel +update-desktop-files +usbutils +valgrind +vim +wget +wireless-tools +xcb-proto-devel +xorg-x11 +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss160/rpmmacros b/redhat/docker/oss160/rpmmacros new file mode 100644 index 000000000..ce48a5a09 --- /dev/null +++ b/redhat/docker/oss160/rpmmacros @@ -0,0 +1,8 @@ +%dist .oss160 +%_smp_mflags -j8 +%jobs 8 +%sle_version 160000 +%_build_insert_debug_package %nil +%python python3 +%__python /usr/bin/python3 +%_enable_debug_packages %nil diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64 index 2914e970e..688ee5908 100644 --- a/redhat/docker/oss421/Dockerfile.x86_64 +++ b/redhat/docker/oss421/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:42.1 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss421/packages b/redhat/docker/oss421/packages index 2dfb4f848..175653ae0 100644 --- a/redhat/docker/oss421/packages +++ b/redhat/docker/oss421/packages @@ -128,7 +128,6 @@ mozilla-nspr-devel mysql-devel NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64 index 7daaa6e08..5a20bc141 100644 --- a/redhat/docker/oss422/Dockerfile.x86_64 +++ b/redhat/docker/oss422/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:42.2 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss422/packages b/redhat/docker/oss422/packages index fe79c5038..9d20d2d60 100644 --- a/redhat/docker/oss422/packages +++ b/redhat/docker/oss422/packages @@ -139,7 +139,6 @@ mozilla-nspr-devel mysql-devel NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64 index 4b35dfbd0..89a933d87 100644 --- a/redhat/docker/oss423/Dockerfile.x86_64 +++ b/redhat/docker/oss423/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:42.3 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss423/packages b/redhat/docker/oss423/packages index e76a81eb3..4d9945bcf 100644 --- a/redhat/docker/oss423/packages +++ b/redhat/docker/oss423/packages @@ -143,7 +143,6 @@ mozilla-nspr-devel mysql-devel NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 61bf0f4d9..f7488d9b7 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Add PACKMAN repository @@ -30,10 +30,3 @@ RUN set -x \ RUN set -x \ && sudo rpm -Uvh --nodeps https://download.opensuse.org/repositories/network/openSUSE_Tumbleweed/i586/torsocks-2.4.0-15.25.i586.rpm - -# Add lilypond (i686 only) -RUN set -x \ - && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.6.src.rpm \ - && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ - && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ - && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 4498a9573..9d967aa89 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/tumbleweed:latest -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/external-packages.sh b/redhat/docker/osstw/external-packages.sh new file mode 100644 index 000000000..edb7a3116 --- /dev/null +++ b/redhat/docker/osstw/external-packages.sh @@ -0,0 +1,7 @@ +#!/bin/bash -ex + +# Add lilypond (i686 only) +rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.6.src.rpm +sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ +setarch i686 rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ +sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index b18437051..a5f6cca04 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -12,6 +12,7 @@ brp-check-suse ccache cdparanoia cdparanoia-devel +checkpolicy chmlib-devel chrpath clamav @@ -35,8 +36,6 @@ docbook2x dssi-devel extractpdfmark fdupes -ffmpeg-4-libavcodec-devel -ffmpeg-4-libavdevice-devel fftw3-devel file-devel findutils @@ -67,12 +66,14 @@ ImageMagick-devel imake imlib2-devel intltool -java-1_8_0-openjdk-devel +java-21-openjdk-devel less libacl-devel libart_lgpl-devel libattr-devel libavahi-devel +libavcodec-devel +libavdevice-devel libblkid-devel libboost_python3-devel libbz2-devel @@ -170,8 +171,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr -openexr-devel opensc openslp-devel opensp-devel @@ -205,6 +204,7 @@ ruby ruby-devel sane-backends-devel scons +selinux-policy-devel shadow speex-devel sqlite3-devel diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg index 504e271c8..a0b374342 100644 --- a/redhat/docker/pclinuxos.pkg +++ b/redhat/docker/pclinuxos.pkg @@ -9,7 +9,12 @@ coreutils cpio cracklib-dicts crypto-policies +crypto-policies-scripts dash-static +db53-utils +db53_recover +lib64md +lib64sasl2 diffutils e2fsprogs fdupes @@ -17,6 +22,9 @@ file filesystem findutils fuse +curl +lib64archive +lib64kmod-devel fuse-common gawk gcrypt @@ -29,6 +37,7 @@ gzip icu icu69-data icu71-data +icu76-data info-install kernel-userspace-headers krb5 @@ -59,7 +68,7 @@ lib64fdisk1 lib64ffi6 lib64ffi8 lib64fuse2 -lib64fuse3_3 +lib64fuse3_4 lib64gcrypt20 lib64gdbm3 lib64gdk_pixbuf2.0_0 @@ -74,6 +83,7 @@ lib64gsasl lib64gudev1.0_0 lib64icu69 lib64icu71 +lib64icu76 lib64idn11 lib64idn2_0 lib64intl8 @@ -106,6 +116,7 @@ lib64nss3 lib64ntlm lib64openssl1.0.0 lib64openssl1.1.0 +lib64openssl3 lib64opts25 lib64pam0 lib64pam_userpass1 @@ -123,6 +134,7 @@ lib64rpm1 lib64rtmp1 lib64sasl2 lib64secret1_0 +lib64seccomp lib64selinux lib64sharpyuv0 lib64sigsegv2 @@ -137,7 +149,7 @@ lib64tirpc3 lib64udev0 lib64udev lib64unbound8 -lib64unistring2 +lib64unistring5 lib64usb1.0_0 lib64usb-compat0.1_4 lib64uuid1 @@ -152,9 +164,17 @@ lib64zstd1 libgcc1 libgomp1 libidn2-i18n +lib64json-c libnotify +lib64nsl +lib64assuan +lib64archive13 +lib64subid +libsecret-i18n +libsecret-tools libstdc++6 libtirpc +lib64user libxcb lsb-release makedev @@ -168,6 +188,7 @@ openssl p11-kit pam pam_tcb +passwd patch perl perl-base @@ -180,13 +201,14 @@ popt-data procps publicsuffix-list-dafsa python3 +python3-markdown python3-rpm-macros +python3-typogrify rmt rootcerts rpm rpm-helper rpm-pclinuxos-setup -rpm-rambo-setup run-parts sd sed @@ -201,3 +223,18 @@ uuidd which xz zlib1 +zlib1-devel +lib64zstd-devel +lib64lzma-devel +kmod +lib64openssl-devel +python3-toml +lib64gnutls-dane +dkms +lib64sasl2_3 +nss_ldap +kernel-devel +dkms-minimal +lib64lzo2_2 +lib64bb2_1 + diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh index c4efb8f12..89f946a8c 100755 --- a/redhat/docker/pclinuxos.sh +++ b/redhat/docker/pclinuxos.sh @@ -1,11 +1,12 @@ #!/bin/bash -ex NAME="pclinuxos" -VERSION="${1:-2024}" # E.g: '2020' +VERSION="${1:-2025}" # E.g: '2020' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" [ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip +grep -qw "${INSTALLROOT}/dev/shm" /proc/mounts && sudo umount "${INSTALLROOT}/dev/shm" grep -qw "${INSTALLROOT}/dev" /proc/mounts && sudo umount "${INSTALLROOT}/dev" sudo rm -rf "${INSTALLROOT}" sudo mkdir -p "${INSTALLROOT}" diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 5e59d115f..abb4b6e46 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,6 +1,6 @@ -FROM pclinuxos:2024 +FROM pclinuxos:2025 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Update distribution @@ -13,52 +13,30 @@ RUN set -x \ && apt-get -y install $(</packages) # Add rpmbuild repositories -COPY rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list -RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" - # Fix SUDO configuration -RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" - # Fix utempter detection -RUN chmod a+r /usr/libexec/utempter/utempter +COPY rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list +RUN set -x \ + && sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" \ + && sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" \ + && chmod a+r /usr/libexec/utempter/utempter # Fix missing '.la' files COPY genla.sh /usr/bin/genla.sh -RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ +RUN set -x \ + && genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ && genla.sh libjpeg \ && genla.sh liblcms \ && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la # Add non-root user to build packages -RUN rm -rf /home/trinity \ +RUN set -x \ + && rm -rf /home/trinity \ && useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \ && echo "export QA_RPATHS=\$(( 0x0001|0x0002|0x0020 ))" >>/home/trinity/.bashrc USER trinity +RUN set -x \ + && mkdir -p ${HOME}/rpmbuild COPY rpmmacros /home/trinity/.rpmmacros - -# Build supplementary development tools -RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/torsocks-2.3.0-2.mga8.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec \ - && 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 \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \ - && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm - -RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/rpcsvc-proto-1.4-1.mga8.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec -e "s|%autosetup .*|%setup -q|" -e "s|%configure|%configure2_5x|" -e "s|%license|%doc|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec \ - && 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|%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 --force /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm diff --git a/redhat/docker/pclinuxos/external-packages.sh b/redhat/docker/pclinuxos/external-packages.sh new file mode 100644 index 000000000..dd8043c30 --- /dev/null +++ b/redhat/docker/pclinuxos/external-packages.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# Build supplementary development tools +rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/torsocks-2.3.0-2.mga8.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm + +rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/cscope-15.9-2.mga8.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm + +rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/rpcsvc-proto-1.4-1.mga8.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec -e "s|%autosetup .*|%setup -q|" -e "s|%configure|%configure2_5x|" -e "s|%license|%doc|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/rpcgen-1*.rpm + +rpm -ivh 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 + +rpm -ivh 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|%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 --force /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index e0e5fb2ba..8f8e07778 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -120,11 +120,12 @@ libofa-devel libofx-devel libotr-devel libpaper-devel -lib64png1.6-devel +lib64png-devel libpqxx-devel libpthread-stubs libpulseaudio-devel libqalculate-devel +lib64raptor-devel libraw1394-devel librsvg librsync-devel @@ -136,6 +137,7 @@ libt1lib-devel libtheora-devel libtirpc-devel libudev-devel +lib64unibreak-devel libuuid-devel libv4l-devel libvisual-devel @@ -167,7 +169,6 @@ neon-devel net-snmp-devel netpbm ocaml -OpenEXR-devel openldap-devel openldap-servers opensc @@ -187,9 +188,11 @@ ppp pth-devel python3 python3-devel +python3-setuptools python-rpm qt4-devel recode +rpcgen rpm-build rpm-devel ruby-devel diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh index 75cc62be2..021f80130 100755 --- a/redhat/docker/pull.sh +++ b/redhat/docker/pull.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.5" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh index 9a8925430..888cd856f 100755 --- a/redhat/docker/push.sh +++ b/redhat/docker/push.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.5" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/rawhide/Dockerfile.x86_64 b/redhat/docker/rawhide/Dockerfile.x86_64 index 8f92141e5..1c77d92e9 100644 --- a/redhat/docker/rawhide/Dockerfile.x86_64 +++ b/redhat/docker/rawhide/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:rawhide -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption @@ -10,7 +10,7 @@ COPY packages /packages RUN set -x \ && echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ && dnf -y install dnf-plugin-ovl findutils \ - && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-rawhide.noarch.rpm \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-44.noarch.rpm \ && dnf -y --enableplugin=ovl update \ && dnf -y --enableplugin=ovl install --skip-broken $(</packages) @@ -32,15 +32,3 @@ RUN set -x \ USER trinity COPY rpmmacros /home/trinity/.rpmmacros - -RUN set -x \ - && rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* - -#RUN set -x \ -# && rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ -# && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \ -# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \ -# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2* diff --git a/redhat/docker/rawhide/external-packages.sh b/redhat/docker/rawhide/external-packages.sh new file mode 100644 index 000000000..7a0c3fa36 --- /dev/null +++ b/redhat/docker/rawhide/external-packages.sh @@ -0,0 +1,12 @@ +#!/bin/bash -ex + +rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm +sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" +rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec +sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +#RUN set -x \ +# && rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ +# && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \ +# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2* diff --git a/redhat/docker/rawhide/packages b/redhat/docker/rawhide/packages index 872963678..8367d3d92 100644 --- a/redhat/docker/rawhide/packages +++ b/redhat/docker/rawhide/packages @@ -28,6 +28,7 @@ createrepo_c cryptsetup-devel cups-devel dbus-glib-devel +desktop-backgrounds-compat djvulibre djvulibre-devel dnf-plugin-ovl @@ -172,7 +173,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/rawhide/rpmmacros b/redhat/docker/rawhide/rpmmacros index 0b82d6547..41e776b5d 100644 --- a/redhat/docker/rawhide/rpmmacros +++ b/redhat/docker/rawhide/rpmmacros @@ -1,4 +1,4 @@ -%dist .fc43 +%dist .fc44 %_smp_mflags -j8 %jobs 8 %__brp_remove_la_files %nil diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh index 864881b55..35f408c09 100755 --- a/redhat/docker/remove.sh +++ b/redhat/docker/remove.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.5" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index 26719c6a6..39371228b 100755 --- a/redhat/docker/run.sh +++ b/redhat/docker/run.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.5" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker @@ -30,7 +30,7 @@ ${DOCKER} run -ti --rm \ --name "${IMAGE//:/-}" \ -v /dev/shm/${DOCKER}:/tmp:z \ -u trinity \ - --userns keep-id:uid=1000,gid=1000 \ + --userns keep-id:uid="$(id -u)",gid="$(id -g)" \ -e TMPPATH=/tmp \ -e TDE_VERSION=${TDE_VERSION} \ -e TDE_BRANCH=${TDE_BRANCH} \ diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec index 804e23d00..ae6118326 100644 --- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec +++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_prefix /opt/trinity diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec index c382b7bd4..e5f08a886 100644 --- a/redhat/extras/pinentry-tqt/pinentry-tqt.spec +++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec @@ -83,7 +83,7 @@ if [ -d "/usr/include/libassuan2" ]; then export CFLAGS="%{optflags} -I/usr/include/libassuan2" fi -./autogen.sh +#./autogen.sh %if 0%{?mgaversion} == 6 || 0%{?mgaversion} == 7 || 0%{?pclinuxos} %configure2_5x \ diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index 082ae1739..00a207ce0 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -16,7 +16,7 @@ # %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". @@ -165,7 +165,7 @@ Requires: trinity-kooldock Requires: trinity-kopete-otr Requires: trinity-kpicosim %if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599 && 0%{?suse_version} != 1699 -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || ( 0%{?rhel} >= 6 && 0%{?rhel} <= 9 ) Requires: trinity-kpilot %endif %endif @@ -235,6 +235,9 @@ Requires: trinity-tderadio Requires: trinity-tdesshaskpass Requires: trinity-tdesudo Requires: trinity-tdesvn +%if 0%{?suse_version} <= 1699 +Requires: trinity-tdexsldbg +%endif Requires: trinity-tdmtheme Requires: trinity-tellico Requires: trinity-tork @@ -244,6 +247,8 @@ Requires: trinity-twin-style-fahrenheit Requires: trinity-twin-style-machbunt Requires: trinity-twin-style-mallory Requires: trinity-twin-style-suse2 +Requires: trinity-universal-indent-gui-tqt +Requires: trinity-xdg-desktop-portal-tde Requires: trinity-wlassistant Requires: trinity-yakuake diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec index 11f2ae9ea..144dc4ca2 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -257,6 +257,7 @@ done %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/hu/common %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/it/common %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/ja/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/nb/common %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/nl/common %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/pl/common %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/pt_BR/common diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec index bd7d1b234..24333b431 100644 --- a/redhat/libraries/kipi-plugins/kipi-plugins.spec +++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg kipi-plugins %define tde_prefix /opt/trinity @@ -109,7 +109,11 @@ BuildRequires: libgpod-devel >= 0.4.2 # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec index f6e60d06f..48f2d28be 100644 --- a/redhat/libraries/libkdcraw/libkdcraw.spec +++ b/redhat/libraries/libkdcraw/libkdcraw.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg libkdcraw %define tde_prefix /opt/trinity @@ -68,7 +68,11 @@ BuildRequires: gettext # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec index 6f35e7634..c7b98aa36 100644 --- a/redhat/libraries/libkexiv2/libkexiv2.spec +++ b/redhat/libraries/libkexiv2/libkexiv2.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg libkexiv2 %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec index bf448826a..32fb85b8f 100644 --- a/redhat/libraries/libkipi/libkipi.spec +++ b/redhat/libraries/libkipi/libkipi.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg libkipi %define tde_prefix /opt/trinity @@ -74,7 +74,11 @@ BuildRequires: gcc-c++ # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec index b97f7331d..d7f0eecca 100644 --- a/redhat/libraries/libksquirrel/libksquirrel.spec +++ b/redhat/libraries/libksquirrel/libksquirrel.spec @@ -26,7 +26,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg libksquirrel %define tde_prefix /opt/trinity @@ -93,17 +93,24 @@ BuildRequires: gettext-devel # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif # OPENEXR support +#define with_openexr 1 +%if 0%{?with_openexr} %if 0%{?mdkver} BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif +%endif # TIFF support %if 0%{?mdkver} @@ -280,8 +287,10 @@ This package contains the runtime libraries for KSquirrel. %{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0.8.0 %{tde_libdir}/ksquirrel-libs/libkls_neo.so.0 %{tde_libdir}/ksquirrel-libs/libkls_neo.so.0.8.0 +%if 0%{?with_openexr} %{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0 %{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0.8.0 +%endif %{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0 %{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0.8.0 %{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0 @@ -456,8 +465,10 @@ This package contains the development libraries for KSquirrel. %{tde_libdir}/ksquirrel-libs/libkls_mtv.so %{tde_libdir}/ksquirrel-libs/libkls_neo.la %{tde_libdir}/ksquirrel-libs/libkls_neo.so +%if 0%{?with_openexr} %{tde_libdir}/ksquirrel-libs/libkls_openexr.la %{tde_libdir}/ksquirrel-libs/libkls_openexr.so +%endif %{tde_libdir}/ksquirrel-libs/libkls_pcx.la %{tde_libdir}/ksquirrel-libs/libkls_pcx.so %{tde_libdir}/ksquirrel-libs/libkls_pi1.la @@ -609,6 +620,7 @@ fi \ -DBUILD_ALL=ON \ -DBUILD_DICOM=OFF \ + %{?!with_openexr:-DBUILD_OPENEXR=OFF} \ -DBUILD_PICT=OFF \ .. diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index 26696d0d9..955b01f4a 100644 --- a/redhat/libraries/libtdeldap/libtdeldap.spec +++ b/redhat/libraries/libtdeldap/libtdeldap.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg libtdeldap %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec index 81c1267f8..54a41b80b 100644 --- a/redhat/libraries/libtqt-perl/libtqt-perl.spec +++ b/redhat/libraries/libtqt-perl/libtqt-perl.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg libtqt-perl %define tde_prefix /opt/trinity diff --git a/redhat/libraries/pytde/pytde.spec b/redhat/libraries/pytde/pytde.spec index a2dd5c347..48f41a7da 100644 --- a/redhat/libraries/pytde/pytde.spec +++ b/redhat/libraries/pytde/pytde.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg pytde %define tde_prefix /opt/trinity diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index b54256784..5baa4917e 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg pytdeextensions %define tde_prefix /opt/trinity |
