diff --git a/redhat/Makefile b/redhat/Makefile index e29fb3105..5b18b9d8c 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.0}) +TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.1}) 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 kompose konversation kooldock kopete-otr kpicosim kpilot 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-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator 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-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-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-machbunt twin-style-suse2 wlassistant yakuake i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n ### Trinity Dependencies @@ -241,8 +241,8 @@ bibletime: tdebase codeine: tdebase $(call buildpkg,applications/multimedia/codeine) -compizconfig-backend-kconfig: tdebase - $(call buildpkg,applications/misc/compizconfig-backend-kconfig) +compizconfig-backend-tdeconfig: tdebase + $(call buildpkg,applications/misc/compizconfig-backend-tdeconfig) desktop-effects-tde: tdebase $(call buildpkg,applications/misc/desktop-effects-tde) @@ -410,6 +410,9 @@ knutclient: tdebase koffice: tdebase tdegraphics wv2 $(call buildpkg,applications/office/koffice) +kommando: tdebase + $(call buildpkg,applications/utilities//kommando) + kompose: tdebase $(call buildpkg,applications/utilities/kompose) @@ -430,6 +433,9 @@ ifeq (,$(filter $(DIST),.el5 .oss154 .oss155 .osstw)) $(call buildpkg,applications/office/kpilot) endif +kplayer: tdebase + $(call buildpkg,applications/multimedia/kplayer) + kpowersave: tdebase $(call buildpkg,applications/system/kpowersave) diff --git a/redhat/applications/development/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec index 593ff73da..d7c9a03ea 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.0 +%define tde_version 14.1.1 %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 085e83b9f..f426736f4 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.0 +%define tde_version 14.1.1 %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 bd6a45ea8..959a7ffc0 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.0 +%define tde_version 14.1.1 %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 36bade6eb..19a6e010d 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.0 +%define tde_version 14.1.1 %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 84364ac92..a23c33741 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.0 +%define tde_version 14.1.1 %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 6ccd630e9..291e44bd1 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.0 +%define tde_version 14.1.1 %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 ddc1c3123..ffc158ff5 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg piklab %define tde_prefix /opt/trinity diff --git a/redhat/applications/development/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec index 98047b557..7339ac31c 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdesvn %define tde_prefix /opt/trinity @@ -79,8 +79,12 @@ BuildRequires: brp-check-trinity # SVN support BuildRequires: subversion-devel -# SQLITE support -BuildRequires: sqlite-devel +# SQLITE3 support +%if 0%{?mgaversion} +BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel +%endif BuildRequires: libtqt3-mt-sqlite3 # ACL support diff --git a/redhat/applications/games/knights/knights.spec b/redhat/applications/games/knights/knights.spec index 027d087be..a0cf3fec9 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.0 +%define tde_version 14.1.1 %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 348b72e65..83a797b81 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.0 +%define tde_version 14.1.1 %endif # TDE specific building variables diff --git a/redhat/applications/graphics/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec index 5c4815399..5eaa31c88 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.0 +%define tde_version 14.1.1 %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 e39d2a6da..bb824f3ea 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.0 +%define tde_version 14.1.1 %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 723996a29..3ae976205 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.0 +%define tde_version 14.1.1 %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 fc17cceda..97c63fd33 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg ksquirrel %define tde_prefix /opt/trinity @@ -125,6 +125,7 @@ OpenGL and dynamic format support. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export kde_confdir="%{tde_confdir}" # Specific path for RHEL4 @@ -132,6 +133,14 @@ if [ -d /usr/X11R6 ]; then export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi +# FIXME: error during ./configure solved by CXXFLAGS below +export CXXFLAGS="${CXXFLAGS} -I%{tde_tdeincludedir}" + +# FIXME: FTBFS during ./configure under rhel8/rhel9 +%if 0%{?rhel} >= 8 +export CXXFLAGS="${CXXFLAGS} -fPIC" +%endif + # Warning: --enable-final causes FTBFS %configure \ --prefix=%{tde_prefix} \ @@ -160,13 +169,14 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO +%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README %{tde_bindir}/ksquirrel %{tde_bindir}/ksquirrel-libs-configurator %{tde_bindir}/ksquirrel-libs-configurator-real @@ -187,9 +197,9 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/mimelnk/image/*.desktop %{tde_datadir}/services/ksquirrelpart.desktop %{tde_mandir}/man1/ksquirrel.1 +%{tde_mandir}/man1/ksquirrel-libs-configurator.1* %config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc %config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc %config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc - %changelog diff --git a/redhat/applications/graphics/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec index 173c739c1..bf020e880 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.0 +%define tde_version 14.1.1 %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 06004d5f4..316deb83a 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.0 +%define tde_version 14.1.1 %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 b7dcdd2ba..e8de46d52 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.0 +%define tde_version 14.1.1 %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 6dd764389..4ce164694 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.0 +%define tde_version 14.1.1 %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 6317ab30d..427deeb19 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.0 +%define tde_version 14.1.1 %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 f368e749f..5880c5a2e 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.0 +%define tde_version 14.1.1 %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 df690fe31..afad3b827 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.0 +%define tde_version 14.1.1 %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 286488b60..0effd0783 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.0 +%define tde_version 14.1.1 %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 3360fc21f..e939e914e 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.0 +%define tde_version 14.1.1 %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 4cb54d155..bc84a92fc 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.0 +%define tde_version 14.1.1 %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 da3af96ad..a3337d46b 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.0 +%define tde_version 14.1.1 %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 2a9d9ca92..7e6f40daf 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.0 +%define tde_version 14.1.1 %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 8d1ee44d5..285b431ec 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.0 +%define tde_version 14.1.1 %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 ef1ae5bb9..15800cfab 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tork %define tde_prefix /opt/trinity diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec index ad1fe5dcb..0ae0704ef 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.0 +%define tde_version 14.1.1 %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 e3f8bf5cb..ee779185f 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.0 +%define tde_version 14.1.1 %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 68af31207..698538c1b 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kcmldap %define tde_prefix /opt/trinity diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec index c99c0b685..133ef56ed 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kcmldapcontroller %define tde_prefix /opt/trinity diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec index bbe317e3d..d7603c5b3 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kcmldapmanager %define tde_prefix /opt/trinity diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec index 38e159c48..a03d50e34 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kerberostray %define tde_prefix /opt/trinity diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec index e2f5fa46d..ea74fdc4c 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg krecipes %define tde_prefix /opt/trinity @@ -86,8 +86,12 @@ BuildRequires: postgresql-server-devel BuildRequires: postgresql-devel %endif -# SQLITE support -BuildRequires: sqlite-devel +# SQLITE3 support +%if 0%{?mgaversion} +BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel +%endif %description diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index dae74c9f6..d1cba544d 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg amarok %define tde_prefix /opt/trinity @@ -108,7 +108,13 @@ BuildRequires: libusb-devel BuildRequires: mysql-devel BuildRequires: SDL-devel BuildRequires: taglib-devel -BuildRequires: sqlite-devel + +# SQLITE3 support +%if 0%{?mgaversion} +BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel +%endif # POSTGRESQL support BuildRequires: postgresql diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec index 60a487700..4dd96e6e4 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg codeine %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec index e995c3215..dee67748d 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.0 +%define tde_version 14.1.1 %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 f5a2cb013..4bbe7b8cd 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg k3b %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec index 0a9801a8d..4d429cdf9 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg k9copy %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec index c37dad135..8ebea77d0 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.0 +%define tde_version 14.1.1 %endif # TDE specific building variables diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec index da41a4682..617665d26 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kaffeine %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec index 250ac7f5b..b50cfc04a 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kmplayer %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec index bb86e0371..5731b59be 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.0 +%define tde_version 14.1.1 %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 14d1f1fb0..5c49a39f2 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg mplayerthumbs %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec index 3e6834a7f..c5e068864 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.0 +%define tde_version 14.1.1 %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 6c3ffae19..859e4b367 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg soundkonverter %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec index 4070f8b6b..c728c5d52 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tderadio %define tde_prefix /opt/trinity @@ -224,6 +224,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/locolor/*/*/tderadio*.png %lang(de) %{tde_datadir}/locale/de/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 %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %{tde_tdedocdir}/HTML/en/tderadio/ diff --git a/redhat/applications/office/basket/basket.spec b/redhat/applications/office/basket/basket.spec index 35916dcb1..205637c0a 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.0 +%define tde_version 14.1.1 %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 7026fc21e..66771dc72 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.0 +%define tde_version 14.1.1 %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 22ba62914..c521fc888 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.0 +%define tde_version 14.1.1 %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 967b8a3c6..f74a37355 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.0 +%define tde_version 14.1.1 %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 d7d26d1e1..d07ee9dd7 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.0 +%define tde_version 14.1.1 %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 fa7afc315..581d485a6 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.0 +%define tde_version 14.1.1 %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 4f1c28370..ede99d270 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.0 +%define tde_version 14.1.1 %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 077854145..0033fe8fb 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.0 +%define tde_version 14.1.1 %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 841a44c04..4447282aa 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg koffice %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec index dd4c68ad5..e218bdc5c 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kpilot %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec index 0654010ce..0bc382608 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.0 +%define tde_version 14.1.1 %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 827385dc7..7f64349e9 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kima %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec index 5aae73aa9..0f3aefcf4 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.0 +%define tde_version 14.1.1 %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 4381ff697..10b0b120f 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.0 +%define tde_version 14.1.1 %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 918f57f48..5ce0fcb9a 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.0 +%define tde_version 14.1.1 %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 7998140e5..dddb03c7e 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kmyfirewall %define tde_prefix /opt/trinity @@ -146,6 +146,7 @@ university etc.) %{tde_datadir}/mimelnk/application/kmfrs.desktop %{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 c743098c2..c9962b718 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tde-guidance %define tde_prefix /opt/trinity @@ -377,6 +377,11 @@ if [ -d /usr/X11R6 ]; then %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g" fi +# FIXME: ordinal not in range in rhel7 +%if 0%{?rhel} == 7 +export LC_ALL=en_US.UTF-8 +%endif + %__python ./setup.py build @@ -393,6 +398,11 @@ export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}" # For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled. export PYTHONDONTWRITEBYTECODE= +# FIXME: ordinal not in range in rhel7 +%if 0%{?rhel} == 7 +export LC_ALL=en_US.UTF-8 +%endif + %__rm -rf %{buildroot} %__python ./setup.py install \ --prefix=%{tde_prefix} \ diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec index 18b2af3d8..0ce6eeb4d 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.0 +%define tde_version 14.1.1 %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 46d1c6d1a..0d2b74f23 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdenetworkmanager %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec index 78395d8da..05fd543ec 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.0 +%define tde_version 14.1.1 %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 00322f76c..d61373abf 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg wlassistant %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec index be49385f3..e09d49ba0 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.0 +%define tde_version 14.1.1 %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 a2d25b15f..b350e7e6d 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.0 +%define tde_version 14.1.1 %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 415697e00..ad06072a5 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.0 +%define tde_version 14.1.1 %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 09b86d7a6..3883be981 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.0 +%define tde_version 14.1.1 %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 380ea714c..137a662d4 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kdbusnotification %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec index 015eaa364..50b070d57 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg klamav %define tde_prefix /opt/trinity @@ -67,7 +67,14 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: curl-devel BuildRequires: gmp-devel -BuildRequires: sqlite-devel + +# SQLITE3 support +%if 0%{?mgaversion} +BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel +%endif + #BuildRequires: unsermake # CLAMAV support diff --git a/redhat/applications/system/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec index b6f820d57..e12bf3c03 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.0 +%define tde_version 14.1.1 %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 33cddaa00..409147ceb 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.0 +%define tde_version 14.1.1 %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 6fc41e1f5..0746b2355 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.0 +%define tde_version 14.1.1 %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 410e8e783..4f47c204d 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.0 +%define tde_version 14.1.1 %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 cf314c68f..25abd094a 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.0 +%define tde_version 14.1.1 %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 f86297e04..4a5d5cec5 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.0 +%define tde_version 14.1.1 %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 731557a72..34dbb709d 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.0 +%define tde_version 14.1.1 %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 1a36e6ce4..b46316295 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.0 +%define tde_version 14.1.1 %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 bbcf45ee8..9663a3037 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.0 +%define tde_version 14.1.1 %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 ac53e189a..6abd38b3d 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.0 +%define tde_version 14.1.1 %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 635273ad1..79c73822a 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.0 +%define tde_version 14.1.1 %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 e17236b1c..4319874bd 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.0 +%define tde_version 14.1.1 %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 1b7f796f1..67bd1bddd 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.0 +%define tde_version 14.1.1 %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 a57c0e328..310c75985 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdepowersave %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec index 8277d6397..00f59d4e0 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.0 +%define tde_version 14.1.1 %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 97d9157af..8e721f2c6 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.0 +%define tde_version 14.1.1 %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 57f61207f..ebfa11db4 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdeio-appinfo %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec index 3efdf5d7e..46e5308ff 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.0 +%define tde_version 14.1.1 %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 947e89b16..c16538c04 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.0 +%define tde_version 14.1.1 %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 8b833c35e..f1065a807 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.0 +%define tde_version 14.1.1 %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 e8a4418ed..912c1b7c3 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.0 +%define tde_version 14.1.1 %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 8a3804e89..48556527e 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.0 +%define tde_version 14.1.1 %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 6bb629f89..e376d6e79 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.0 +%define tde_version 14.1.1 %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 457febb76..5248f0aba 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.0 +%define tde_version 14.1.1 %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 9e8b23e0a..f13724401 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.0 +%define tde_version 14.1.1 %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 76893f3c9..7f4e8469b 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.0 +%define tde_version 14.1.1 %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 97ac46a3f..68723e0c4 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg ksplash-engine-moodin %define tde_prefix /opt/trinity @@ -165,9 +165,7 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %{tde_tdelibdir}/ksplashmoodin.la %{tde_tdelibdir}/ksplashmoodin.so -%if "%{?tde_version}" == "14.1.0" %{tde_datadir}/apps/ksplash/Themes/Architecture/ -%endif %{tde_datadir}/apps/ksplash/Themes/FingerPrint/ %{tde_datadir}/apps/ksplash/Themes/MoodinKDE/ %{tde_datadir}/services/ksplashmoodin.desktop 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 d564e576e..1ac062b89 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.0 +%define tde_version 14.1.1 %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 3ae8a3cf4..8ebb76464 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tde-style-baghira %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/tde-style-domino/tde-style-domino.spec b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec index 55517e191..373b77935 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.0 +%define tde_version 14.1.1 %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 febea2eab..e5ffdca03 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.0 +%define tde_version 14.1.1 %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 d021dccf8..ee6783cf2 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tde-style-lipstik %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 f7df29f07..4b4cbfc99 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.0 +%define tde_version 14.1.1 %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 abb9f2240..ce21c815f 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.0 +%define tde_version 14.1.1 %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 8d53b5469..f9334f548 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.0 +%define tde_version 14.1.1 %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 e5a20e401..af9fbaa42 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg twin-style-dekorator %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec index d8734ef3d..22cc38a02 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg twin-style-machbunt %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec index 48ae0e695..fa73b0444 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.0 +%define tde_version 14.1.1 %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 432c6072c..6254b2e19 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.0 +%define tde_version 14.1.1 %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 09023a7c8..6699d6f88 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.0 +%define tde_version 14.1.1 %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 b197f9741..b41f78ad0 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.0 +%define tde_version 14.1.1 %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 c2904d693..3bed56f8b 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.0 +%define tde_version 14.1.1 %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 594396581..02324266f 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.0 +%define tde_version 14.1.1 %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 1b9bc1148..049da508c 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.0 +%define tde_version 14.1.1 %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 adbf9d811..5297c3447 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.0 +%define tde_version 14.1.1 %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 ab101e33e..07f3971f0 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.0 +%define tde_version 14.1.1 %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 new file mode 100644 index 000000000..2b9329271 --- /dev/null +++ b/redhat/applications/utilities/kommando/kommando.spec @@ -0,0 +1,162 @@ +# +# spec file for package kommando (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.1 +%endif +%define tde_pkg kommando +%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.5.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Calculator for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} + +BuildRequires: desktop-file-utils + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +AbaKus is a complex calculator, which provides +many different kinds of calculations. +Think of it as bc (the command-line calculator) with a nice GUI. +It also gives information about mathematical variables and +has the user-friendly menu options of a normal TDE application. + + +%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" + +# Specific path for RHEL4 +if [ -d "/usr/X11R6" ]; then + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" +fi + +if ! rpm -E %%cmake|grep -q "cd 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} \ + \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +# Clean unwanted files +%__rm -f %{?buildroot}%{tde_libdir}/libkommando.la +%__rm -f %{?buildroot}%{tde_libdir}/libkommando.so + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_datadir}/icons/hicolor/*/apps/kommando.png +%{tde_tdedocdir}/HTML/en/kommando/ +%{tde_tdeappdir}/kommando.desktop +%{tde_mandir}/man1/kommando.1* +%{tde_datadir}/services/kded/kommandod.desktop +%{tde_libdir}/libkommando.so.1 +%{tde_libdir}/libkommando.so.1.0.0 +%{tde_tdelibdir}/kcm_kommando.la +%{tde_tdelibdir}/kcm_kommando.so +%{tde_tdelibdir}/kded_kommandod.la +%{tde_tdelibdir}/kded_kommandod.so + + +%changelog diff --git a/redhat/applications/utilities/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec index 6fbe30cfa..fb6811854 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.0 +%define tde_version 14.1.1 %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 e36feb919..e0832db3a 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.0 +%define tde_version 14.1.1 %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 f89269441..5f7cf9242 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.0 +%define tde_version 14.1.1 %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 7164239fb..031413561 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.0 +%define tde_version 14.1.1 %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 4a421c78a..395118746 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.0 +%define tde_version 14.1.1 %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 6e214e641..f725cae71 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_VERSION] -# Example: build_rpm_package.sh tdebase 14.1.0 +# Example: build_rpm_package.sh tdebase 14.1.1 PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" 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 cc9a33e54..654fa4197 100755 --- a/redhat/build/configure_repository.sh +++ b/redhat/build/configure_repository.sh @@ -1,6 +1,6 @@ #!/bin/bash -x -TDE_VERSION="${1:-${TDE_VERSION:-14.1.0}}" +TDE_VERSION="${1:-${TDE_VERSION:-14.1.1}}" 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 df6cadc9d..e054e7806 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 -# Example: gather_rpm_sources.sh tdebase 14.1.0 /tmp/tdebase +# Example: gather_rpm_sources.sh tdebase 14.1.1 /tmp/tdebase PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" DIST="$4" diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh index b89f9bb7f..a22073044 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.0-0_pre727+6be06b3d.mga3.opt +# Sample package name: trinity-tdelibs-14.1.1-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 3f7dca3b1..1fa92bd88 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.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" 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 62954bd01..d4302f447 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.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index e2558d585..ed163c5f5 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.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" [ -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 bf6db3b9e..2d0b2aadb 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.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" [ -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 529aa49ed..8d9878476 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.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" DIST="$3" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh index 529b11593..b0ac66bf6 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.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" [ -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 ce8042e31..d1f340480 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.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" [ -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 336a83cc3..7cc93bfa4 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.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" 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 fe2d948b9..4357767e8 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.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" 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 c00078f1e..31248abd2 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.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}" LOCKFILE="/tmp/lock.${0##*/}" while [ -e "${LOCKFILE}" ]; do @@ -20,7 +20,8 @@ if [ -x /usr/sbin/urpmi ]; then 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='(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)' elif [ -x /usr/bin/yum ]; then if [ "$(rpm -E %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 3884089c7..491111ee3 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.0 +%define tde_version 14.1.1 %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 7034a5984..b821069ad 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdeaccessibility %define tde_prefix /opt/trinity diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec index 5b57a05de..7e8e7bee9 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdeaddons %define tde_prefix /opt/trinity diff --git a/redhat/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec index 441e3d866..6436b2309 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.0 +%define tde_version 14.1.1 %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 ad15a0c1d..24d94f6f2 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdeartwork %define tde_prefix /opt/trinity diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index 390e4a1af..fa3501b5a 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdebase %define tde_prefix /opt/trinity @@ -1145,11 +1145,9 @@ plugdev group. %{tde_tdedocdir}/HTML/en/tdefontview/ # tdehwtray -%if "%{?tde_version}" == "14.1.0" %{tde_bindir}/tdehwdevicetray %{tde_tdeappdir}/tdehwdevicetray.desktop %{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop -%endif # The following features are not compiled under RHEL 5 and older %if 0%{?with_tderandrtray} @@ -1835,11 +1833,9 @@ group. %{tde_tdelibdir}/media_propsdlgplugin.so %{tde_datadir}/services/media_propsdlgplugin.desktop -%if "%{tde_version}" == "14.1.0" %{tde_tdelibdir}/ktrashpropsdlgplugin.la %{tde_tdelibdir}/ktrashpropsdlgplugin.so %{tde_datadir}/services/ktrashpropsdlgplugin.desktop -%endif ########## @@ -2096,10 +2092,7 @@ already. Most users won't need this. %{tde_mandir}/man1/tdmctl.1* %{tde_mandir}/man1/tdm_config.1* %{tde_mandir}/man1/tdm_greet.1* - -%if "%{?tde_version}" == "14.1.0" %{tde_bindir}/tdecryptocardwatcher -%endif # XDG user faces %dir %{_datadir}/faces @@ -2826,10 +2819,6 @@ TDE will start, but many good defaults will not be set. %{tde_mandir}/man1/starttde.1* %post -n trinity-ksmserver -%if 0%{?mdkversion} || 0%{?mgaversion} -fndSession -%endif - # openSUSE 15.0 alternatives %if 0%{?suse_version} >= 1500 update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || : @@ -3007,6 +2996,7 @@ This package contains the default X window manager for TDE. %{tde_tdeappdir}/twinoptions.desktop %{tde_tdeappdir}/twinrules.desktop %{tde_datadir}/applnk/.hidden/twinactions.desktop +%{tde_datadir}/applnk/.hidden/twinactiveborders.desktop %{tde_datadir}/applnk/.hidden/twinadvanced.desktop %{tde_datadir}/applnk/.hidden/twinfocus.desktop %{tde_datadir}/applnk/.hidden/twinmoving.desktop @@ -3200,6 +3190,9 @@ Windows and Samba shares. if [ -x "/usr/bin/reboot" ]; then POWEROFF="/usr/bin/poweroff" REBOOT="/usr/bin/reboot" +elif [ -x "/usr/sbin/reboot" ]; then + POWEROFF="/usr/sbin/poweroff" + REBOOT="/usr/sbin/reboot" fi if [ -n "${REBOOT}" ]; then %__sed -i \ diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index 87f59ea32..ab5f9fa6d 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdebindings %define tde_prefix /opt/trinity diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec index 7bbef35e9..f4370dfe5 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.0 +%define tde_version 14.1.1 %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 273705e9f..3f463d0bd 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.0 +%define tde_version 14.1.1 %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 1be2d079d..6df51cc83 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdegraphics %define tde_prefix /opt/trinity diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec index 6b817e97b..9e03ce0db 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdelibs %define tde_prefix /opt/trinity diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec index 13b679bbd..432e2d0bd 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdemultimedia %define tde_prefix /opt/trinity diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec index 2dd26ce3e..0e4463018 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdenetwork %define tde_prefix /opt/trinity @@ -715,7 +715,7 @@ Support for more IM protocols can be added through a plugin system. %endif # smpp plugin for kopete %{tde_datadir}/config.kcfg/smpppdcs.kcfg -# aim support is deprecated in TDE 14.1.0 +# aim support is deprecated in TDE 14.1.x %if 0%{?with_aim} %{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png %{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec index e3a9f483e..d6b4cc1e5 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdepim %define tde_prefix /opt/trinity diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec index 53dfffc6e..dd08e7075 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdesdk %define tde_prefix /opt/trinity diff --git a/redhat/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec index eb823346d..cd516dd71 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.0 +%define tde_version 14.1.1 %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 eb42326d0..17749989e 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdeutils %define tde_prefix /opt/trinity @@ -169,9 +169,7 @@ BuildRequires: openssl-devel %define dont_relink 1 %endif -%if "%{?tde_version}" == "14.1.0" %define build_tdefilereplace 1 -%endif Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec index 5730a8207..9a9ad31f7 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdevelop %define tde_prefix /opt/trinity @@ -317,8 +317,6 @@ individual needs. %{tde_tdelibdir}/libkdevphpsupport.so %{tde_tdelibdir}/libkdevpythonsupport.la %{tde_tdelibdir}/libkdevpythonsupport.so -%{tde_tdelibdir}/libkdevqt4importer.la -%{tde_tdelibdir}/libkdevqt4importer.so %{tde_tdelibdir}/libkdevqtimporter.la %{tde_tdelibdir}/libkdevqtimporter.so %{tde_tdelibdir}/libkdevquickopen.la @@ -437,7 +435,6 @@ individual needs. %{tde_datadir}/services/kdevpghpfoptions.desktop %{tde_datadir}/services/kdevphpsupport.desktop %{tde_datadir}/services/kdevpythonsupport.desktop -%{tde_datadir}/services/kdevqt4importer.desktop %{tde_datadir}/services/kdevqtimporter.desktop %{tde_datadir}/services/kdevquickopen.desktop %{tde_datadir}/services/kdevrbdebugger.desktop diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec index 58bc4c371..68f95aa31 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tdewebdev %define tde_prefix /opt/trinity @@ -104,9 +104,7 @@ BuildRequires: libicu-devel # Readline support BuildRequires: readline-devel -%if "%{?tde_version}" != "14.1.0" -%define build_tdefilereplace 1 -%endif +%define build_tdefilereplace 0 Obsoletes: trinity-kdewebdev-libs < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-kdewebdev-libs = %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec index 11b6ee27a..7cc92149a 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.0 +%define tde_version 14.1.1 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index 5e7809a97..9846dcedd 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg arts %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 3937f6ff3..ac637cd33 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.0 +%define tde_version 14.1.1 %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 5c2aef17e..7f543c58b 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.0 +%define tde_version 14.1.1 %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 2fd896c2f..a6d12a5af 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.0 +%define tde_version 14.1.1 %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 039697747..ea549667f 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.0 +%define tde_version 14.1.1 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc b/redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc new file mode 100644 index 000000000..5d46238fc --- /dev/null +++ b/redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc @@ -0,0 +1 @@ +setBadness('lto-no-text-in-archive', 0) diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 29569afb4..f679983fe 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index a06752bc1..f029b9d3b 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index aa965f98c..d7123cd24 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg polkit-tqt diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec index a400ee336..b96c52efb 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg pytqt %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index 9a4d12774..ed63e325e 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/tde-cmake/tde-cmake.spec b/redhat/dependencies/tde-cmake/tde-cmake.spec index 71b89c4fb..ce25d61a0 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.0 +%define tde_version 14.1.1 %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 567649b9a..9427f60e2 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.0 +%define tde_version 14.1.1 %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 258b6a3c5..ca99d18ef 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.0 +%define tde_version 14.1.1 %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 b926e184e..001aa64df 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tqscintilla diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index 4039a0c1e..c73abd7fd 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.0 +%define tde_version 14.1.1 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -259,12 +259,11 @@ BuildRequires: mysql-devel # unixODBC support BuildRequires: unixODBC-devel -# SQLITE support -BuildRequires: sqlite-devel - # SQLITE3 support %if 0%{?mgaversion} BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel %endif # POSTGRESQL support @@ -737,8 +736,6 @@ before you send a bugreport. %{_includedir}/tqt3/qsql_sqlite3.h %{_includedir}/tqt3/qsqlcachedresult.h %{_includedir}/tqt3/qt_pch.h -%{_includedir}/tqt3/qtmultilineedit.h -%{_includedir}/tqt3/qttableview.h %{_includedir}/tqt3/qwindow.h %{_includedir}/tqt3/sourcetemplateiface.h %{_includedir}/tqt3/templatewizardiface.h @@ -916,8 +913,6 @@ libtqt3-headers. %{_includedir}/tqt3/ntqtstream.h %{_includedir}/tqt3/ntqwidcoll.h %{_includedir}/tqt3/ntqwindefs.h -%dir %{_docdir}/tqt3-compat-headers -%{_docdir}/tqt3-compat-headers/attic.tar.gz ########### @@ -1492,12 +1487,6 @@ done #__install -m644 -D "tools/linguist/linguist/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png" #__install -m644 -D "tools/qtconfig/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png" -# build attic package and copy it to tqt3-compat-headers -pushd src -tar cvvfz "attic.tar.gz" attic/ -install -D -m644 "attic.tar.gz" "%{?buildroot}%{_docdir}/tqt3-compat-headers/attic.tar.gz" -popd - # install the man pages %__install -d "%{?buildroot}%{_mandir}/man1" %__install -m644 "doc/man/man1/"*"embed.1" "%{?buildroot}%{_mandir}/man1/" diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index 475aeac18..e2948abea 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg tqtinterface @@ -191,7 +191,6 @@ although some code has been added for useful functions that are no longer part o %{_bindir}/moc-tqt %{_bindir}/tmoc %{_bindir}/tqt-replace -%{_bindir}/tqt-replace-stream %{_bindir}/uic-tqt %{_includedir}/tqt/ %{_libdir}/libtqt.la diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index cbc2a003f..6f19d5691 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.1" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index a16417a58..3c2567b56 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=i686 # Add local repositories diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index 806685e8a..d5d1db9ac 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add local repositories diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 2ed6aa216..1d932f3c0 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=i686 # Enable proxy diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index e59ee8957..044a49686 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Enable proxy diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index a856eb671..9dcd8c800 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Enable proxy @@ -38,11 +38,11 @@ COPY rpmmacros /home/trinity/.rpmmacros RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm -RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/y/yaz-5.31.1-4.fc36.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/y/yaz-5.31.1-4.fc36.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm -RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/r/rdesktop-1.9.0-7.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/r/rdesktop-1.9.0-7.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm -RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 78f152ba6..f2e00c95c 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Enable custom repository @@ -41,19 +41,19 @@ COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \ +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 diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 index 3b37c6507..3bb5d4e32 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Enable proxy @@ -38,10 +38,10 @@ COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm RUN wget -nv -P ${HOME}/rpmbuild/RPMS/x86_64 \ @@ -49,53 +49,53 @@ RUN wget -nv -P ${HOME}/rpmbuild/RPMS/x86_64 \ http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib{icu69,yaz}-*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \ +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 rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/b/bdftopcf-1.1-4.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/b/bdftopcf-1.1-4.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/bdftopcf-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/paper-2.3-4.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/paper-2.3-4.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/paper-2*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/psutils-2.07-2.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/psutils-2.07-2.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-2*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-4.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-4.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/h/html2ps-1.0-0.42.b7.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/h/html2ps-1.0-0.42.b7.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/html2ps-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libxml++-2.42.1-3.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libxml++-2.42.1-3.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libofx-0.10.3-2.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libofx-0.10.3-2.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP-GeoLite-data-2*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-1.6.12-11.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-1.6.12-11.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP{,-devel}-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \ +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 diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64 index 2336d4548..3b185c3d9 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 index 7ed2344f1..81273103b 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64 index adf0c84b3..05d4d17d5 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686 index d9ed83adb..c2bf90f88 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64 index 85e843edd..bff0ba5be 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 index d904832ad..2bcba1c9f 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.0 +ARG TDE_VERSION=14.1.1 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 bc1403a5e..d0b477f70 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.0 +ARG TDE_VERSION=14.1.1 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 eb47cda8c..94c56f367 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.0 +ARG TDE_VERSION=14.1.1 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 a096b2321..a601bd582 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.0 +ARG TDE_VERSION=14.1.1 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 991b5a194..b086d4b27 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.0 +ARG TDE_VERSION=14.1.1 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 3caf1c05e..d86b60bba 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.0 +ARG TDE_VERSION=14.1.1 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 9f93a9b72..a762ba255 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.0 +ARG TDE_VERSION=14.1.1 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 ec0e049b8..334270815 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.0 +ARG TDE_VERSION=14.1.1 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 4bd74cf4a..7f0aa835d 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.0 +ARG TDE_VERSION=14.1.1 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 18b2ad704..3165f1d8f 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.0 +ARG TDE_VERSION=14.1.1 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 ff247e8ca..40037f7b7 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.0 +ARG TDE_VERSION=14.1.1 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 bdbc139b9..0e62db0f6 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.0 +ARG TDE_VERSION=14.1.1 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 0390ea2f7..35d3e6f8c 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Fix DNF database corruption @@ -31,13 +31,11 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ USER trinity COPY rpmmacros /home/trinity/.rpmmacros -RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm - 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 \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* -RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ +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/f37/packages b/redhat/docker/f37/packages index 186368b5d..6fd5a4f15 100644 --- a/redhat/docker/f37/packages +++ b/redhat/docker/f37/packages @@ -117,6 +117,7 @@ libofx-devel libogg-devel libotr-devel libpaper-devel +libpqxx-devel libqalculate-devel libraw1394-devel librsvg2 diff --git a/redhat/docker/f38/Dockerfile.x86_64 b/redhat/docker/f38/Dockerfile.x86_64 index 9eb2900fa..2ed6c205f 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Fix DNF database corruption @@ -35,7 +35,7 @@ RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* -RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ +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/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64 index 16f58288b..659fc69d3 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index d41472423..74b42272e 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.0 +ARG TDE_VERSION=14.1.1 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 36887a9dd..ffd545adb 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 index 0d7d949d4..9bf0bd292 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.0 +ARG TDE_VERSION=14.1.1 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 1fcf07ccb..a5c266d61 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686 index f465d0914..bb5d6ce51 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.0 +ARG TDE_VERSION=14.1.1 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 6e978f9ee..31ab350ff 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686 index f465d0914..0892fdebb 100644 --- a/redhat/docker/mga9/Dockerfile.i686 +++ b/redhat/docker/mga9/Dockerfile.i686 @@ -1,38 +1,36 @@ -FROM mageia32:8 +FROM mageia32:9 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=i686 # Reset URPMI repositories to default # Enable more URPMI repositories -RUN urpmi.removemedia -a \ - && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/i586/ \ - && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" - # Enable english locales -RUN urpmi --replacepkgs glibc \ - && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : - # Update distribution # Install Trinity build dependencies COPY packages.${ARCH} /packages -RUN urpmi.update -a \ +RUN set -x \ + && urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/i586/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" \ + && urpmi.update -a \ + && urpmi --replacepkgs glibc \ + && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : \ && urpmi --auto-select --auto \ && urpmi --auto $(>"/etc/sudoers" + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc # Configure user trinity USER trinity @@ -45,7 +43,3 @@ RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch - -# Build development packages that are missing -RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \ - && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64 index 49053893b..e7a49b897 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Reset URPMI repositories to default @@ -43,7 +43,3 @@ RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch - -# Build development packages that are missing -#RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \ -# && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686 index c44677fa0..01f51270c 100644 --- a/redhat/docker/mga9/packages.i686 +++ b/redhat/docker/mga9/packages.i686 @@ -71,7 +71,6 @@ libapr-devel libapr-util-devel libart_lgpl-devel libattr-devel -libavformat58 libbinutils-devel libblkid-devel libcdda-devel @@ -122,16 +121,17 @@ libmad-devel libmad-devel libmng-devel libmp3lame-devel +libmusicbrainz5-devel libmp4v2-devel libmpcdec-devel libmtp-devel -libmusicbrainz-devel libnjb-devel libnpth-devel libofx-devel libotr-devel libpaper-devel libpaper-devel +libpcre-devel libpkcs11-helper-devel libpoppler-devel libpulseaudio-devel @@ -230,7 +230,6 @@ scons SDL-devel speex-devel sqlite3-devel -sqlite-devel sshfs-fuse subversion-devel sudo diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64 index 27f28f737..d0f67751d 100644 --- a/redhat/docker/mga9/packages.x86_64 +++ b/redhat/docker/mga9/packages.x86_64 @@ -233,7 +233,6 @@ scons SDL-devel speex-devel sqlite3-devel -sqlite-devel sshfs-fuse subversion-devel sudo diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64 index 69f9fdbe2..afc1d0655 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64 index 292e7303a..4999c7a26 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64 index a1d56c0b6..e32183bac 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64 index c3a341c78..9373aa9f1 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64 index 57da91765..84d24b6bb 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64 index 5931d6e4c..5cc3dfe3f 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository @@ -27,3 +27,10 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch + +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/libheimdal-7.7.0-bp153.1.19.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.7.0.tar.gz|" -e "/^%patch0/ s|^%|#|" \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.7.0/tools/ install diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages index 0f6f7c6f2..1b18b1d8b 100644 --- a/redhat/docker/oss153/packages +++ b/redhat/docker/oss153/packages @@ -21,13 +21,14 @@ clucene-core-devel cmake createrepo cups-devel +curl cyrus-sasl-devel dbus-1-devel dbus-1-glib-devel djvulibre +docbook2x docbook-utils docbook-xsl-stylesheets -docbook2x doxygen GraphicsMagick dssi-devel fdupes @@ -36,6 +37,7 @@ fftw3-devel file-devel flac-devel flex +font-util freetype-devel fribidi-devel gamin-devel @@ -43,15 +45,15 @@ gcc-c++ giflib-devel git glu-devel -gmime-devel gmime2_6-devel +gmime-devel gmp-devel gperf xmlto GraphicsMagick-devel gsl-devel gstreamer-devel -gstreamer-plugins-base-devel gstreamer-devel +gstreamer-plugins-base-devel gtk2-devel gtk3-devel gtk-doc @@ -60,6 +62,7 @@ html2ps hunspell-devel iceauth ImageMagick-devel +imake imlib2-devel intltool java-1_8_0-openjdk-devel @@ -83,6 +86,7 @@ libdb-4_8-devel libdvdread-devel libexempi-devel libexiv2-devel +libfontenc-devel libgadu-devel libGeoIP-devel libgpgme-devel @@ -121,9 +125,10 @@ libraw1394-devel librsvg-devel libsamplerate-devel libSDL-devel -libSM-devel libsmbclient-devel +libSM-devel libsndfile-devel +libssh-devel libtag-devel libtheora-devel libtiff-devel @@ -137,10 +142,17 @@ libvisual-devel libvorbis-devel libwmf-devel libwpd-devel +libXaw-devel +libXdmcp-devel libxine-devel +libxkbfile-devel libXmu-devel +libXScrnSaver-devel libxslt-devel libXt-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel libyaz-devel libzrtpcpp-devel lirc-devel @@ -164,18 +176,23 @@ patch pciutils-devel pcre-devel pcsc-lite-devel +perl-JSON perl-PAR-Packer perl-pcsc pkcs11-helper-devel pkgconfig(pygtk-2.0) -python-devel +polkit-devel +postgresql +postgresql-server-devel python3-devel python3-sip-devel +python-devel recode rpcgen rpm-build rpmlint rsvg-convert +rsync ruby ruby-devel sane-backends-devel @@ -186,6 +203,7 @@ subversion-devel sudo swig sword-devel +texinfo torsocks transfig unixODBC-devel @@ -203,15 +221,3 @@ xscreensaver xscreensaver-data xscreensaver-data-extra xz-devel - -font-util -imake -libXScrnSaver-devel -libXdmcp-devel -libfontenc-devel -libssh-devel -libxkbfile-devel -libXxf86vm-devel -libXxf86dga-devel -libXaw-devel -libXv-devel diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64 index 0a3e3f436..b9e6f75e7 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages index 324cad2de..0eeaa3da6 100644 --- a/redhat/docker/oss154/packages +++ b/redhat/docker/oss154/packages @@ -105,7 +105,6 @@ liblrdf-devel libmad-devel libmng-devel libmp3lame-devel -libmp4v2-devel libmpcdec-devel libmtp-devel libmusicbrainz-devel diff --git a/redhat/docker/oss155/Dockerfile.x86_64 b/redhat/docker/oss155/Dockerfile.x86_64 index 77479d93e..8bc7e0bef 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss155/packages b/redhat/docker/oss155/packages index 6a1682741..3d3897e5b 100644 --- a/redhat/docker/oss155/packages +++ b/redhat/docker/oss155/packages @@ -203,6 +203,7 @@ subversion-devel sudo swig sword-devel +systemd-sysvinit texinfo torsocks transfig diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64 index 72102ab0c..bfaf2c1a7 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64 index d2c6b2d2e..b269ea452 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64 index fc33ddfd6..09979fd7f 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index d8c29751d..703d8fb2a 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=i686 # Add PACKMAN repository @@ -26,14 +26,14 @@ 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.2.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.3.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 \ && 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.1-2.3.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.2-1.2.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 ac50ad16a..5dad3352a 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.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Add PACKMAN repository @@ -26,7 +26,7 @@ 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.2.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.3.src.rpm \ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 252953938..10bb88882 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM pclinuxos:2023 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 # Update distribution @@ -60,4 +60,4 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM 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 \ - && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm + && echo 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 c774baccf..d34407ee8 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -34,6 +34,7 @@ gamin-devel gcc-c++ gettext-devel glib2-devel +gnokii-devel gnutls-devel gpgme-devel gphoto2-devel @@ -56,6 +57,7 @@ lib64cryptsetup-devel lib64dvdread-devel lib64exiv2-devel lib64fbclient-devel +lib64ffmpeg-devel lib64geoip-devel lib64gif-devel lib64gpod4 @@ -85,6 +87,7 @@ lib64xaw-devel lib64xine1.2-devel lib64xtst-devel lib64yaz-devel +libattr-devel libcap-devel libcdda-devel libcln-devel @@ -181,6 +184,7 @@ python-rpm qt4-devel recode rpm-build +rpm-devel ruby-devel scons SDL-devel diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh index 028dfc578..bcc85899d 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.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.1" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh index 9bed4159a..619f9201d 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.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.1" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh index 4e3b51673..d93cf78be 100755 --- a/redhat/docker/remove.sh +++ b/redhat/docker/remove.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.1" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index 322383e2d..9479bad40 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.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.1" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker @@ -18,6 +18,7 @@ chmod 777 "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbui case "${TDE_VERSION}" in "14.0."*) TDE_BRANCH="r14.0.x";; + "14.1."*) TDE_BRANCH="r14.1.x";; *) TDE_BRANCH="master";; esac @@ -33,8 +34,10 @@ ${DOCKER} run -ti --rm \ -e TDE_BRANCH=${TDE_BRANCH} \ -w /home/trinity/tde/${TDE_BRANCH}/tde/packaging/redhat \ -v ${HOME}/.gnupg:/home/trinity/.gnupg \ + -v ${HOME}/tde/3rdparty:/home/trinity/tde/3rdparty \ -v ${HOME}/tde/master:/home/trinity/tde/master \ -v ${HOME}/tde/r14.0.x:/home/trinity/tde/r14.0.x \ + -v ${HOME}/tde/r14.1.x:/home/trinity/tde/r14.1.x \ -v ${HOME}/tde/patches:/home/trinity/tde/patches \ -v ${HOME}/tde/tarballs:/home/trinity/tde/tarballs \ -v ${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}:/home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION} \ diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec index 174391037..4b105f171 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.0 +%define tde_version 14.1.1 %endif %define tde_prefix /opt/trinity diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec index 8c26664fe..08e2085ed 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.1.1 +Version: 1.2.1 Release: 1%{?dist} Summary: PIN or passphrase entry dialogs Group: System/Libraries @@ -92,6 +92,7 @@ fi --disable-pinentry-gnome3 \ --disable-pinentry-gtk2 \ --disable-pinentry-qt \ + --disable-pinentry-qt4 \ --disable-pinentry-qt5 \ --disable-pinentry-tty diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index 7ad295bd6..ab14d4d9d 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.0 +%define tde_version 14.1.1 %endif # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". @@ -159,6 +159,7 @@ Requires: trinity-knowit Requires: trinity-knmap Requires: trinity-knutclient Requires: trinity-koffice-suite +Requires: trinity-kommando Requires: trinity-kompose Requires: trinity-konversation Requires: trinity-kooldock @@ -169,7 +170,7 @@ Requires: trinity-kpicosim Requires: trinity-kpilot %endif %endif -#Requires: trinity-kplayer +Requires: trinity-kplayer Requires: trinity-krecipes Requires: trinity-krename Requires: trinity-krusader diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec index 60ef22ddc..99f4c3d69 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.0 +%define tde_version 14.1.1 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin diff --git a/redhat/libheimdal-7.7.0-bp153.1.19.src.rpm b/redhat/libheimdal-7.7.0-bp153.1.19.src.rpm new file mode 100644 index 000000000..bb7546295 Binary files /dev/null and b/redhat/libheimdal-7.7.0-bp153.1.19.src.rpm differ diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec index a7fbe66a1..3c53c0727 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg kipi-plugins %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec index 05f951ecc..808cbeab0 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.0 +%define tde_version 14.1.1 %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 5b6d29cc1..13643fe01 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.0 +%define tde_version 14.1.1 %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 9eb9a7bc1..788d95a08 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.0 +%define tde_version 14.1.1 %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 f20dcbf71..7571cfccf 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg libksquirrel %define tde_prefix /opt/trinity @@ -362,6 +362,7 @@ This package contains the development libraries for KSquirrel. %{tde_includedir}/ksquirrel-libs/fmt_defs.h %{tde_includedir}/ksquirrel-libs/fmt_types.h %{tde_includedir}/ksquirrel-libs/fmt_utils.h +%{tde_includedir}/ksquirrel-libs/ksquirrel_libs_export.h %{tde_includedir}/ksquirrel-libs/settings.h %{tde_libdir}/ksquirrel-libs/libkls_avs.la %{tde_libdir}/ksquirrel-libs/libkls_avs.so diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index 878c2fbd0..bb6183eee 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg libtdeldap %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec index 42421f156..bc93289d5 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.0 +%define tde_version 14.1.1 %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 62179f7b9..9f59833f5 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg pytde %define tde_prefix /opt/trinity diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index edab0594a..7e2f3663c 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.0 +%define tde_version 14.1.1 %endif %define tde_pkg pytdeextensions %define tde_prefix /opt/trinity