diff options
Diffstat (limited to 'redhat')
295 files changed, 1684 insertions, 610 deletions
diff --git a/redhat/Makefile b/redhat/Makefile index 278311d8b..2c60577e4 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.2}) +TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.3}) 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))" @@ -27,7 +27,7 @@ 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 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 kaffeine-mozilla 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 tdebluez tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper 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-suse2 wlassistant yakuake +applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla 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 tdebluez tde-ebook-reader tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper 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 i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n ### Trinity Dependencies @@ -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 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv5000 )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .fc40 .fc41 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv5000 )) $(call buildpkg,extras/htdig) endif @@ -158,11 +158,6 @@ ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .mga9 .oss151 .oss152 .oss1 $(call buildpkg,3rdparty/lcms) endif -mp4v2: -ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw )) - $(call buildpkg,3rdparty/mp4v2) -endif - rdesktop: ifneq (,$(filter $(DIST), .oss150 )) $(call buildpkg,3rdparty/rdesktop) @@ -181,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)) +ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39 .fc40 .fc41 .omv2490 .omv5000)) $(call buildpkg,3rdparty/wv2) endif @@ -224,7 +219,7 @@ abakus: tdebase adept: tdebase $(call buildpkg,applications/system/adept) -amarok: tdebase mp4v2 +amarok: tdebase $(call buildpkg,applications/multimedia/amarok) basket: tdebase tdepim @@ -533,6 +528,9 @@ tdebluez: tdedocker: tdebase $(call buildpkg,applications/system/tdedocker) +tde-ebook-reader: + $(call buildpkg,applications/office/tde-ebook-reader) + tde-guidance: tdebase pytdeextensions $(call buildpkg,applications/settings/tde-guidance) @@ -626,13 +624,14 @@ twin-style-fahrenheit: tdebase twin-style-machbunt: tdebase $(call buildpkg,applications/themes/twin-style-machbunt) +twin-style-mallory: tdebase + $(call buildpkg,applications/themes/twin-style-mallory) + twin-style-suse2: tdebase $(call buildpkg,applications/themes/twin-style-suse2) wlassistant: tdebase -ifeq (,$(filter $(DIST), .omv2490 .omv5000 )) $(call buildpkg,applications/settings/wlassistant) -endif yakuake: tdebase $(call buildpkg,applications/system/yakuake) @@ -659,7 +658,7 @@ fileshareset: $(call buildpkg,extras/fileshareset) pinentry-tqt: tqtinterface -ifeq (,$(filter $(DIST), .el5 .el6 .el7 .omv2490 .omv5000 )) +ifeq (,$(filter $(DIST), .el5 .el6 .el7 )) $(call buildpkg,extras/pinentry-tqt) endif diff --git a/redhat/applications/development/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec index 0a0040b0d..9d5d9d766 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.2 +%define tde_version 14.1.3 %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 bd55c3ed1..8fe3eb463 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kdiff3 %define tde_prefix /opt/trinity diff --git a/redhat/applications/development/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec index a1a5cf4d6..666763abd 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kpicosim %define tde_prefix /opt/trinity diff --git a/redhat/applications/development/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec index 464bc87a9..76436fcf4 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kscope %define tde_prefix /opt/trinity diff --git a/redhat/applications/development/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec index b29b35c3c..6e07faaec 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg ktechlab %define tde_prefix /opt/trinity diff --git a/redhat/applications/development/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec index 02f005d10..722bf7148 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kxmleditor %define tde_prefix /opt/trinity diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec index 6c354769d..7d9a9ff0a 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg piklab %define tde_prefix /opt/trinity @@ -161,9 +161,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# Incorrect extension on manpage -%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1 - %find_lang %{tde_pkg} %clean diff --git a/redhat/applications/development/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec index f77bbd3b5..83c08ce66 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdesvn %define tde_prefix /opt/trinity diff --git a/redhat/applications/games/knights/knights.spec b/redhat/applications/games/knights/knights.spec index 5962f316b..04900ea48 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg knights %define tde_prefix /opt/trinity diff --git a/redhat/applications/games/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec index 3c4989111..efadf1bda 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.2 +%define tde_version 14.1.3 %endif # TDE specific building variables diff --git a/redhat/applications/graphics/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec index 16753d951..b5544f11b 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg digikam %define tde_prefix /opt/trinity diff --git a/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec index f4c3d5a2e..0375b7bad 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.2 +%define tde_version 14.1.3 %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 77b1fc987..fa43303b6 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg gwenview %define tde_prefix /opt/trinity diff --git a/redhat/applications/graphics/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec index 670670175..9d1b52790 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg ksquirrel %define tde_prefix /opt/trinity @@ -80,24 +80,20 @@ BuildRequires: brp-check-trinity %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel %endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-Mesa-libGLU -%endif %description diff --git a/redhat/applications/graphics/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec index db50315dc..5c3c98f68 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg potracegui %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec index 7d956ef72..e276c0e2e 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kasablanca %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec index 719fe4931..0714c129f 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kbiff %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec index 3c6ef1d42..8b58de494 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.2 +%define tde_version 14.1.3 %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 14ade96fd..6f616ca45 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg knmap %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec index 69f7bc141..5c2e23415 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg konversation %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec index 1bc95975d..4860fb5ff 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.2 +%define tde_version 14.1.3 %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 e1c7d3e1a..dfadbf498 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kshowmail %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec index fa2fbcb33..3a293b04e 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kstreamripper %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec index d67deae4f..c8835cfe4 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg ktorrent %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec index a4b2b7fcc..5123178d9 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kvirc %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec index 9983af3e4..e8746613a 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.2 +%define tde_version 14.1.3 %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 73799b17c..3b44dec32 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg smb4k %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec index 97c96d3a4..fa43fdd30 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tork %define tde_prefix /opt/trinity @@ -66,6 +66,12 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes +# GNUTLS +%if 0%{?pclinuxos} +BuildRequires: %{_lib}gcrypt-devel +BuildRequires: %{_lib}gnutls-devel +%endif + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -142,7 +148,9 @@ fi -DBUILD_ALL=ON \ -DWITH_ALL_OPTIONS=ON \ -DWITH_EMBEDDED_GEOIP=%{?with_embedded_geoip:ON}%{?!with_embedded_geoip:OFF} \ +%if 0%{?pclinuxos} == 0 -DWITH_GNUTLS=ON \ +%endif \ .. @@ -190,6 +198,6 @@ fi %{tde_datadir}/pixmaps/tork.xpm %{tde_mandir}/man1/tork.1* %{tde_mandir}/man1/torkarkollon.1* - +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/libkickermenu_tork.mo %changelog diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec index edb5ff5c9..81055418f 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.2 +%define tde_version 14.1.3 %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 986dec31c..0b25f7563 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.2 +%define tde_version 14.1.3 %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 b44904f44..b8c8e19ed 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kcmldap %define tde_prefix /opt/trinity @@ -100,7 +100,7 @@ BuildRequires: brp-check-trinity # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -128,7 +128,11 @@ BuildRequires: libheimdal-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec index cacb6565a..d6de3ddc9 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kcmldapcontroller %define tde_prefix /opt/trinity @@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -110,7 +110,11 @@ BuildRequires: libheimdal-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif @@ -163,9 +167,11 @@ This is a TDE control center module to manage users, groups, and machines in Ker %doc AUTHORS COPYING %{tde_bindir}/primaryrccertupdater %if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?rhel} >= 7 +%if 0%{?pclinuxos} == 0 %{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 diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec index 06875f9c1..ddd28993b 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kcmldapmanager %define tde_prefix /opt/trinity @@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -107,7 +107,11 @@ BuildRequires: libheimdal-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec index 10ea73152..cc1a95896 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kerberostray %define tde_prefix /opt/trinity @@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -107,7 +107,11 @@ BuildRequires: libheimdal-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec index d457bfd82..b36fa33c9 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg krecipes %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index 2f5b51151..d2099a9cf 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg amarok %define tde_prefix /opt/trinity @@ -89,7 +89,7 @@ BuildRequires: brp-check-trinity %endif # ALSA supportl -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -171,15 +171,19 @@ BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 # IFP support # IFP package is broken under PCLinuxOS. %if 0%{?pclinuxos} == 0 -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?fedora} && 0%{?fedora} <= 40 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_ifp 1 +%if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}ifp-devel +%else +BuildRequires: libifp-devel +%endif %endif %endif # KARMA support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 24090000 +%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 5000000 %define with_karma 1 BuildRequires: libkarma-devel BuildRequires: karma-sharp @@ -268,7 +272,7 @@ BuildRequires: xine-lib-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define with_xine 1 -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel @@ -290,14 +294,6 @@ BuildRequires: libxine-devel BuildRequires: trinity-akode-devel %endif -# MP4V2 support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%if 0%{?mdkver} < 24090000 -%define with_mp4v2 1 -BuildRequires: libmp4v2-devel -%endif -%endif - # ruby BuildRequires: ruby BuildRequires: ruby-devel @@ -547,7 +543,6 @@ fi %{?with_mtp:-DWITH_MTP=ON} \ %{?with_karma:-DWITH_RIOKARMA=ON} \ %{!?with_daap:-DWITH_DAAP=OFF} \ - %{?with_mp4v2:-DWITH_MP4V2=ON} \ %{?with_inotify:-DWITH_INOTIFY=ON} \ -DWITH_SYSTEM_SQLITE=ON \ -DBUILD_ALL=ON \ diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec index 8dad74e8c..5e521c061 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg codeine %define tde_prefix /opt/trinity @@ -81,7 +81,7 @@ BuildRequires: brp-check-trinity %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel diff --git a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec index ba760d943..1b4675d79 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg k3b-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec index ddbdf76df..38a308937 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg k3b %define tde_prefix /opt/trinity @@ -78,7 +78,7 @@ BuildRequires: brp-check-trinity %endif # ALSA supportl -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -91,7 +91,11 @@ BuildRequires: zlib-devel # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif @@ -152,7 +156,11 @@ Requires: cdrdao # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec index 69ac53556..b4ab09a5b 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg k9copy %define tde_prefix /opt/trinity @@ -89,24 +89,20 @@ BuildRequires: libdvdread-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel %endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-Mesa-libGLU -%endif %description diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec index 12eca9676..713da52e1 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.2 +%define tde_version 14.1.3 %endif # TDE specific building variables diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec index e445da856..b141a48b8 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kaffeine %define tde_prefix /opt/trinity @@ -80,7 +80,11 @@ BuildRequires: brp-check-trinity # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif @@ -143,7 +147,7 @@ BuildRequires: %{_lib}xcb-devel %if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_gstreamer 1 %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gstreamer-devel BuildRequires: %{_lib}gst-plugins-base1.0-devel %else @@ -169,7 +173,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec index 09a2fd48b..f089da96a 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kmplayer %define tde_prefix /opt/trinity @@ -84,7 +84,7 @@ BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} # GSTREAMER support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gstreamer-devel BuildRequires: %{_lib}gst-plugins-base1.0-devel %else @@ -109,7 +109,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel @@ -126,8 +126,12 @@ BuildRequires: libxine-devel # X11 stuff %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: libxt-devel +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}xv-devel +%else BuildRequires: libxv-devel %endif +%endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210 BuildRequires: libXv-devel %endif @@ -139,7 +143,7 @@ BuildRequires: xorg-x11-libXv-devel %endif # GTK2 stuff -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gtk+2.0-devel %else BuildRequires: gtk2-devel diff --git a/redhat/applications/multimedia/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec index c63c48e0d..39e58e5d1 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.2 +%define tde_version 14.1.3 %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 e1830719f..ab9995c26 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg mplayerthumbs %define tde_prefix /opt/trinity @@ -169,7 +169,7 @@ fi %{tde_datadir}/services/mplayer-thumbnailer.desktop %{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/ %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/mplayer-thumbnailer.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/mplayer-thumbnailer.mo - %changelog diff --git a/redhat/applications/multimedia/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec index 99fb2abbb..a83779ca3 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.2 +%define tde_version 14.1.3 %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 6b713c452..df18adfe4 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg soundkonverter %define tde_prefix /opt/trinity @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -133,40 +133,45 @@ See the 'trinity-soundkonverter' package for more information. %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} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --program-prefix="" \ +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} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} + -DWITH_ALL_OPTIONS=ON \ + %{?!with_dvb:-DWITH_DVB=OFF} \ + %{?!with_lame:-DWITH_LAME=OFF} \ + %{?!with_xcb:-DWITH_XCB=OFF} \ + -DBUILD_ALL=ON \ + .. + +%__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} @@ -182,9 +187,8 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/soundkonverter -%{tde_bindir}/userscript.sh %{tde_tdeappdir}/soundkonverter.desktop %{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop %{tde_datadir}/apps/soundkonverter diff --git a/redhat/applications/multimedia/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec index 8032ed76f..25ffc83ca 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tderadio %define tde_prefix /opt/trinity @@ -227,6 +227,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/locolor/*/*/tderadio*.png %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo %lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo %lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo %lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo diff --git a/redhat/applications/office/basket/basket.spec b/redhat/applications/office/basket/basket.spec index fa032db4d..b73722e11 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg basket %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec index f16cae934..12821aea3 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kbibtex %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec index 7add6600f..8b3d7a8b0 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kbookreader %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec index f1d311cd3..2bb2cb908 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.2 +%define tde_version 14.1.3 %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 e9e333318..cb2e66d2e 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kile %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec index 2be7ff5c0..a61cd1274 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kmymoney %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/knowit/knowit.spec b/redhat/applications/office/knowit/knowit.spec index 38e1219ca..dddeb4d9e 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg knowit %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/koffice-i18n/koffice-i18n.spec b/redhat/applications/office/koffice-i18n/koffice-i18n.spec index c21d72bf7..3eb696cb6 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.2 +%define tde_version 14.1.3 %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 ee072fad4..c629f36c2 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg koffice %define tde_prefix /opt/trinity @@ -48,6 +48,10 @@ # Required for Mageia 2: removes the ldflag '--no-undefined' %global _disable_ld_no_undefined 1 +%if 0%{?mdkver} >= 5000000 +%global build_cxxflags %optflags -Wl,--allow-shlib-undefined +%endif + Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} @@ -107,7 +111,11 @@ BuildRequires: readline-devel # EXIF support %if 0%{?mdkver} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}exif12-devel +%else BuildRequires: %{_lib}exif-devel +%endif %else BuildRequires: libexif-devel %endif @@ -210,7 +218,7 @@ BuildRequires: freetype-devel %if 0%{?mdkver} || 0%{?mgaversion} BuildRequires: %{_lib}png-devel %endif -%if 0%{?mdkversion} && 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0 +%if 0%{?mdkversion} && 0%{?mdkver} < 5000000 && 0%{?pclinuxos} == 0 BuildRequires: %{_lib}png15-devel %endif %if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} @@ -225,7 +233,11 @@ BuildRequires: GraphicsMagick >= 1.1.0 %endif %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} %if 0%{?mdkver} +%if 0%{?pclinuxos} +BuildRequires: graphicsmagick-devel +%else BuildRequires: %{_lib}graphicsmagick-devel +%endif %else BuildRequires: GraphicsMagick-devel >= 1.1.0 %endif @@ -293,32 +305,32 @@ Obsoletes: trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release} # WV2 support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} < 24090000 +%define with_wv2 1 +%if 0%{mdkver} >= 5000000 +BuildRequires: wv2-devel +%else BuildRequires: %{_lib}wv2-devel %endif %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%define with_wv2 1 BuildRequires: wv2-devel %endif # MESA support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0 -BuildRequires: %{_lib}mesagl-devel +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkver} >= 24090000 -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: %{_lib}mesaglu1-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: libGL-devel -BuildRequires: libGLU-devel -%endif -%if 0%{?suse_version} >= 1220 -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLU-devel +%if 0%{?suse_version} +BuildRequires: Mesa-libGL-devel +BuildRequires: Mesa-libGLU-devel %endif # LIBXI support @@ -883,7 +895,9 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_tdelibdir}/libwmlimport.* %{tde_tdelibdir}/libwpexport.* %{tde_tdelibdir}/libwpimport.* +%if 0%{?with_wv2} %{tde_tdelibdir}/libmswordimport.* +%endif %{tde_tdelibdir}/libxsltimport.* %{tde_tdelibdir}/libxsltexport.* %{tde_tdelibdir}/libhancomwordimport.* @@ -1189,10 +1203,18 @@ CXXFLAGS="${CXXFLAGS} -std=c++11" %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \ %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \ +# Ensure PQXX was detected (required by kexidb/pgsql) %if "%{?with_postgresql}" != "" -# Ensure PQXX was detected - +if grep 'S\["compile_pgsql_plugin_TRUE"\]="#"' config.status; then + exit 1 +fi +%endif +# Ensure WV2 was detected +%if 0%{?with_wv2} +if grep 'S\["include_wv2_msword_filter_TRUE"\]="#"' config.status; then + exit 2 +fi %endif %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/office/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec index 828963b48..3719d4efb 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kpilot %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec b/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec new file mode 100644 index 000000000..548177403 --- /dev/null +++ b/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec @@ -0,0 +1,251 @@ +# +# spec file for package tde-ebook-reader (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.3 +%endif +%define tde_pkg tde-ebook-reader +%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.99.6 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: e-book reader for TDE +Group: Applications/Publishing +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: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: gettext + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# UNIBREAK support +%if 0%{?mgaversion} || 0%{?mdkver} >= 5000000 || 0%{?pclinuxos} +BuildRequires: %{_lib}unibreak-devel +%else +BuildRequires: libunibreak-devel +%endif + +# 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 +tde-ebook-reader is an e-book reader for TDE. + +Main features: + * supports several open e-book formats: fb2, html, chm, plucker, + palmdoc, ztxt, tcr (psion text), rtf, oeb, openreader, non-DRM'ed + mobipocket, plain text, epub, eReader + * reads directly from tar, zip, gzip, bzip2 archives (you can have + several books in one archive) + * supports a structured view of your e-book collection + * automatically determines encodings + * automatically generates a table of contents + * keeps the last open book and the last read positions for all open books + between runs + * automatic hyphenation (patterns for several languages are included) + * searching and downloading books from www.feedbooks.com and www.litres.ru + * partial CSS support for epub files + +%files +%defattr(-,root,root,-) +%{tde_bindir}/tde-ebook-reader +%{tde_tdeappdir}/tde-ebook-reader.desktop +%{tde_datadir}/apps/tde-ebook-reader/ +%{tde_mandir}/man1/tde-ebook-reader.1* + +########## + +%package -n libzlcore-tqt +Requires: libzlcore-data-tqt +Summary: Summary: TQt3-based development library (shared library) + +%description -n libzlcore-tqt +This is the core of Summary: , the library that tde-ebook-reader is based on. + +%files -n libzlcore-tqt +%{tde_libdir}/libzlcore-tqt.so.* + +########## + +%package -n libzlcore-tqt-devel +Requires: libzlcore-tqt +Summary: TQt3-based development library (development files) + +%description -n libzlcore-tqt-devel +This package contains development files for the Summary: core. + +%files -n libzlcore-tqt-devel +%{tde_includedir}/zlibrary-tqt/core +%{tde_libdir}/libzlcore-tqt.la +%{tde_libdir}/libzlcore-tqt.so + +########## + +%package -n libzlcore-data-tqt +Summary: TQt3-based development library (support files) + +%description -n libzlcore-data-tqt +This package contains the support files for the core of Summary: , the library +that the fbreader e-book reader is based on. + +%files -n libzlcore-data-tqt +%{tde_datadir}/zlibrary-tqt/keynames.desktop-tqt.xml +%{tde_datadir}/zlibrary-tqt/languagePatterns.zip +%{tde_datadir}/zlibrary-tqt/unicode.xml.gz +%{tde_datadir}/zlibrary-tqt/default/ +%{tde_datadir}/zlibrary-tqt/encodings/ +%{tde_datadir}/zlibrary-tqt/resources/ + +########## + +%package -n libzltext-tqt +Requires: libzlcore-tqt +Requires: libzltext-data-tqt +Summary: TQt3-based text model/viewer part (shared library) + +%description -n libzltext-tqt +This package provides text model/viewer part of Summary: . + +%files -n libzltext-tqt +%{tde_libdir}/libzltext-tqt.so.* + +########## + +%package -n libzltext-tqt-devel +Requires: libzltext-tqt +Summary: TQt3-based text model/viewer part (development files) + +%description -n libzltext-tqt-devel +This package contains development files for the Summary: text model/viewer +library. + +%files -n libzltext-tqt-devel +%{tde_includedir}/zlibrary-tqt/text +%{tde_libdir}/libzltext-tqt.la +%{tde_libdir}/libzltext-tqt.so + +########## + +%package -n libzltext-data-tqt +Summary: TQt3-based text model/viewer part (support files) + +%description -n libzltext-data-tqt +This package contains the support files for the text model/viewer part +of Summary: . + +%files -n libzltext-data-tqt +%{tde_datadir}/zlibrary-tqt/hyphenationPatterns.zip + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +# Warning: GCC visibility causes the KCM not to work at all ! +%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_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + .. + +%__make %{?_smp_mflags} + + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + + +%clean +%__rm -rf %{buildroot} + + + +%changelog diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec index e51a25226..dbaad0cc2 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.2 +%define tde_version 14.1.3 %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 b5dcaed59..5565798d5 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kima %define tde_prefix /opt/trinity @@ -81,7 +81,11 @@ BuildRequires: brp-check-trinity %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec index 0fae4bcdc..59c3f32ca 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kiosktool %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec index 81cea639a..b16c72e5f 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec index 00dc8836c..599e73ed3 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.2 +%define tde_version 14.1.3 %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 16d3e34ca..725b5ae63 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kmyfirewall %define tde_prefix /opt/trinity @@ -144,6 +144,7 @@ university etc.) %{tde_datadir}/mimelnk/application/kmfnet.desktop %{tde_datadir}/mimelnk/application/kmfpkg.desktop %{tde_datadir}/mimelnk/application/kmfrs.desktop +%{tde_datadir}/pixmaps/kmyfirewall.xpm %{tde_datadir}/services/kmf*.desktop %{tde_datadir}/servicetypes/kmf*.desktop %{tde_mandir}/man1/kmyfirewall.1* diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index ccacc149f..7931960ba 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tde-guidance %define tde_prefix /opt/trinity @@ -183,7 +183,7 @@ or can be run as standalone applications. %{tde_datadir}/apps/guidance/ %{tde_tdeappdir}/*.desktop %{tde_datadir}/icons/crystalsvg/*/*/*.png -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitelib}/tde-guidance/SMBShareSelectDialog.py* %{python_sitelib}/tde-guidance/SimpleCommandRunner.py* %{python_sitelib}/tde-guidance/fuser.py* @@ -249,7 +249,7 @@ Guidance configuration tools. %files backends %defattr(-,root,root,-) %dir %{python_sitelib}/tde-guidance -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitelib}/tde-guidance/MicroHAL.py* %if 0%{?rhel} == 7 %{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc @@ -377,6 +377,13 @@ fi %__rm -fr $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build +%if 0%{?pclinuxos} +if [ ! -d %{?buildroot}%{python_sitelib} ]; then + mkdir -p %{?buildroot}%{python_sitelib} + mv %{?buildroot}/tde-guidance %{?buildroot}%{python_sitelib} +fi +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec index 39cf4c8dc..b56f76f6b 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tde-systemsettings %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec index 78b5236f7..0fc10afac 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdenetworkmanager %define tde_prefix /opt/trinity @@ -141,7 +141,11 @@ BuildRequires: libacl-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec index e14e40149..320dcecb6 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.2 +%define tde_version 14.1.3 %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 b60b75b61..389e33999 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg wlassistant %define tde_prefix /opt/trinity @@ -82,8 +82,12 @@ BuildRequires: brp-check-trinity BuildRequires: wireless-tools-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mdkversion} +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}iw-devel +%else BuildRequires: %{_lib}iw29-devel %endif +%endif %if 0%{?rhel} == 5 || 0%{?suse_version} BuildRequires: wireless-tools %endif diff --git a/redhat/applications/system/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec index b9278b00a..14b9f8859 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.2 +%define tde_version 14.1.3 %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 ec9756fd2..7cb34c443 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg katapult %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec index 849735a3c..04569ac72 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kbfx %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec index fcf85ed7d..66bcf81ac 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.2 +%define tde_version 14.1.3 %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 693084f0d..5692d7df0 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kdbusnotification %define tde_prefix /opt/trinity @@ -75,7 +75,7 @@ BuildRequires: brp-check-trinity %endif # GTK2 stuff -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gtk+2.0-devel %else BuildRequires: gtk2-devel @@ -183,7 +183,7 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %{tde_bindir}/notification-daemon-tde %{tde_datadir}/autostart/kdbusnotification-autostart.desktop - +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/notification-daemon-tde.mo %changelog diff --git a/redhat/applications/system/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec index 4b892dcf1..9c57102a4 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.2 +%define tde_version 14.1.3 %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 0b8398d96..85f9290fa 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.2 +%define tde_version 14.1.3 %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 3eccc8401..d6ef0c47d 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg knetload %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec index 7f8f0a3ce..d53d39a63 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg knetstats %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/kooldock/kooldock.spec b/redhat/applications/system/kooldock/kooldock.spec index 36cc07ac7..ebf0babcf 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.2 +%define tde_version 14.1.3 %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 e07247721..63daa7b8d 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg krusader %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec index ef3ca8ff9..dc96e8383 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kshutdown %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec index 6af7a8049..39c47669b 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.2 +%define tde_version 14.1.3 %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 74a5caa52..1933d7b1c 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kvkbd %define tde_prefix /opt/trinity 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 790250940..d3e5c970e 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.2 +%define tde_version 14.1.3 %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 0bb7cda1f..05aecf32b 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.2 +%define tde_version 14.1.3 %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 1956800a0..0f424f19c 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.2 +%define tde_version 14.1.3 %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 7bffd6839..968775950 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.2 +%define tde_version 14.1.3 %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 811015d8d..3f135f43d 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdedocker %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec index ebbce92b3..2056b32ac 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdepowersave %define tde_prefix /opt/trinity @@ -83,7 +83,11 @@ BuildRequires: brp-check-trinity %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec index 93761e347..737b69d36 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdesshaskpass %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec index bacb6c882..de683456a 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.2 +%define tde_version 14.1.3 %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 aa49a5634..5fd2f83cb 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdeio-appinfo %define tde_prefix /opt/trinity @@ -164,6 +164,7 @@ fi %{tde_tdelibdir}/tdeio_appinfo.la %{tde_tdelibdir}/tdeio_appinfo.so %{tde_datadir}/services/appinfo.protocol +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/tdeio_appinfo.mo %changelog diff --git a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec index f4631631e..4bcfd0847 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.2 +%define tde_version 14.1.3 %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 8dc6b9097..09d230d94 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.2 +%define tde_version 14.1.3 %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 18dab2b6b..18305127a 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.2 +%define tde_version 14.1.3 %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 c58492e13..1b5162e7a 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.2 +%define tde_version 14.1.3 %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 5881bdfbe..e5bb575cd 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.2 +%define tde_version 14.1.3 %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 73a3a7b33..bfbc35a01 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.2 +%define tde_version 14.1.3 %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 833a7dcd9..9b756a0c0 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.2 +%define tde_version 14.1.3 %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 43c565fd1..c6f07f0eb 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.2 +%define tde_version 14.1.3 %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 029d46345..a542807e9 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.2 +%define tde_version 14.1.3 %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 1d2ae2a1a..f641c7923 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.2 +%define tde_version 14.1.3 %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 588d43858..bccf63375 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.2 +%define tde_version 14.1.3 %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 eb1c1224d..97df070c5 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tde-style-baghira %define tde_prefix /opt/trinity @@ -199,6 +199,8 @@ export PATH="%{tde_bindir}:${PATH}" %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo %lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/baghira-usermanager.mo %lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/baghira-usermanager.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/baghira-kmenuapplet.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/baghira-switcher.mo %{tde_mandir}/man1/bab.1* 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 7bde60350..af4c8ab97 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.2 +%define tde_version 14.1.3 %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 8f6d5dbea..cdbcec24c 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.2 +%define tde_version 14.1.3 %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 351022128..90bf4d437 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.2 +%define tde_version 14.1.3 %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 fe9f3ef40..5bd3ba294 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.2 +%define tde_version 14.1.3 %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 c6c675070..0c8a2be89 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.2 +%define tde_version 14.1.3 %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 94a76585f..061490dbb 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.2 +%define tde_version 14.1.3 %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 2397c1ed6..b00a857ac 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.2 +%define tde_version 14.1.3 %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 c522aa406..57f409393 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.2 +%define tde_version 14.1.3 %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 6c440c0fe..4125b0989 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg twin-style-fahrenheit %define tde_prefix /opt/trinity @@ -153,6 +153,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/twin/fahrenheit/minmax.png %{tde_datadir}/apps/twin/fahrenheit/sticky.png %{tde_datadir}/apps/twin/fahrenheit/unsticky.png +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin-style-fahrenheit.mo %changelog 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 dc504b67a..ef1f31f47 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.2 +%define tde_version 14.1.3 %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 new file mode 100644 index 000000000..77192b4ed --- /dev/null +++ b/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec @@ -0,0 +1,152 @@ +# +# spec file for package twin-style-mallory (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.3 +%endif +%define tde_pkg twin-style-mallory +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.5 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE window decoration from SUSE 9.3 +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE. + +It features in additon to the original theme several new button +styles and a changeable titlebar image. + +A color scheme for TDE is provided too. + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README TODO +%{tde_tdelibdir}/twin3_mallory.la +%{tde_tdelibdir}/twin3_mallory.so +%{tde_tdelibdir}/twin_mallory_config.la +%{tde_tdelibdir}/twin_mallory_config.so +%{tde_datadir}/apps/tdedisplay/color-schemes/Mallory* +%{tde_datadir}/apps/twin/mallory.desktop + + +%changelog 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 d688430b5..a6040fb9e 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.2 +%define tde_version 14.1.3 %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 4e11d387e..595861038 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg abakus %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec index 32825f481..323d41336 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg filelight %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec index 6164dc971..e33738d66 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kbarcode %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec index b3c11038d..86b45a6ce 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kchmviewer %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec index 04cc9a1cd..94ffe796b 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kcpuload %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec index 08cd58522..2cdcbccf6 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kdirstat %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec index d76f6b613..a33fb16b0 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg keep %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec index 2f96d7d0b..ee4aee8e9 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.2 +%define tde_version 14.1.3 %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 cc39c7652..1dea01897 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.2 +%define tde_version 14.1.3 %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 e9d65c5a4..b8ce5616d 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.2 +%define tde_version 14.1.3 %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 5b1b0e216..45970f28a 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg krename %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec index f9f515aa2..af33e3820 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg ksensors %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec index be04a512f..85ca878ac 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.2 +%define tde_version 14.1.3 %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 a343befe6..c742bed1c 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg qalculate-tde %define tde_prefix /opt/trinity diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 895f791e5..96be4d1d8 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -1,12 +1,12 @@ #!/bin/bash -ex # Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION] -# Example: build_rpm_package.sh tdebase 14.1.2 +# Example: build_rpm_package.sh tdebase 14.1.3 PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" 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 a2e6698ad..b6c297550 100755 --- a/redhat/build/configure_repository.sh +++ b/redhat/build/configure_repository.sh @@ -1,6 +1,6 @@ -#!/bin/bash -x +#!/bin/bash -TDE_VERSION="${1:-${TDE_VERSION:-14.1.2}}" +TDE_VERSION="${1:-${TDE_VERSION:-14.1.3}}" 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 d1ecdb3b0..ed541d2cb 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -1,11 +1,11 @@ #!/bin/bash # Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION> -# Example: gather_rpm_sources.sh tdebase 14.1.2 /tmp/tdebase +# Example: gather_rpm_sources.sh tdebase 14.1.3 /tmp/tdebase PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" DIST="$(rpmdist.sh --dist)" @@ -41,4 +41,9 @@ if [ -d "${PATCHDIR}" ]; then fi fi -exit $RET +if [ "${DIST}" = ".fc41" ] || [ "${DIST}" = ".mga9" ] || [ "${DIST}" = ".omv5000" ] || [ "${DIST}" = ".osstw" ] || [ "${DIST:0:6}" = ".pclos" ]; then + sed -i "${TARGETDIR}/"*".spec" \ + -e "s|%patch|%patch -P |g" +fi + +exit 0 diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh index bbb18b0cd..b0d6a637f 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.2-0_pre727+6be06b3d.mga3.opt +# Sample package name: trinity-tdelibs-14.1.3-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 51c46e476..b6c31138e 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.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" 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 1f3cebbfe..9fe197108 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.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 @@ -12,9 +12,9 @@ RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION}) pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")" pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")" -# Application packages: version does not match TDE version -if [[ "${pkg_release}" =~ ^0_ ]] || [[ "${pkg_release}" =~ _0_ ]]; then - # Preversion +# Preversion +if [ "${pkg_release:0:2}" = "0_" ] || [[ "${pkg_release}" =~ _0_ ]]; then + # Application packages: version does not match TDE version if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then # Likely application package eval VERSION="${pkg_release/0_/\~}" diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index 66429b0d7..26a806f66 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.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" [ -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 a2c89cfb8..851f04d2f 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.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index 3f42de99d..029d8ea6f 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.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" DIST="$3" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 @@ -39,4 +39,4 @@ while read var val; do done ;; esac -done < "${SPECFILE}" +done < "${SPECFILE}" | sort -u diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh index a1ba33449..83e9529c2 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.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" [ -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 e32d7c00f..47cf63c9a 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.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" [ -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 70432b442..e0107c49f 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.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" 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 997b1f99d..079eaf387 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.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION}) TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION}) diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh index 5a8a13eb4..da0c48478 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.2}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.3}}" LOCKFILE="/tmp/lock.${0##*/}" while [ -e "${LOCKFILE}" ]; do @@ -28,7 +28,7 @@ elif [ -x /usr/bin/dnf ]; then REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)' elif [ -x /usr/bin/zypper ]; then REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)' - #REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${DIST}/ && cd /tmp/rpm${DIST}; umask 0000; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${DIST}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)' + REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${DIST}/ && cd /tmp/rpm${DIST}; umask 0000; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${DIST}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)' elif [ -x /usr/bin/yum ]; then if [ "${DIST}" = ".el5" ]; then REPOUPDATE='(cd ${RPMDIR}; ${createrepo} ${ARCH} & ${createrepo} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' diff --git a/redhat/core/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec index 34bbf3a4b..21c7b6a55 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.2 +%define tde_version 14.1.3 %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 35b6e2804..7d0313659 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdeaccessibility %define tde_prefix /opt/trinity @@ -95,7 +95,7 @@ BuildRequires: trinity-akode-devel %endif # ALSA support -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec index a11c0c654..bf192bb54 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdeaddons %define tde_prefix /opt/trinity @@ -94,7 +94,7 @@ BuildRequires: SDL-devel %endif # ALSA supportl -%if 0%{?mdkver} >= 24090000 +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel diff --git a/redhat/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec index 322b8e869..e4b958cb5 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdeadmin %define tde_prefix /opt/trinity diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec index ab1e7c3cb..7e07ac58b 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdeartwork %define tde_prefix /opt/trinity @@ -85,24 +85,20 @@ BuildRequires: libacl-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel %endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-Mesa-libGLU -%endif # LIBART support %define with_libart 1 diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc41 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc41 new file mode 120000 index 000000000..bcd188214 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc41 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.tde.omv5000 b/redhat/core/tdebase/pamd.kcheckpass-trinity.omv index 9e0557414..9e0557414 100644 --- a/redhat/core/tdebase/pamd.tde.omv5000 +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.omv diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2024 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2024 new file mode 120000 index 000000000..ad0fc6da6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2024 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.pclos2018
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc41 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc41 new file mode 120000 index 000000000..9d4df92f4 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc41 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.omv b/redhat/core/tdebase/pamd.kdm-trinity-np.omv new file mode 100644 index 000000000..9e0557414 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.omv @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth include system-auth +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session required pam_loginuid.so diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2024 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2024 new file mode 120000 index 000000000..5cde6e2c5 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2024 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.pclos2018
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc41 b/redhat/core/tdebase/pamd.kdm-trinity.fc41 new file mode 120000 index 000000000..5022f14ef --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc41 @@ -0,0 +1 @@ +pamd.kdm-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.omv b/redhat/core/tdebase/pamd.kdm-trinity.omv new file mode 100644 index 000000000..9e0557414 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.omv @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth include system-auth +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session required pam_loginuid.so diff --git a/redhat/core/tdebase/pamd.kdm-trinity.pclos2024 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2024 new file mode 120000 index 000000000..fcc6957f7 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2024 @@ -0,0 +1 @@ +pamd.kdm-trinity.pclos2018
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc41 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc41 new file mode 120000 index 000000000..a7b20accd --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc41 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.omv b/redhat/core/tdebase/pamd.kscreensaver-trinity.omv new file mode 100644 index 000000000..9e0557414 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.omv @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth include system-auth +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session required pam_loginuid.so diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2024 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2024 new file mode 120000 index 000000000..31d43e302 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2024 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.pclos2018
\ No newline at end of file diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index c1dcce65c..44ead0cbd 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdebase %define tde_prefix /opt/trinity @@ -63,13 +63,16 @@ Source1: %{name}-rpmlintrc # Pam configuration files for RHEL / Fedora %if 0%{?suse_version} == 0 -%if 0%{?mdkver} -Source2: pamd.tde.omv5000 +%if 0%{?mdkver} >= 5000000 +Source2: pamd.kdm-trinity.omv +Source3: pamd.kdm-trinity-np.omv +Source4: pamd.kcheckpass-trinity.omv +Source5: pamd.kscreensaver-trinity.omv %else -Source2: pamd.kdm-trinity%{?pamd_suffix} -Source3: pamd.kdm-trinity-np%{?pamd_suffix} -Source4: pamd.kcheckpass-trinity%{?pamd_suffix} -Source5: pamd.kscreensaver-trinity%{?pamd_suffix} +Source2: pamd.kdm-trinity%{?dist} +Source3: pamd.kdm-trinity-np%{?dist} +Source4: pamd.kcheckpass-trinity%{?dist} +Source5: pamd.kscreensaver-trinity%{?dist} %endif %endif @@ -128,7 +131,11 @@ BuildRequires: brp-check-trinity # Fedora Theme %if 0%{?fedora} Requires: f%{?fedora}-backgrounds-base +%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: fedora-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png %endif @@ -192,7 +199,7 @@ Requires: mandriva-theme %endif # OpenMandriva -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 Requires: distro-release-theme %define tde_bg /usr/share/wallpapers/default.png %endif @@ -231,7 +238,7 @@ BuildRequires: fdupes BuildRequires: htdig # OPENSSL support -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openssl-devel %else BuildRequires: openssl-devel @@ -241,7 +248,7 @@ BuildRequires: openssl-devel BuildRequires: audiofile-devel # ALSA supportl -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -255,8 +262,12 @@ BuildRequires: libraw1394-devel %endif # VORBIS support -%if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?mdkver} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif @@ -268,9 +279,16 @@ BuildRequires: glib2-devel # PCRE support BuildRequires: pcre-devel +# PCRE2 support +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif + # SASL support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}sasl-devel %else BuildRequires: %{_lib}sasl2-devel @@ -297,7 +315,7 @@ BuildRequires: libusb-devel %endif # ESOUND support -#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} #define with_esound 1 #BuildRequires: esound-devel #endif @@ -307,14 +325,14 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define with_gamin 1 BuildRequires: gamin-devel %endif # OPENLDAP support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -328,7 +346,7 @@ BuildRequires: openldap24-libs-devel %endif # SENSORS support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} BuildRequires: lm_sensors-devel %endif %if 0%{?suse_version} @@ -337,12 +355,16 @@ BuildRequires: libsensors4-devel # TSAK support (requires libudev-devel) # On RHEL5, udev is built statically, so TSAK cannot build. -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version} %if 0%{?suse_version} >= 1310 BuildRequires: udev %endif -%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif @@ -359,13 +381,13 @@ BuildRequires: libacl-devel # XRANDR support # On RHEL5, xrandr library is too old. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version} %define with_xrandr 1 %endif # XTEST support # On RHEL4, xtest library is too old. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xtest 1 %endif @@ -378,9 +400,9 @@ BuildRequires: hal-devel >= 0.5 # OPENEXR support # Disabled on RHEL4 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_exr 1 -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel @@ -394,7 +416,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%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -416,7 +438,7 @@ BuildRequires: xscreensaver-data BuildRequires: xscreensaver-data-extra %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?mgaversion} >= 4 BuildRequires: %{_lib}xscrnsaver-devel %else @@ -433,21 +455,20 @@ BuildRequires: xscreensaver-gl # AVAHI support # Disabled on RHEL4 and RHEL5 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version} BuildRequires: libavahi-tqt-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel @@ -478,7 +499,7 @@ BuildRequires: libart_lgpl-devel %if 0%{?rhel} == 4 BuildRequires: samba-common %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} %if 0%{?mdkver} BuildRequires: %{_lib}smbclient-devel %else @@ -487,7 +508,7 @@ BuildRequires: libsmbclient-devel %endif # IMAKE -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1220 BuildRequires: imake %endif @@ -495,19 +516,19 @@ BuildRequires: imake %if 0%{?suse_version} == 1140 BuildRequires: xorg-x11-libxkbfile-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210 -%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1210 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xkbfile-devel %else BuildRequires: libxkbfile-devel %endif -%if 0%{?fedora} || 0%{?mdkver} || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?mdkver} >= 5000000 || 0%{?rhel} >= 7 BuildRequires: xkeyboard-config-devel %endif %endif # XDMCP support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?mgaversion} >= 4 BuildRequires: %{_lib}xdmcp-devel %else @@ -519,7 +540,7 @@ BuildRequires: libXdmcp-devel %endif # XTST support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?mgaversion} >= 4 %define xtst_devel %{_lib}xtst-devel %else @@ -532,7 +553,7 @@ BuildRequires: libXdmcp-devel %{?xtst_devel:BuildRequires: %{xtst_devel}} # XDAMAGE support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xdamage-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 @@ -546,7 +567,7 @@ BuildRequires: usbutils %if 0%{?suse_version} == 1140 BuildRequires: xorg-x11-libfontenc-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1220 BuildRequires: libfontenc-devel %endif @@ -555,7 +576,7 @@ BuildRequires: libfontenc-devel BuildRequires: xorg-x11-devel %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: x11-font-util BuildRequires: x11-proto-devel %endif @@ -576,17 +597,17 @@ BuildRequires: font-util BuildRequires: bdftopcf %endif -%if 0%{?mdkver} < 24090000 -%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} < 5000000 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: drakconf %endif %endif # LIBCONFIG support # Needed for "compton" stuff -%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} +%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} %define with_libconfig 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}config-devel %else BuildRequires: libconfig-devel @@ -594,12 +615,12 @@ BuildRequires: libconfig-devel %endif # KBDLEDSYNC support -%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} +%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} %define with_kbdledsync 1 %endif # TDERANDR support -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} %define with_tderandrtray 1 %endif @@ -621,7 +642,7 @@ BuildRequires: libnsl-devel %endif # ATTR support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define libattr_devel %{_lib}attr-devel %else %define libattr_devel libattr-devel @@ -1223,6 +1244,15 @@ plugdev group. %{tde_tdeappdir}/tdehwdevicetray.desktop %{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop +# tdesyndaemon +%{tde_bindir}/tdesyndaemon +%{tde_tdeappdir}/touchpad.desktop +%{tde_datadir}/apps/tdeconf_update/remote_folder_icon.upd +%{tde_datadir}/apps/tdeconf_update/remote_folder_icon_upd.sh +%{tde_datadir}/icons/crystalsvg/*/devices/input-touchpad.png +%{tde_datadir}/icons/crystalsvg/scalable/devices/input-touchpad.svg +%{tde_datadir}/services/kded/khotkeys.desktop + # The following features are not compiled under RHEL 5 and older %if 0%{?with_tderandrtray} %{tde_bindir}/tderandrtray @@ -1314,8 +1344,6 @@ TDE applications, particularly those in the TDE base module. %{tde_tdelibdir}/kcminit_startup.so %{tde_tdelibdir}/kcm_keyboard.la %{tde_tdelibdir}/kcm_keyboard.so -%{tde_tdelibdir}/kcm_khotkeys_init.la -%{tde_tdelibdir}/kcm_khotkeys_init.so %{tde_tdelibdir}/kcm_khotkeys.la %{tde_tdelibdir}/kcm_khotkeys.so %{tde_tdelibdir}/kded_khotkeys.la @@ -1894,8 +1922,6 @@ group. %{tde_tdedocdir}/HTML/en/tdeioslave/ %{tde_mandir}/man1/ktrash.1* %{tde_mandir}/man1/tdeio_media_mounthelper.1* -%{tde_mandir}/man1/tdeio_system_documenthelper.1* - %if 0%{?with_exr} %{tde_tdelibdir}/exrthumbnail.la %{tde_tdelibdir}/exrthumbnail.so @@ -2038,7 +2064,7 @@ Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release} Requires: eject -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} Requires: xdg-utils %endif @@ -2094,7 +2120,7 @@ Requires: pam Requires: logrotate # Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession) -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4 +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 4 Requires: xinitrc %endif %if 0%{?suse_version} == 1140 @@ -2112,7 +2138,7 @@ Requires: xorg-x11-xinit Provides: service(graphical-login) %endif # Required for Mandriva's installer -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} Provides: dm Provides: %{tdm} %endif @@ -2183,15 +2209,15 @@ 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%{?rhel} >= 7 +%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?pclinuxos} || 0%{?rhel} >= 7 /usr/lib/systemd/system/tdm.service %endif -%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %{_datadir}/xsessions/tde.desktop %endif # https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %{_sysconfdir}/X11/wmsession.d/45TDE %{_datadir}/X11/dm.d/45TDE.conf %endif @@ -2229,7 +2255,7 @@ if [ ! -L "%{tdm_datadir}/pics/users" ] && [ -d "%{tdm_datadir}/pics/users" ] ; fi %post -n trinity-tdm -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %make_session %endif @@ -2276,7 +2302,7 @@ if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then fi %postun -n trinity-tdm -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %make_session %endif @@ -2683,7 +2709,7 @@ ever launching another application. %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop -%if 0%{?mdkver} < 24090000 +%if 0%{?mdkver} < 5000000 %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase %endif @@ -2705,7 +2731,7 @@ ever launching another application. %{tde_mandir}/man1/kfmclient.1* %{tde_mandir}/man1/konqueror.1* -%if 0%{?mdkver} < 24090000 +%if 0%{?mdkver} < 5000000 %post -n trinity-konqueror if [ $1 -eq 1 ]; then @@ -2905,8 +2931,8 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess %endif %postun -n trinity-ksmserver -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} < 24090000 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?mdkver} < 5000000 fndSession %endif %endif @@ -3407,7 +3433,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} +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver} || 0%{?pclinuxos} -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \ %endif .. @@ -3434,7 +3460,7 @@ fi # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora # Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions' -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE" NAME=TDE @@ -3457,28 +3483,21 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k" %if 0%{?mgaversion} >= 6 FNDSESSION_EXEC="/usr/sbin/chksession -l" %endif -EOF %endif +EOF %endif # PAM configuration files (except openSUSE) %if 0%{?suse_version} == 0 -%if 0%{?mdkver} -%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity" -%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np" -%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" -%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity" -%else %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity" %__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np" %__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" %__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity" %endif -%endif # TDM configuration %__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver} +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver} || 0%{?pclinuxos} -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else -e "s/^#*MinShowUID=.*/MinShowUID=500/" @@ -3493,7 +3512,7 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" fi -%if 0%{?mdkver} < 24090000 +%if 0%{?mdkver} < 5000000 # Makes 'media_safelyremove.desktop' an alternative. # This allows the use of 'tdeio-umountwrapper' package. %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" diff --git a/redhat/core/tdebase/tdm.fc39.te b/redhat/core/tdebase/tdm.fc39.te index f3bcb40d4..fec9320bb 100644 --- a/redhat/core/tdebase/tdm.fc39.te +++ b/redhat/core/tdebase/tdm.fc39.te @@ -22,7 +22,7 @@ require { 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 rename unlink write }; +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:file { map open unlink }; allow xdm_t tmp_t:lnk_file unlink; diff --git a/redhat/core/tdebase/tdm.fc41.te b/redhat/core/tdebase/tdm.fc41.te new file mode 120000 index 000000000..6d3f39b54 --- /dev/null +++ b/redhat/core/tdebase/tdm.fc41.te @@ -0,0 +1 @@ +tdm.fc39.te
\ No newline at end of file diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index f194d330e..937692612 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdebindings %define tde_prefix /opt/trinity @@ -107,7 +107,7 @@ Requires: evolution28-pango BuildRequires: evolution28-atk-devel Requires: evolution28-atk %else -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gtk+2.0-devel %else BuildRequires: gtk2-devel @@ -164,16 +164,15 @@ BuildRequires: gdk-pixbuf-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel @@ -698,7 +697,7 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{python_sitearch}/pcop.la %{python_sitearch}/pcop.so -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/pydcop.py* %if 0%{?rhel} == 7 %{python_sitearch}/__pycache__/pydcop.*.pyc @@ -1088,7 +1087,7 @@ exit 2 exit 3 %endif -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 touch config.h.in %endif @@ -1240,6 +1239,13 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop" %__rm -rf "%{?buildroot}%{tde_datadir}/applnk" +# Move dcoppython to %python_sitearch +if [ ! -d "%{?buildroot}%{python_sitearch}" ] && [ -d "%{?buildroot}%{python_sitelib}" ]; then + %__mkdir_p "%{?buildroot}%{python_sitearch}" + %__mv -f "%{?buildroot}%{python_sitelib}/"{pcop.la,pcop.so,pydcop.py} "%{?buildroot}%{python_sitearch}" + rmdir "%{?buildroot}%{python_sitelib}" +fi + # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file -u kjscmd Development diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec index 7cb4d8318..c4214bb66 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdeedu %define tde_prefix /opt/trinity diff --git a/redhat/core/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec index 26bb8d057..1289122bb 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdegames %define tde_prefix /opt/trinity diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec index 67a60e45f..79d6d9f7f 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdegraphics %define tde_prefix /opt/trinity @@ -196,30 +196,26 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} >= 24090000 -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel %endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-Mesa-libGLU -%endif # DRM support %if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %else -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}drm-devel %else BuildRequires: libdrm-devel @@ -227,7 +223,7 @@ BuildRequires: libdrm-devel %endif # OPENEXR support -%if 0%{?mdkver} >= 24090000 +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec index df2eaf1d3..18cd144b9 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdelibs %define tde_prefix /opt/trinity @@ -112,14 +112,14 @@ BuildRequires: libxslt-devel %endif # ALSA support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel %endif # IDN support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}idn-devel %else BuildRequires: libidn-devel @@ -129,7 +129,7 @@ BuildRequires: libidn-devel BuildRequires: cups-devel # TIFF support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}tiff-devel %else BuildRequires: libtiff-devel @@ -143,7 +143,7 @@ BuildRequires: openssl-devel %endif # ACL support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}acl-devel %else BuildRequires: libacl-devel @@ -164,13 +164,13 @@ BuildRequires: aspell-devel # GAMIN support # Not on openSUSE. -%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define with_gamin 1 BuildRequires: gamin-devel %endif # PCRE support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} %define with_pcre 1 %if 0%{?mgaversion} >= 9 BuildRequires: %{_lib}pcre-devel @@ -179,8 +179,18 @@ BuildRequires: pcre-devel %endif %endif +# PCRE2 support +%if 0%{?rhel} >=8 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} +%define with_pcre2 1 +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif +%endif + # INOTIFY support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} %define with_inotify 1 %endif @@ -192,7 +202,7 @@ BuildRequires: bzip2-devel %endif # UTEMPTER support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}utempter-devel %endif %if 0%{?rhel} >=5 || 0%{?fedora} @@ -206,18 +216,18 @@ BuildRequires: utempter-devel %endif # HSPELL support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define with_hspell 1 BuildRequires: hspell-devel %endif # JASPER support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} %define with_jasper 1 %if 0%{?suse_version} BuildRequires: libjasper-devel %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}jasper-devel %endif %if 0%{?rhel} || 0%{?fedora} @@ -226,10 +236,10 @@ BuildRequires: jasper-devel %endif # AVAHI support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} %define with_avahi 1 BuildRequires: libavahi-tqt-devel >= 1:0.6.30 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}avahi-client-devel Requires: %{_lib}avahi-client3 %endif @@ -240,7 +250,7 @@ Requires: avahi %endif # OPENEXR support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%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 @@ -255,7 +265,7 @@ BuildRequires: libpthread-stubs # LIBTOOL BuildRequires: libtool -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}ltdl-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 @@ -263,7 +273,7 @@ BuildRequires: libtool-ltdl-devel %endif # X11 support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: x11-proto-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} @@ -274,7 +284,7 @@ BuildRequires: xorg-x11-devel %endif # ICEAUTH -%if 0%{?fedora} >= 34 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1220 +%if 0%{?fedora} >= 34 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1220 Requires: iceauth BuildRequires: iceauth %endif @@ -290,9 +300,9 @@ BuildRequires: xorg-x11 %endif # XZ support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} %define with_lzma 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}lzma-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} @@ -311,8 +321,8 @@ Requires: ca-certificates %define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt %endif %endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} -%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver} || 0%{?pclinuxos} Requires: rootcerts %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %else @@ -335,12 +345,12 @@ Requires: %{cacert} # XRANDR support # On RHEL5, xrandr library is too old. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version} %define with_xrandr 1 %endif # XCOMPOSITE support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?mgaversion} >= 4 %define xcomposite_devel %{_lib}xcomposite-devel %else @@ -356,7 +366,7 @@ Requires: %{cacert} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %define xt_devel libXt-devel %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define xt_devel %{_lib}xt-devel %endif %{?xt_devel:BuildRequires: %{xt_devel}} @@ -364,7 +374,7 @@ Requires: %{cacert} ### New features in TDE R14 # LIBMAGIC support -%if 0%{?mdkver} +%if 0%{?mdkver} || 0%{?pclinuxos} BuildRequires: %{_lib}magic-devel %else %if 0%{?rhel} != 5 @@ -373,9 +383,9 @@ BuildRequires: file-devel %endif # NETWORKMANAGER support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} %define with_nm 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?mgaversion} && 0%{?mgaversion} <= 7 BuildRequires: %{_lib}nm-util-devel %endif @@ -393,10 +403,14 @@ BuildRequires: NetworkManager-devel %endif # UDEV support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif @@ -409,12 +423,10 @@ BuildRequires: libudev-devel # UDISKS support %if 0%{?rhel} == 6 -%if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310 %define with_udisks 1 BuildRequires: udisks-devel Requires: udisks %endif -%endif # UDISKS2 support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7 @@ -427,11 +439,11 @@ Requires: udisks %define udisks2 udisks2 %define udisks2_devel libudisks2-0-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mgaversion} || 0%{?pclinuxos} %define udisks2 udisks2 %define udisks2_devel udisks2-devel %endif -%if 0%{?mdkver} +%if 0%{?mdkversion} && 0%{?pclinuxos} == 0 %define udisks2 udisks %define udisks2_devel %{_lib}udisks-devel %endif @@ -504,6 +516,12 @@ BuildRequires: %{libattr_devel} # INTLTOOL support BuildRequires: intltool +# WEBP support +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}webp-devel +%else +BuildRequires: libwebp-devel +%endif %description Libraries for the Trinity Desktop Environment: @@ -743,6 +761,7 @@ fi %{?!with_avahi:-DWITH_AVAHI=OFF} \ %{?!with_elficon:-DWITH_ELFICON=OFF} \ %{?!with_pcre:-DWITH_PCRE=OFF} \ + %{?!with_pcre2:-DWITH_PCRE2=OFF} \ %{?!with_inotify:-DWITH_INOTIFY=OFF} \ %{?!with_gamin:-DWITH_GAMIN=OFF} \ %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \ diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec index 4aa7a0d1a..e6f3d557c 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdemultimedia %define tde_prefix /opt/trinity @@ -117,7 +117,11 @@ BuildRequires: cdparanoia # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif @@ -131,7 +135,7 @@ BuildRequires: libtheora-devel %endif # ALSA support -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -167,7 +171,7 @@ BuildRequires: flac-devel # GSTREAMER support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gstreamer-devel BuildRequires: %{_lib}gst-plugins-base1.0-devel %else @@ -210,7 +214,7 @@ BuildRequires: libXxf86vm-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec index 0a6e431ca..a210fea30 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdenetwork %define tde_prefix /opt/trinity diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec index de1c98944..85536c928 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdepim %define tde_prefix /opt/trinity @@ -150,7 +150,7 @@ BuildRequires: glib2-devel # SASL support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}sasl-devel %else BuildRequires: %{_lib}sasl2-devel diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec index 8d1ac42b6..cffa47049 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdesdk %define tde_prefix /opt/trinity @@ -121,7 +121,7 @@ BuildRequires: libdb-4_8-devel # kbabel, F-7+: flex >= 2.5.33-9 BuildRequires: flex -%if 0%{?mdkver} +%if 0%{?mdkversion} && 0%{?pclinuxos} == 0 BuildRequires: flex-devel %endif # umbrello diff --git a/redhat/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec index 48cf7218a..ed6a5681c 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdetoys %define tde_prefix /opt/trinity diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec index cd0c99dd7..bff3ac7d7 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdeutils %define tde_prefix /opt/trinity diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec index 3f718693b..36167329c 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdevelop %define tde_prefix /opt/trinity @@ -137,7 +137,7 @@ BuildRequires: neon-devel # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -153,7 +153,7 @@ BuildRequires: openldap24-libs-devel # LIBACL support %if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} # ACL support -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}acl-devel %else BuildRequires: libacl-devel diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec index d0ce64cce..7989f1758 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdewebdev %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec index 958b3eed4..1fdb0ebca 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.2 +%define tde_version 14.1.3 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -73,8 +73,12 @@ BuildRequires: trinity-filesystem >= %{tde_version} # FLAC support %define _with_flac --with-flac %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}flac12-devel +%else BuildRequires: %{_lib}flac-devel %endif +%endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: flac-devel %endif @@ -91,7 +95,7 @@ BuildRequires: jack-audio-connection-kit-devel %endif # SAMPLERATE support -%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} %define _with_libsamplerate --with-libsamplerate %if 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: %{_lib}samplerate-devel @@ -130,7 +134,7 @@ BuildRequires: libmad-devel %if 0%{?suse_version} BuildRequires: alsa-devel %else -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -139,7 +143,11 @@ BuildRequires: alsa-lib-devel # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index 5b1ecb63a..903569507 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg arts %define tde_prefix /opt/trinity @@ -77,14 +77,18 @@ BuildRequires: gsl-devel # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif BuildRequires: %{libvorbis_devel} # ALSA support -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 %define alsa_devel %{_lib}asound-devel %else %define alsa_devel alsa-lib-devel diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 94e0955f1..addbd7833 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.2 +%define tde_version 14.1.3 %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 0d9c7b389..0abbacfa2 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.2 +%define tde_version 14.1.3 %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 758b7cf8c..1c051ff1d 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.2 +%define tde_version 14.1.3 %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 63c6772d4..4811ec68a 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.2 +%define tde_version 14.1.3 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 0fe560871..267996032 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity @@ -60,7 +60,7 @@ BuildRequires: libtool BuildRequires: fdupes # GTK2 support -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gtk+2.0-devel %else %if 0%{?rhel} == 4 diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index cf992da1e..b4aade88a 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity @@ -73,7 +73,7 @@ BuildRequires: libtool %{?libcurl_devel:BuildRequires: %{libcurl_devel}} # GTK2 support -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gtk+2.0-devel %else %if 0%{?rhel} == 4 diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index cb3214d20..157141007 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg polkit-tqt diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec index ade0f5694..3dba1982a 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg pytqt %define tde_prefix /opt/trinity @@ -83,16 +83,15 @@ BuildRequires: %{python} BuildRequires: %{python}-devel # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel @@ -146,7 +145,7 @@ same way in both languages (with syntax differences, of course) %defattr(-,root,root,-) %doc NEWS README %dir %{python_sitearch}/PyTQt -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/PyTQt/__init__.py* %if 0%{?rhel} == 7 %{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc @@ -236,7 +235,7 @@ packages based on them, like PyTDE. %files -n pytqt-devel %defattr(-,root,root,-) -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/PyTQt/pytqtconfig.py* %if 0%{?rhel} == 7 %{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index f4ce700ae..e00b49984 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity @@ -113,7 +113,7 @@ specificity towards C++ and Python. %files -n sip4-tqt %defattr(-,root,root,-) %{python_sitearch}/sip_tqt.so -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/sip_tqt_config.py* %{python_sitearch}/sip_tqt_distutils.py* %if 0%{?rhel} == 7 diff --git a/redhat/dependencies/tde-cmake/tde-cmake.spec b/redhat/dependencies/tde-cmake/tde-cmake.spec index 4901e544e..7e06a6be5 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.2 +%define tde_version 14.1.3 %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 bc76e9208..b417ace34 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.2 +%define tde_version 14.1.3 %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 367e18958..d2f2d204d 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.2 +%define tde_version 14.1.3 %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 155b56e18..9aa1ae3ed 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tqscintilla diff --git a/redhat/dependencies/tqt3/build-examples.sh b/redhat/dependencies/tqt3/build-examples.sh index 4d654fcc9..f62d83b85 120000..100644 --- a/redhat/dependencies/tqt3/build-examples.sh +++ b/redhat/dependencies/tqt3/build-examples.sh @@ -1 +1,36 @@ -../../../debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh
\ No newline at end of file +#!/bin/sh + +BUILDDIR=$PWD +export QTDIR=/usr/share/tqt3 + +# first copy over the libtqt-mt.so build configuration of .qmake.cache +cp /usr/share/tqt3/.qmake.cache ./.qmake.cache + +# Now compile the examples. The themes example +# won't work since ntqconfig.h is not really correct with the +# ifdef's for the TQT_NO_xyz_STYLE, so we use make -k to continue +cd examples; qmake -o Makefile examples.pro; make -k + +# Now compile the tutorial. +cd $BUILDDIR/tutorial; qmake -o Makefile tutorial.pro; make + +# Then the designer examples. +cd $BUILDDIR/tools/designer/examples +for a in `find . -type d -maxdepth 1 -mindepth 1`; do + cd $a && qmake -o Makefile $a.pro; make; cd ..; +done + +# There is a bigger sql example in book/ with more subdirectories: +cd book +for a in `find . -type d -maxdepth 1 -mindepth 1`; do + cd $a && qmake -o Makefile $a.pro; make; cd ..; +done + +# Finally, build the linguist tutorials: +cd $BUILDDIR/tools/linguist/tutorial +for a in `find . -type d -maxdepth 1 -mindepth 1`; do + cd $a && qmake -o Makefile $a.pro; make; cd ..; +done + +# Return to the build directory +cd $BUILDDIR diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index aff20e142..338ade63d 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -51,7 +51,9 @@ Source1: build-examples.sh Source2: trinity-tqt3-rpmlintrc BuildRequires: glibc-devel +%if "%{?c_compiler}" != "clang" BuildRequires: gcc-c++ +%endif BuildRequires: make BuildRequires: desktop-file-utils @@ -81,7 +83,11 @@ BuildRequires: zlib-devel # PNG support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libpng %{_lib}png1.6 +%else %define libpng %{_lib}png +%endif %else %define libpng libpng %endif @@ -126,7 +132,7 @@ BuildRequires: cups-devel # LIBAUDIO support %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_nas 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} >= 5000000 %define libaudio_devel %{_lib}audio-devel nas-devel %else %define libaudio_devel nas-devel @@ -258,20 +264,15 @@ BuildRequires: xorg-x11-proto-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?pclinuxos} -BuildRequires: MesaGLU-devel -%else -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel -%endif +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel @@ -1389,11 +1390,15 @@ echo yes | ./configure \ -shared \ -fast \ -no-exceptions \ +%if "%{?c_compiler}" == "clang" + -platform linux-clang \ +%else %if "%{_lib}" == "lib64" -platform linux-g++-64 \ %else -platform linux-g++ \ %endif +%endif \ %{?with_nis:-nis} %{?!with_nis:-no-nis} \ -no-pch \ diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index f36c916fb..303373c18 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg tqtinterface @@ -75,7 +75,7 @@ BuildRequires: pkgconfig # PTHREAD support %if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mgaversion} >= 7 || 0%{?mdkver} +%if 0%{?mgaversion} >= 7 || 0%{?mdkversion} BuildRequires: %{_lib}npth-devel %else BuildRequires: pth-devel @@ -92,16 +92,15 @@ BuildRequires: libpth-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index a53ffd06a..c9e0fc804 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -4,9 +4,10 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.3" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker +[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" FILE="${HOME}/tde/docker/${IMAGE}.tar.gz" @@ -20,11 +21,11 @@ else echo "Building new Docker image '${IMAGE}'." ${DOCKER} build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}" echo "Saving image to '${FILE}'" - ${DOCKER} image save "${IMAGE}" | pigz >"${FILE}" + ${DOCKER} image save "${IMAGE}" | ${GZIP} >"${FILE}" fi # Strip 'localhost/' prefix from image tag -if ! docker images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then - docker image tag "localhost/${IMAGE}" "${IMAGE}" - #docker image remove "localhost/${IMAGE}" +if ! ${DOCKER} images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then + ${DOCKER} image tag "localhost/${IMAGE}" "${IMAGE}" + #${DOCKER} image remove "localhost/${IMAGE}" fi diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index 135526498..a20359b46 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=i686 # Add local repositories diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index 1f123925e..a84206ea3 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add local repositories diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 6858c0d9b..e8a7cbe14 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=i686 # Enable proxy diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index 7be807e46..c9d4ceae3 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Enable proxy diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index 1366cfb18..0cb9b5dee 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Enable proxy @@ -8,11 +8,14 @@ ARG ARCH=x86_64 # Add RPMFUSION repository # Install Trinity build dependencies COPY packages /packages -RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ - && yum -y install epel-release \ - && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm \ +RUN set -x \ + && cd /etc/yum.repos.d \ + && rm -fv *.repo \ + && curl http://repo/repo/{centos7,epel7,rpmfusion7}.repo >repos.repo \ + && sed -i "repos.repo" -e "s|https://|http://|" \ && yum -y clean all \ && yum -y update \ + && rm -fv {CentOS,epel}-*.repo \ && yum -y install $(</packages) # Add YUM repository for locally built packages @@ -48,3 +51,11 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm + +RUN set -x \ + && rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/39/Everything/source/tree/Packages/l/libunibreak-4.0-13.fc39.src.rpm --define "ldconfig_scriptlets %post -p /sbin/ldconfig" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{4,devel}*.rpm + +RUN set -x \ + && rpmbuild --rebuild http://vault.almalinux.org/8.10/AppStream/Source/Packages/taglib-1.11.1-8.el8.src.rpm --define "ldconfig_scriptlets %post -p /sbin/ldconfig" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/taglib-{1,devel}*.rpm diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index a39c59cdd..67be667a7 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -133,6 +133,7 @@ libutempter-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel @@ -167,6 +168,7 @@ opensp-devel pam-devel pciutils-devel pcre-devel +pcre2-devel pcsc-lite-devel pcsc-perl perl diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 4cd5365ad..18e5dceea 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Enable custom repository @@ -60,3 +60,8 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/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/packages b/redhat/docker/el8/packages index cea7e8a72..173497991 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -91,6 +91,7 @@ libconfig-devel libcurl-devel libdb-devel libdb-cxx-devel +libdrm-devel libdvdread-devel libfontenc-devel libgpod-devel @@ -130,6 +131,7 @@ libutempter-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel @@ -148,6 +150,7 @@ libudisks2-devel libusb-devel lirc-devel lm_sensors-devel +mesa-libGL-devel mysql-devel neon-devel netpbm-progs diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 index 5fb5a4c01..0315334b5 100644 --- a/redhat/docker/el9/Dockerfile.x86_64 +++ b/redhat/docker/el9/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM rockylinux:9 -ARG TDE_VERSION=14.1.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Enable proxy @@ -11,7 +11,8 @@ ARG ARCH=x86_64 # Enable supplementary repositories # Install Trinity build dependencies COPY packages /packages -RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ +RUN set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ && curl -o /usr/lib/python3.9/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \ && dnf -y update \ && dnf -y install epel-release \ @@ -99,3 +100,8 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-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/el9/packages b/redhat/docker/el9/packages index 3d3239b3a..1763a3653 100644 --- a/redhat/docker/el9/packages +++ b/redhat/docker/el9/packages @@ -128,6 +128,7 @@ libuuid-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64 index a08b86185..4dc9b5763 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 index 86cae885c..040dadf98 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64 index bc24ab119..73fe3dd7d 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686 index a81c034e9..f1212c1f9 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64 index ed4953b28..47a061699 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 index 96adf7fac..5265a7991 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.2 +ARG TDE_VERSION=14.1.3 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 913b73a18..b89e5455d 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f29/Dockerfile.i686 b/redhat/docker/f29/Dockerfile.i686 index 8a59d571e..42117cf2a 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.2 +ARG TDE_VERSION=14.1.3 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 f4a295247..01f05ae72 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686 index fd70b9f98..22c25fe8e 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.2 +ARG TDE_VERSION=14.1.3 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 a8610575f..c8e285e23 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64 index 894f8794f..515fbe138 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64 index d48a0be88..b8c78a5f3 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f33/Dockerfile.x86_64 b/redhat/docker/f33/Dockerfile.x86_64 index 67ea30ecb..0182517b0 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64 index 776f750eb..880d3f074 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64 index 947dcee69..55cf3a14b 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f36/Dockerfile.x86_64 b/redhat/docker/f36/Dockerfile.x86_64 index ceda97e9e..b44e7ea1f 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64 index fc288134d..cdfc51d6d 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f38/Dockerfile.x86_64 b/redhat/docker/f38/Dockerfile.x86_64 index b01609519..f5bb2a497 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f39/Dockerfile.x86_64 b/redhat/docker/f39/Dockerfile.x86_64 index 51776f01f..d560f45e0 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f39/packages b/redhat/docker/f39/packages index 4a76d8eeb..75f39fda1 100644 --- a/redhat/docker/f39/packages +++ b/redhat/docker/f39/packages @@ -135,6 +135,7 @@ libtool libtool-ltdl-devel libudev-devel libudisks2-devel +libunibreak-devel libusb-compat-0.1-devel libusb1-devel libutempter-devel @@ -143,6 +144,7 @@ libv4l-devel libvisual-devel libvncserver-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel diff --git a/redhat/docker/f40/Dockerfile.x86_64 b/redhat/docker/f40/Dockerfile.x86_64 index 775a503cd..5e4501306 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f40/packages b/redhat/docker/f40/packages index 7f1d9cc47..f409831a4 100644 --- a/redhat/docker/f40/packages +++ b/redhat/docker/f40/packages @@ -135,6 +135,7 @@ libtool libtool-ltdl-devel libudev-devel libudisks2-devel +libunibreak-devel libusb-compat-0.1-devel libusb1-devel libutempter-devel diff --git a/redhat/docker/f41/Dockerfile.x86_64 b/redhat/docker/f41/Dockerfile.x86_64 new file mode 100644 index 000000000..0716fe8bd --- /dev/null +++ b/redhat/docker/f41/Dockerfile.x86_64 @@ -0,0 +1,42 @@ +FROM fedora:41 + +ARG TDE_VERSION=14.1.3 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ + && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \ + && sed -i /etc/yum.repos.d/fedora{,-updates}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|41|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-41.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 sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN 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 +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* + +RUN 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/f41/packages b/redhat/docker/f41/packages new file mode 100644 index 000000000..1bd6d53b2 --- /dev/null +++ b/redhat/docker/f41/packages @@ -0,0 +1,239 @@ +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 +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-1.8.0-openjdk-devel +java-devel +java-openjdk +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 +OpenEXR-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/f41/rpmbuild.repo b/redhat/docker/f41/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f41/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/f41/rpmmacros b/redhat/docker/f41/rpmmacros new file mode 100644 index 000000000..69f287007 --- /dev/null +++ b/redhat/docker/f41/rpmmacros @@ -0,0 +1,10 @@ +%dist .fc41 +%_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/mageia.sh b/redhat/docker/mageia.sh index e0a84588a..7f208caf3 100755 --- a/redhat/docker/mageia.sh +++ b/redhat/docker/mageia.sh @@ -5,6 +5,7 @@ VERSION="${1:-9}" # E.g: '9' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" ARCH="x86_64" +[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip sudo rm -rf "${INSTALLROOT}" sudo mkdir -p "${INSTALLROOT}" @@ -29,6 +30,6 @@ sudo rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" docker import "${FILE}" "${IMAGE}" -pigz "${FILE}" +${GZIP} "${FILE}" mkdir -p "${HOME}/tde/docker" mv -fv "${FILE}.gz" "${HOME}/tde/docker" diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64 index 13b664401..10f5dc4c5 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index 3df92c2bc..83289b3c8 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.2 +ARG TDE_VERSION=14.1.3 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 22a54729b..13bbc29e1 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 index 0c75795b7..08d5fe1c1 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.2 +ARG TDE_VERSION=14.1.3 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 71b5dc862..d3f3b5a59 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686 index bcb1d59e4..c0f4bc460 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.2 +ARG TDE_VERSION=14.1.3 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 864b12c2b..a230497fe 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686 index 1811d8f52..277f39b9a 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.2 +ARG TDE_VERSION=14.1.3 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 450334eec..3243bc50d 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686 index 01f51270c..1279b7cbb 100644 --- a/redhat/docker/mga9/packages.i686 +++ b/redhat/docker/mga9/packages.i686 @@ -139,6 +139,7 @@ libpx-devel libqalculate-devel libraw1394-devel librsvg +librsvg2-devel libsane1-devel libsmbclient-devel libsm-devel @@ -150,6 +151,7 @@ libtiff-devel libtwolame-devel libudev-devel libungif-devel +libunibreak-devel libusb1.0-devel libutempter libutempter0 @@ -157,6 +159,7 @@ libutempter-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libx11-devel diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64 index 21c9a7d60..66447ca34 100644 --- a/redhat/docker/mga9/packages.x86_64 +++ b/redhat/docker/mga9/packages.x86_64 @@ -102,15 +102,19 @@ lib64pcre-devel lib64pkcs11-helper-devel lib64poppler-devel lib64pulseaudio-devel +lib64raptor-devel +lib64rsvg2-devel lib64sane1-devel lib64t1lib-devel lib64tiff-devel lib64twolame-devel lib64udev-devel +lib64unibreak-devel lib64usb1.0-devel lib64utempter0 lib64utempter-devel lib64v4l-devel +lib64webp-devel lib64xaw-devel lib64xdg-basedir-devel lib64xi-devel diff --git a/redhat/docker/omv5000/Dockerfile.x86_64 b/redhat/docker/omv5000/Dockerfile.x86_64 index 37b186710..b387f6b62 100644 --- a/redhat/docker/omv5000/Dockerfile.x86_64 +++ b/redhat/docker/omv5000/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM openmandriva:5.0 -ARG TDE_VERSION=14.1.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 COPY packages /packages @@ -26,7 +26,9 @@ USER trinity COPY rpmmacros /home/trinity/.rpmmacros RUN set -x \ - && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \ + && 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 \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm RUN set -x \ @@ -63,3 +65,7 @@ RUN set -x \ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm + +RUN set -x \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/wireless-tools-30-0.pre9.14.mga9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib64iw{30,-devel}-30*.rpm diff --git a/redhat/docker/omv5000/packages b/redhat/docker/omv5000/packages index 47a126218..9a5216e64 100644 --- a/redhat/docker/omv5000/packages +++ b/redhat/docker/omv5000/packages @@ -60,6 +60,7 @@ java-1.8.0-openjdk java-1.8.0-openjdk-devel java-devel kde-dev-scripts +ladspa-devel less lib64acl-devel lib64alsa-oss-devel @@ -101,6 +102,7 @@ lib64gpg-error-devel lib64gphoto-devel lib64gpod-devel lib64graphicsmagick-devel +lib64gsf-1-devel lib64gstreamer-devel lib64gst-plugins-base1.0-devel lib64gtk+2.0-devel @@ -166,6 +168,7 @@ lib64tirpc-devel lib64twolame-devel lib64udev-devel lib64udisks-devel +lib64unibreak-devel lib64usb-compat0.1-devel lib64usb1.0-devel lib64utempter0 @@ -183,10 +186,13 @@ lib64xkbfile-devel lib64xscrnsaver-devel lib64xslt-devel lib64xtst-devel +lib64xv-devel lib64xxf86dga-devel lib64xxf86vm-devel lib64wrap-devel librsvg +libwebp-devel +libxt-devel lm_sensors-devel mysql-devel nas-devel @@ -217,7 +223,9 @@ perl(Tk) perl(XML::Parser) pilot-link-devel pinentry-gtk2 +pkgconfig(ao) pkgconfig(audiofile) +pkgconfig(libgssglue) pkgconfig(libpng16) postgresql postgresql-devel diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64 index 55f8a0abf..0a1ac4080 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 COPY packages /packages @@ -26,7 +26,9 @@ USER trinity COPY rpmmacros /home/trinity/.rpmmacros RUN set -x \ - && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \ + && 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 \ @@ -34,9 +36,9 @@ RUN set -x \ && 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/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --define "mkrel %nil" --nodeps \ -# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm +RUN set -x \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.34.2-1.mga10.src.rpm --define "mkrel %nil" --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \ @@ -55,11 +57,17 @@ RUN set -x \ RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-1.18.0-1.mga9.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s/MYMETA.yml//" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec --define "mkrel %nil" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec --define "mkrel %nil" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "mkrel %nil" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "mkrel %nil" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/wireless-tools-30-0.pre9.14.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s/%patch/%patch -P /" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/wireless-tools.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib64iw{30,-devel}-30*.rpm diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages index 47a126218..87fc9fd5f 100644 --- a/redhat/docker/omvcooker/packages +++ b/redhat/docker/omvcooker/packages @@ -166,6 +166,7 @@ lib64tirpc-devel lib64twolame-devel lib64udev-devel lib64udisks-devel +lib64unibreak-devel lib64usb-compat0.1-devel lib64usb1.0-devel lib64utempter0 @@ -187,6 +188,9 @@ lib64xxf86dga-devel lib64xxf86vm-devel lib64wrap-devel librsvg +libwebp-devel +libxt-devel +libxv-devel lm_sensors-devel mysql-devel nas-devel @@ -217,7 +221,9 @@ perl(Tk) perl(XML::Parser) pilot-link-devel pinentry-gtk2 +pkgconfig(ao) pkgconfig(audiofile) +pkgconfig(libgssglue) pkgconfig(libpng16) postgresql postgresql-devel diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh index 5d4dce450..292ae9983 100755 --- a/redhat/docker/opensuse32.sh +++ b/redhat/docker/opensuse32.sh @@ -17,6 +17,8 @@ fi IMAGE="${NAME}:latest" INSTALLROOT="/dev/shm/${IMAGE}" +[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip + for dir in dev proc sys; do if [ -d "${INSTALLROOT}/${dir}" ]; then umount "${INSTALLROOT}/${dir}" @@ -81,6 +83,6 @@ rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" docker import "${FILE}" "${IMAGE}" -pigz "${FILE}" +${GZIP} "${FILE}" mkdir -p "/home/${SUDO_USER}/tde/docker" mv -fv "${FILE}.gz" "/home/${SUDO_USER}/tde/docker" diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64 index 5ebc69ac7..c0a2d4236 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64 index f80f0aaa0..4e7ee141d 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64 index 8bbccfb44..157a1944e 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64 index be2e75b61..ac1222a38 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64 index fd2294119..81ed57de0 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64 index d2e770b22..baed78762 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64 index 8285a64f0..18d92ac00 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss155/Dockerfile.x86_64 b/redhat/docker/oss155/Dockerfile.x86_64 index 394650a12..76790a150 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss155/packages b/redhat/docker/oss155/packages index 3d3897e5b..5d827fe6e 100644 --- a/redhat/docker/oss155/packages +++ b/redhat/docker/oss155/packages @@ -136,10 +136,12 @@ libtool libtwolame-devel libudev1 libudisks2-0-devel +libunibreak-devel libuuid-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel @@ -176,6 +178,7 @@ pam-devel patch pciutils-devel pcre-devel +pcre2-devel pcsc-lite-devel perl(JSON) perl-PAR-Packer @@ -193,6 +196,7 @@ rpcgen rpm-build rpmlint rsvg-convert +rsync ruby ruby-devel sane-backends-devel diff --git a/redhat/docker/oss156/Dockerfile.x86_64 b/redhat/docker/oss156/Dockerfile.x86_64 index a41198e38..5e4fb3267 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository @@ -11,6 +11,7 @@ RUN set -x \ && 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) diff --git a/redhat/docker/oss156/packages b/redhat/docker/oss156/packages index 8d7c5f71f..be5009ec0 100644 --- a/redhat/docker/oss156/packages +++ b/redhat/docker/oss156/packages @@ -137,9 +137,11 @@ libtwolame-devel libudev1 libudisks2-0-devel libuuid-devel +libunibreak-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64 index 47b0054bd..1ed0b6e0a 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64 index 640c56f42..7c1d9c4ce 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64 index 8da0fffe3..0d02c588b 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 19aa7b6f4..59a9bcf9a 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=i686 # Add PACKMAN repository @@ -13,27 +13,37 @@ RUN set -x \ && setarch ${ARCH} zypper -n install --allow-vendor-change $(</packages) # Add non-root user to build packages -RUN /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \ +RUN set -x \ + && /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers USER trinity COPY rpmmacros /home/trinity/.rpmmacros +# Fix taglib headers to match actual built library (amarok, soundkonverter) +RUN set -x \ + && sed -i "/usr/include/taglib/id3v1tag.h" -e "s|offset_t tagOffset|long tagOffset|" \ + && sed -i "/usr/include/taglib/tfile.h" -e "s|offset_t offset|long offset|" -e "s|offset_t start|long start|" + # Add YUM repository for locally built packages -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ +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 # Install heimdal development files -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \ +COPY heimdal-7.8.0-ftbfs_osstw_i686.patch /home/trinity/rpmbuild/SOURCES +RUN set -x \ + && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-4.1.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|^|#|" \ - && setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|.*|Patch0: heimdal-7.8.0-ftbfs_osstw_i686.patch|" \ + && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install # Add lilypond (i686 only) -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.3-1.5.src.rpm \ +RUN set -x \ + && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.3.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 50ac34c5b..786107fe7 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.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository @@ -26,10 +26,10 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch # Install heimdal development files -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-4.1.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|^|#|" \ && export ac_cv_sys_large_files=no \ && export ac_cv_sys_file_offset_bits=no \ - && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install diff --git a/redhat/docker/osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch b/redhat/docker/osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch new file mode 100644 index 000000000..b2cf2de50 --- /dev/null +++ b/redhat/docker/osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch @@ -0,0 +1,36 @@ +diff --git a/lib/libedit/src/common.c b/lib/libedit/src/common.c +index 2708605..a166f29 100644 +--- a/lib/libedit/src/common.c ++++ b/lib/libedit/src/common.c +@@ -366,12 +366,13 @@ libedit_private el_action_t + ed_quoted_insert(EditLine *el, wint_t c) + { + int num; ++ wchar_t ch; + + tty_quotemode(el); +- num = el_wgetc(el, &c); ++ num = el_wgetc(el, &ch); + tty_noquotemode(el); + if (num == 1) +- return ed_insert(el, c); ++ return ed_insert(el, ch); + else + return ed_end_of_file(el, 0); + } +diff --git a/lib/libedit/src/search.c b/lib/libedit/src/search.c +index 5226cf5..1cc8383 100644 +--- a/lib/libedit/src/search.c ++++ b/lib/libedit/src/search.c +@@ -603,8 +603,10 @@ cv_csearch(EditLine *el, int direction, wint_t ch, int count, int tflag) + return CC_ERROR; + + if (ch == (wint_t)-1) { +- if (el_wgetc(el, &ch) != 1) ++ wchar_t c; ++ if (el_wgetc(el, &c) != 1) + return ed_end_of_file(el, 0); ++ ch = c; + } + + /* Save for ';' and ',' commands */ diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 7032cacde..3bf063281 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -137,10 +137,12 @@ libtool libtwolame-devel libudev-devel libudisks2-0-devel +libunibreak-devel libuuid-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh index 42ab539cc..c4efb8f12 100755 --- a/redhat/docker/pclinuxos.sh +++ b/redhat/docker/pclinuxos.sh @@ -4,6 +4,7 @@ NAME="pclinuxos" VERSION="${1:-2024}" # E.g: '2020' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" +[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip grep -qw "${INSTALLROOT}/dev" /proc/mounts && sudo umount "${INSTALLROOT}/dev" sudo rm -rf "${INSTALLROOT}" @@ -50,4 +51,4 @@ sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}" docker run -ti --rm "${IMAGE}" ls -l sudo rm -rf "${INSTALLROOT}" -docker image save "${IMAGE}" | pigz -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz" +docker image save "${IMAGE}" | ${GZIP} -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz" diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 1d92b8a8a..e085fe7cf 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM pclinuxos:2024 -ARG TDE_VERSION=14.1.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Update distribution @@ -43,20 +43,20 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/cscope-15.9-2.mga8.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm 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|" \ + && 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/8/SRPMS/core/updates/heimdal-7.7.1-1.3.mga8.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%autopatch|%patch1|" -e "/Conflicts: krb5-devel/ s|^|#|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \ - && echo sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.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 /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 d34407ee8..e0e5fb2ba 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -33,6 +33,7 @@ fribidi-devel gamin-devel gcc-c++ gettext-devel +ghostscript glib2-devel gnokii-devel gnutls-devel @@ -70,18 +71,23 @@ lib64iw29-devel lib64jack-devel lib64nm-devel lib64mpcdec-devel +lib64nas-devel +lib64npth-devel lib64OpenSP5-devel lib64pcsclite-devel lib64pkcs11-helper-devel lib64polkit1-devel lib64poppler-devel lib64readline-devel +lib64rsvg2-devel lib64sane1-devel lib64sndfile-devel lib64ssh-devel +lib64udev1-devel lib64unwind-devel lib64usb1.0-devel lib64usb-compat0.1-devel +lib64webp-devel lib64wv2-devel lib64xaw-devel lib64xine1.2-devel @@ -159,6 +165,7 @@ mysql-devel nas-devel neon-devel net-snmp-devel +netpbm ocaml OpenEXR-devel openldap-devel diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros index 5c9fcc2e4..00b98f240 100644 --- a/redhat/docker/pclinuxos/rpmmacros +++ b/redhat/docker/pclinuxos/rpmmacros @@ -1,7 +1,10 @@ -%dist .pclos +%dist .pclos2024 %_smp_mflags -j8 %jobs 8 -%pclinuxos 2022 +%pclinuxos 2024 %configure %configure2_5x %python python3 %__python /usr/bin/python3 +%_vpath_builddir . +%python_sitearch %python3_sitearch +%python_sitelib %python3_sitelib diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh index bb626a9cc..f5789d104 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.2" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.3" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh index c5f8fb873..5cd322ad0 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.2" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.3" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh index 2773f64ce..68d4b595e 100755 --- a/redhat/docker/remove.sh +++ b/redhat/docker/remove.sh @@ -4,11 +4,12 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.3" [ -z "${ARCH}" ] && ARCH="x86_64" +[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" FILE="${HOME}/tde/docker/${IMAGE}.tar.gz" -docker rmi -f "${IMAGE}" +${DOCKER} rmi -f "${IMAGE}" rm -f "${FILE}" diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index 5a59db78c..7b13b0b2e 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.2" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.3" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker @@ -30,6 +30,7 @@ ${DOCKER} run -ti --rm \ --name "${IMAGE//:/-}" \ -v /dev/shm/${DOCKER}:/tmp:z \ -u trinity \ + --userns keep-id:uid=1000,gid=1000 \ -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 31e63ef48..0a1761060 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.2 +%define tde_version 14.1.3 %endif %define tde_prefix /opt/trinity diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec index f1a779fc9..0dfa92ebc 100644 --- a/redhat/extras/htdig/htdig.spec +++ b/redhat/extras/htdig/htdig.spec @@ -20,10 +20,12 @@ URL: http://www.htdig.org/ Source0: htdig_3.2.0b6.orig.tar.gz Patch1: patches/htdig_3.2.0b6-13.diff -Patch2: patches/gcc-6 -Patch3: patches/sourceforge_logo -Patch4: patches/drop-bogus-assignment -Patch5: patches/gcc-11 +Patch2: patches/kfreebsd +Patch3: patches/gcc-6 +Patch4: patches/sourceforge_logo +Patch5: patches/drop-bogus-assignment +Patch6: patches/gcc-11.patch +Patch7: patches/fix-ftbfs-gcc14 BuildRequires: flex >= 2.5.4a-13 BuildRequires: libtool @@ -114,10 +116,14 @@ Libraries needed to develop for htdig. %defattr(-,root,root) %doc ChangeLog %doc htdoc/* -#%{_libdir}/htdig/*.a +%if 0%{?mdkver} < 5000000 +%{_libdir}/htdig/*.a +%endif %{_libdir}/htdig/*.la %{_libdir}/htdig/*[a-z].so -#%{_libdir}/htdig_db/*.a +%if 0%{?mdkver} < 5000000 +%{_libdir}/htdig_db/*.a +%endif %{_libdir}/htdig_db/*.la %{_libdir}/htdig_db/*[a-z].so %{_includedir}/* @@ -148,7 +154,6 @@ various web servers on the campus network. %files web %defattr(-,root,root) -%config(missingok, noreplace) %attr(0755,root,root) /etc/cron.daily/htdig-dbgen %{contentdir}/html/htdig %{contentdir}/cgi-bin/* @@ -193,6 +198,8 @@ fi %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 autoreconf -fiv @@ -226,9 +233,6 @@ rm -rf %{buildroot} %__make install DESTDIR=%{?buildroot} -# Installs the cron job -%__install -d -m 755 cron/htdig-dbgen "%{buildroot}%{?_sysconfdir}/cron.daily/htdig-dbgen" - cp %{buildroot}%{contentdir}/cgi-bin/htsearch %{buildroot}%{_bindir} chmod 644 %{buildroot}%{contentdir}/html/htdig/* @@ -238,10 +242,10 @@ ln -sf ./search.html %{buildroot}%{contentdir}/html/htdig/index.html # now get rid of the %{buildroot} paths in the conf files for i in /etc/htdig.conf /usr/bin/rundig ; do - perl -pi -e "s|%{buildroot}||g" %{buildroot}/$i + perl -pi -e "s|%{buildroot}||g" %{buildroot}/$i done -mkdir -p %{buildroot}%{_datadir} +%__install -d %{buildroot}%{_datadir} mv %{buildroot}%{contentdir}/html/htdig %{buildroot}%{_datadir} ln -sf ../../../usr/share/htdig %{buildroot}%{contentdir}/html/htdig diff --git a/redhat/extras/htdig/patches/fix-ftbfs-gcc14 b/redhat/extras/htdig/patches/fix-ftbfs-gcc14 new file mode 100644 index 000000000..88914b6a0 --- /dev/null +++ b/redhat/extras/htdig/patches/fix-ftbfs-gcc14 @@ -0,0 +1,11 @@ +--- a/db/os_map.c ++++ b/db/os_map.c +@@ -31,6 +31,8 @@ + #endif + + #include "db_int.h" ++#include "db_page.h" ++#include "db_ext.h" + #include "os_jump.h" + + #ifdef HAVE_MMAP diff --git a/redhat/extras/htdig/patches/gcc-11 b/redhat/extras/htdig/patches/gcc-11.patch index 09c974cea..09c974cea 100644 --- a/redhat/extras/htdig/patches/gcc-11 +++ b/redhat/extras/htdig/patches/gcc-11.patch diff --git a/redhat/extras/htdig/patches/series b/redhat/extras/htdig/patches/series index da0d40c91..857883dbb 100644 --- a/redhat/extras/htdig/patches/series +++ b/redhat/extras/htdig/patches/series @@ -3,4 +3,5 @@ kfreebsd gcc-6 sourceforge_logo drop-bogus-assignment -gcc-11 +gcc-11.patch +fix-ftbfs-gcc14 diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec index 35f83a72e..b27247ee9 100644 --- a/redhat/extras/pinentry-tqt/pinentry-tqt.spec +++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec @@ -17,7 +17,7 @@ Name: pinentry-tqt -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: PIN or passphrase entry dialogs Group: System/Libraries diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index a73b9c7ee..011698526 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.2 +%define tde_version 14.1.3 %endif # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". @@ -49,7 +49,7 @@ Source0: trinity-3.5.13-fedora.repo Source1: trinity-3.5.13-rhel.repo Source2: RPM-GPG-KEY-trinity -%if 0%{?fedora} >= 32 || 0%{?mgaversion} >= 7 || 0%{?pclinuxos} || 0%{?rhel} >= 8 || 0%{?suse_version} +%if 0%{?fedora} >= 32 || 0%{?mdkver} >= 5000000 || 0%{?mgaversion} >= 7 || 0%{?pclinuxos} || 0%{?rhel} >= 8 || 0%{?suse_version} Requires: pinentry-tqt %endif Requires: trinity-tdeaccessibility >= %{version} @@ -206,6 +206,7 @@ Requires: trinity-smartcardauth Requires: trinity-soundkonverter Requires: trinity-tastymenu Requires: trinity-tdebluez +Requires: trinity-tde-ebook-reader Requires: trinity-tde-guidance Requires: trinity-tde-style-baghira Requires: trinity-tde-style-domino @@ -240,6 +241,7 @@ Requires: trinity-twin-style-crystal Requires: trinity-twin-style-dekorator Requires: trinity-twin-style-fahrenheit Requires: trinity-twin-style-machbunt +Requires: trinity-twin-style-mallory Requires: trinity-twin-style-suse2 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 e6fccabdb..619d4b1a8 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.2 +%define tde_version 14.1.3 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec index 68bc75af8..353b1c1a5 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg kipi-plugins %define tde_prefix /opt/trinity @@ -140,20 +140,15 @@ BuildRequires: libxslt-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?pclinuxos} -BuildRequires: MesaGLU-devel -%else -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel -%endif +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec index e881fc9b8..b0d1fb88a 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg libkdcraw %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec index c44f92c28..e2ba31887 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.2 +%define tde_version 14.1.3 %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 38e0d979c..869bd2094 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg libkipi %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec index 8168d4711..f0e86d97a 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg libksquirrel %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index 80c14f13b..27d29f172 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg libtdeldap %define tde_prefix /opt/trinity @@ -78,7 +78,7 @@ BuildRequires: libtool-ltdl-devel # SASL support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}sasl-devel %else BuildRequires: %{_lib}sasl2-devel @@ -90,7 +90,7 @@ BuildRequires: cyrus-sasl-devel # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -115,7 +115,11 @@ BuildRequires: libheimdal-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec index 38ad6cce6..dd71de0ce 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.2 +%define tde_version 14.1.3 %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 23c576859..98c6d90a9 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg pytde %define tde_prefix /opt/trinity @@ -93,7 +93,7 @@ from tdeio, tdejs, tdehtml and tdeprint. %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{python_sitearch}/*.so -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/dcopexport.py* %{python_sitearch}/dcopext.py* %{python_sitearch}/pytdeconfig.py* diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index 4cbfab470..6eec0582d 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.2 +%define tde_version 14.1.3 %endif %define tde_pkg pytdeextensions %define tde_prefix /opt/trinity |