diff options
| author | François Andriot <albator78@libertysurf.fr> | 2024-06-13 08:37:13 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2024-06-13 08:38:31 +0200 |
| commit | ac47c91c6c011631186592695e4251a3bb97dcca (patch) | |
| tree | d91e4e98d96b4b2618d9fb3b879c28b67fc63a8f /redhat | |
| parent | 1488354ed514d043f0c15ddbe8b9aa7c0b43f46c (diff) | |
| download | tde-packaging-ac47c91c6c011631186592695e4251a3bb97dcca.tar.gz tde-packaging-ac47c91c6c011631186592695e4251a3bb97dcca.zip | |
RPM: synchronize redhat directory with r14.1.x branch
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat')
318 files changed, 5763 insertions, 1236 deletions
diff --git a/redhat/Makefile b/redhat/Makefile index cf87f272c..ed2805c48 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -1,10 +1,10 @@ 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.2}) 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))" -DIST := $(shell rpm -E %dist) +DIST := $(shell ./build/rpmdist.sh --dist) buildpkg = \ @echo "Now processing '$(1)' [from $(TDE_PACKAGING_DIR)]."; \ @@ -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-polyester tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-fahrenheit twin-style-machbunt twin-style-suse2 wlassistant yakuake i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n ### Trinity Dependencies @@ -35,7 +35,7 @@ i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n akode: tqtinterface trinity-filesystem $(call buildpkg,dependencies/akode) -arts: tqtinterface trinity-filesystem esound +arts: tqtinterface trinity-filesystem $(call buildpkg,dependencies/arts) avahi-tqt: tqtinterface @@ -116,7 +116,7 @@ tdelibs: brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt tdemultimedia: tdebase akode $(call buildpkg,core/tdemultimedia) -tdenetwork: tdebase rdesktop +tdenetwork: tdebase rdesktop tqca $(call buildpkg,core/tdenetwork) tdepim: tdebase libcaldav libcarddav @@ -139,17 +139,12 @@ tdewebdev: tdebase tdesdk ### 3rd party libraries and tools brp-check-trinity: -ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw )) +ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw )) $(call buildpkg,3rdparty/brp-check-trinity) endif -esound: -ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw )) - $(call buildpkg,3rdparty/esound) -endif - htdig: -ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga6 .mga7 .mga8 )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .fc40 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv5000 )) $(call buildpkg,extras/htdig) endif @@ -159,15 +154,12 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw )) endif lcms: -ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw )) $(call buildpkg,3rdparty/lcms) endif -libbeagle: - $(call buildpkg,3rdparty/libbeagle) - mp4v2: -ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .osstw )) +ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw )) $(call buildpkg,3rdparty/mp4v2) endif @@ -189,7 +181,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151)) endif wv2: -ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37)) +ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39 .fc40)) $(call buildpkg,3rdparty/wv2) endif @@ -222,7 +214,7 @@ mlt: tqtinterface pytdeextensions: tqtinterface pytde $(call buildpkg,libraries/pytdeextensions) -pytde: tqtinterface pytqt +pytde: tqtinterface pytqt sip4-tqt $(call buildpkg,libraries/pytde) ### Trinity Applications @@ -244,8 +236,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) @@ -275,7 +267,7 @@ ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/themes/gtk-qt-engine) endif -gwenview: tdebase +gwenview: tdebase libkipi $(call buildpkg,applications/graphics/gwenview) k3b: tdebase @@ -303,7 +295,7 @@ kbfx: tdebase $(call buildpkg,applications/system/kbfx) kbibtex: tdebase - $(call buildpkg,applications/office/kbibtex) + #$(call buildpkg,applications/office/kbibtex) kbiff: tdebase $(call buildpkg,applications/internet/kbiff) @@ -380,7 +372,7 @@ endif klcddimmer: tdebase $(call buildpkg,applications/settings/klcddimmer) -kmplayer: tdebase +kmplayer: tdebase koffice $(call buildpkg,applications/multimedia/kmplayer) kmyfirewall: tdebase @@ -413,6 +405,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) @@ -429,10 +424,13 @@ kpicosim: tdebase $(call buildpkg,applications/development/kpicosim) kpilot: tdebase tdepim -ifeq (,$(filter $(DIST),.el5 .oss154 .osstw)) +ifeq (,$(filter $(DIST),.el5 .oss154 .oss155 .oss156 .osstw)) $(call buildpkg,applications/office/kpilot) endif +kplayer: tdebase + $(call buildpkg,applications/multimedia/kplayer) + kpowersave: tdebase $(call buildpkg,applications/system/kpowersave) @@ -476,7 +474,7 @@ ktorrent: tdebase $(call buildpkg,applications/internet/ktorrent) kvirc: tdebase - $(call buildpkg,applications/internet/kvirc) + #$(call buildpkg,applications/internet/kvirc) kvkbd: tdebase $(call buildpkg,applications/system/kvkbd) @@ -496,7 +494,7 @@ mplayerthumbs: tdebase piklab: tdebase $(call buildpkg,applications/development/piklab) -polkit-agent-tde: tdebase +polkit-agent-tde: tdebase polkit-tqt ifeq (,$(filter $(DIST), .el5 .el6 )) $(call buildpkg,applications/system/polkit-agent-tde) endif @@ -508,7 +506,7 @@ qalculate-tde: $(call buildpkg,applications/utilities/qalculate-tde) qt4-tqt-theme-engine: tdebase -ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .oss153 .oss154 .osstw)) +ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .omv2490 .omv5000 .oss153 .oss154 .oss155 .oss156 .osstw)) $(call buildpkg,applications/themes/qt4-tqt-theme-engine) endif @@ -592,6 +590,9 @@ tde-style-ia-ora: tdebase tde-style-lipstik: tdebase $(call buildpkg,applications/themes/tde-style-lipstik) +tde-style-polyester: tdebase + $(call buildpkg,applications/themes/tde-style-polyester) + tde-style-qtcurve: tdebase $(call buildpkg,applications/themes/tde-style-qtcurve) @@ -619,6 +620,9 @@ twin-style-crystal: tdebase twin-style-dekorator: tdebase $(call buildpkg,applications/themes/twin-style-dekorator) +twin-style-fahrenheit: tdebase + $(call buildpkg,applications/themes/twin-style-fahrenheit) + twin-style-machbunt: tdebase $(call buildpkg,applications/themes/twin-style-machbunt) @@ -626,7 +630,9 @@ twin-style-suse2: tdebase $(call buildpkg,applications/themes/twin-style-suse2) wlassistant: tdebase +ifeq (,$(filter $(DIST), .omv2490 .omv5000 )) $(call buildpkg,applications/settings/wlassistant) +endif yakuake: tdebase $(call buildpkg,applications/system/yakuake) @@ -653,7 +659,7 @@ fileshareset: $(call buildpkg,extras/fileshareset) pinentry-tqt: tqtinterface -ifeq (,$(filter $(DIST), .el5 .el6 .el7 )) +ifeq (,$(filter $(DIST), .el5 .el6 .el7 .omv2490 .omv5000 )) $(call buildpkg,extras/pinentry-tqt) endif diff --git a/redhat/applications/development/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec index 593ff73da..0a0040b0d 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.2 %endif %define tde_pkg kdbg %define tde_prefix /opt/trinity @@ -120,7 +120,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/development/kdiff3/kdiff3.spec b/redhat/applications/development/kdiff3/kdiff3.spec index 085e83b9f..bd55c3ed1 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.2 %endif %define tde_pkg kdiff3 %define tde_prefix /opt/trinity @@ -71,13 +71,21 @@ BuildRequires: update-desktop-files %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -106,7 +114,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/development/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec index bd6a45ea8..a1a5cf4d6 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.2 %endif %define tde_pkg kpicosim %define tde_prefix /opt/trinity @@ -70,10 +70,18 @@ BuildRequires: fdupes BuildRequires: libidn-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -110,7 +118,7 @@ simulator and export functions to VHDL, HEX and MEM files. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/development/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec index 36bade6eb..464bc87a9 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.2 %endif %define tde_pkg kscope %define tde_prefix /opt/trinity @@ -129,7 +129,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/development/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec index 84364ac92..b29b35c3c 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.2 %endif %define tde_pkg ktechlab %define tde_prefix /opt/trinity @@ -106,7 +106,7 @@ Homepage: http://ktechlab.org/ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/development/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec index e380101ae..02f005d10 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.2 %endif %define tde_pkg kxmleditor %define tde_prefix /opt/trinity @@ -87,6 +87,21 @@ contents. ########## +%package devel +Group: Applications/Multimedia +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Summary: XML Editor for TDE (development files) + +%description devel +Development files for KXMLEditor. + +%files devel +%defattr(-,root,root,-) +%{tde_libdir}/libkxmleditorpart.la +%{tde_libdir}/libkxmleditorpart.so + +########## + %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -98,7 +113,7 @@ contents. %build -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -143,8 +158,6 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kxmleditor -%{tde_libdir}/libkxmleditorpart.la -%{tde_libdir}/libkxmleditorpart.so %{tde_libdir}/libkxmleditorpart.so.1 %{tde_libdir}/libkxmleditorpart.so.1.0.0 %{tde_tdeappdir}/kxmleditor.desktop diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec index ddc1c3123..6c354769d 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.2 %endif %define tde_pkg piklab %define tde_prefix /opt/trinity @@ -80,7 +80,7 @@ BuildRequires: brp-check-trinity BuildRequires: readline-devel # LIBUSB support -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} || 0%{?pclinuxos} BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else @@ -116,7 +116,7 @@ are supported. A command-line programmer and debugger are also available. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" %build diff --git a/redhat/applications/development/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec index 98047b557..f77bbd3b5 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.2 %endif %define tde_pkg tdesvn %define tde_prefix /opt/trinity @@ -79,12 +79,20 @@ 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 +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -97,7 +105,11 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} @@ -257,7 +269,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/games/knights/knights.spec b/redhat/applications/games/knights/knights.spec index 027d087be..5962f316b 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.2 %endif %define tde_pkg knights %define tde_prefix /opt/trinity @@ -67,13 +67,21 @@ BuildRequires: pkgconfig BuildRequires: libtool # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -121,7 +129,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/games/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec index 348b72e65..3c4989111 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.2 %endif # TDE specific building variables @@ -93,7 +93,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/graphics/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec index 5c4815399..16753d951 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.2 %endif %define tde_pkg digikam %define tde_prefix /opt/trinity @@ -70,7 +70,13 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# TIFF support +%if 0%{?mdkver} +BuildRequires: %{_lib}tiff-devel +%else BuildRequires: libtiff-devel +%endif + BuildRequires: gettext # SUSE desktop files utility @@ -92,7 +98,11 @@ BuildRequires: lcms-devel # GPHOTO2 support %if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}gphoto-devel +%else BuildRequires: gphoto2-devel +%endif %else BuildRequires: libgphoto2-devel %endif @@ -324,7 +334,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec index e39d2a6da..f4c3d5a2e 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.2 %endif %define tde_pkg gwenview-i18n %define tde_prefix /opt/trinity @@ -112,7 +112,7 @@ KIPI image framework. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec index 723996a29..77b1fc987 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.2 %endif %define tde_pkg gwenview %define tde_prefix /opt/trinity @@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -118,40 +118,46 @@ KIPI image framework. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +# Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build # Removes useless files (-devel ?) %__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so @@ -207,8 +213,10 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg %{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz %{tde_datadir}/man/man1/gwenview.1* +%{tde_datadir}/pixmaps/gwenview.xpm %{tde_datadir}/services/gvdirpart.desktop %{tde_datadir}/services/gvimagepart.desktop %lang(en) %{tde_tdedocdir}/HTML/en/gwenview/ + %changelog diff --git a/redhat/applications/graphics/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec index fc17cceda..670670175 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.2 %endif %define tde_pkg ksquirrel %define tde_prefix /opt/trinity @@ -85,8 +85,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -118,13 +122,14 @@ OpenGL and dynamic format support. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export kde_confdir="%{tde_confdir}" # Specific path for RHEL4 @@ -132,6 +137,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 +173,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 +201,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..db50315dc 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.2 %endif %define tde_pkg potracegui %define tde_prefix /opt/trinity @@ -66,13 +66,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec index 06004d5f4..7d956ef72 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.2 %endif %define tde_pkg kasablanca %define tde_prefix /opt/trinity @@ -78,13 +78,21 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # UTEMPTER support %if 0%{?suse_version} @@ -129,7 +137,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec index b7dcdd2ba..719fe4931 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.2 %endif %define tde_pkg kbiff %define tde_prefix /opt/trinity @@ -69,13 +69,21 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -112,7 +120,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec index 6dd764389..3c6ef1d42 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.2 %endif %define tde_pkg kftpgrabber %define tde_prefix /opt/trinity @@ -76,7 +76,11 @@ BuildRequires: brp-check-trinity %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -129,7 +133,7 @@ Requires: %{name} = %{version}-%{release} unset QTDIR QTINC QTDIR export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec index 6317ab30d..14ade96fd 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.2 %endif %define tde_pkg knmap %define tde_prefix /opt/trinity @@ -68,13 +68,21 @@ BuildRequires: pkgconfig BuildRequires: libtool # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -123,7 +131,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec index f368e749f..69f7bc141 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.2 %endif %define tde_pkg konversation %define tde_prefix /opt/trinity @@ -66,13 +66,21 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # PYTHON support %global python python3 @@ -93,7 +101,12 @@ BuildRequires: brp-check-trinity %endif # XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif + %if 0%{?suse_version} BuildRequires: docbook-xsl-stylesheets %else @@ -199,7 +212,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec index df690fe31..1bc95975d 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.2 %endif %define tde_pkg kopete-otr %define tde_prefix /opt/trinity @@ -83,8 +83,11 @@ BuildRequires: brp-check-trinity %endif # OTR support +%if 0%{?mdkver} +BuildRequires: %{_lib}otr-devel +%else BuildRequires: libotr-devel - +%endif %description This plugin enables Off-The-Record encryption for the TDE instant @@ -110,7 +113,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec index 286488b60..e1c7d3e1a 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.2 %endif %define tde_pkg kshowmail %define tde_prefix /opt/trinity @@ -77,13 +77,21 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -108,7 +116,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec index 3360fc21f..fa2fbcb33 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.2 %endif %define tde_pkg kstreamripper %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec index 4cb54d155..d67deae4f 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.2 %endif %define tde_pkg ktorrent %define tde_prefix /opt/trinity @@ -123,7 +123,7 @@ enabling background downloading. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec index da3af96ad..a4b2b7fcc 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.2 %endif %define tde_pkg kvirc %define tde_prefix /opt/trinity @@ -143,7 +143,7 @@ with the K Desktop Environment version 3. %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" ./autogen.sh @@ -172,10 +172,10 @@ export PATH="%{tde_bindir}:${PATH}" --with-kde-services-dir=%{tde_datadir}/services \ --with-kde-library-dir=%{tde_libdir} \ --with-kde-include-dir=%{tde_tdeincludedir} \ - --with-qt-name=tqt \ - --with-qt-library-dir=%{_libdir} \ - --with-qt-include-dir=%{_includedir}/tqt3 \ - --with-qt-moc=%{_bindir}/tmoc + --with-tqt-name=tqt \ + --with-tqt-library-dir=%{_libdir} \ + --with-tqt-include-dir=%{_includedir}/tqt3 \ + --with-tqt-moc=%{_bindir}/tmoc # Symbolic links must exist prior to parallel building %__make symlinks -C src/kvilib/build @@ -227,6 +227,8 @@ export PATH="%{tde_bindir}:${PATH}" %exclude %{tde_libdir}/kvirc/*/modules/*.so %{tde_libdir}/kvirc/ %{tde_tdeappdir}/kvirc.desktop +%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem.upd +%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem_upd.sh %{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/icons/hicolor/*/*/*.svgz %{tde_datadir}/icons/hicolor/*/*/*.xpm diff --git a/redhat/applications/internet/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec index 2a9d9ca92..9983af3e4 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.2 %endif %define tde_pkg kvpnc %define tde_prefix /opt/trinity @@ -67,13 +67,28 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif + +# GCRYPT support +%if 0%{?mdkver} +BuildRequires: %{_lib}gcrypt-devel >= 1.2.0 +%else +BuildRequires: libgcrypt-devel >= 1.2.0 +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -85,9 +100,6 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -BuildRequires: libgcrypt-devel >= 1.2.0 - - %description KVpnc is a TDE frontend for various vpn clients. @@ -116,7 +128,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec index 8d1ee44d5..73799b17c 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.2 %endif %define tde_pkg smb4k %define tde_prefix /opt/trinity @@ -58,11 +58,13 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: fdupes @@ -143,41 +145,44 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --program-prefix="" \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +# Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" \ + .. -# SMP safe ! -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__rm -fr $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %find_lang %{tde_pkg} diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec index 66d721f6b..97c96d3a4 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.2 %endif %define tde_pkg tork %define tde_prefix /opt/trinity @@ -80,12 +80,18 @@ BuildRequires: brp-check-trinity BuildRequires: torsocks # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # GEOIP %if 0%{?suse_version} %if 0%{?suse_version} < 1550 BuildRequires: libGeoIP-devel +%else +%define with_embedded_geoip 1 %endif %else BuildRequires: geoip-devel @@ -114,7 +120,7 @@ on the Tor network. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -135,6 +141,8 @@ fi \ -DBUILD_ALL=ON \ -DWITH_ALL_OPTIONS=ON \ + -DWITH_EMBEDDED_GEOIP=%{?with_embedded_geoip:ON}%{?!with_embedded_geoip:OFF} \ + -DWITH_GNUTLS=ON \ \ .. diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec index ad1fe5dcb..edb5ff5c9 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.2 %endif %define tde_pkg bibletime %define tde_prefix /opt/trinity @@ -120,7 +120,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/misc/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec index e3f8bf5cb..986dec31c 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.2 %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..b44904f44 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.2 %endif %define tde_pkg kcmldap %define tde_prefix /opt/trinity @@ -72,13 +72,21 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -92,8 +100,12 @@ BuildRequires: brp-check-trinity # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: lib64ldap-devel +%else BuildRequires: openldap-devel %endif +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif @@ -115,8 +127,12 @@ BuildRequires: libheimdal-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # LIBCOM_ERR support %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -152,6 +168,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms %dir %{tde_datadir}/pixmaps %{tde_datadir}/pixmaps/kcmldapbonding_step1.png %{tde_datadir}/pixmaps/kcmldapbonding_step3.png +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldap.mo ########## @@ -186,7 +203,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec index c99c0b685..cacb6565a 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.2 %endif %define tde_pkg kcmldapcontroller %define tde_prefix /opt/trinity @@ -79,8 +79,12 @@ BuildRequires: brp-check-trinity # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: lib64ldap-devel +%else BuildRequires: openldap-devel %endif +%endif %if 0%{?mgaversion} >= 6 BuildRequires: openldap-servers-devel %endif @@ -105,8 +109,12 @@ BuildRequires: libheimdal-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # LIBCOM_ERR support %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -117,13 +125,21 @@ BuildRequires: %{_lib}ext2fs-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release} @@ -146,7 +162,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/primaryrccertupdater -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?rhel} >= 7 %{tde_libdir}/slapi-acl-manager.la %{tde_libdir}/slapi-acl-manager.so %endif @@ -157,6 +173,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker %dir %{tde_datadir}/pixmaps %{tde_datadir}/pixmaps/kcmldapcontroller_step1.png %{tde_datadir}/pixmaps/kcmldapcontroller_step4.png +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldapcontroller.mo ########## @@ -180,7 +197,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec index bbe317e3d..06875f9c1 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.2 %endif %define tde_pkg kcmldapmanager %define tde_prefix /opt/trinity @@ -79,8 +79,12 @@ BuildRequires: brp-check-trinity # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: lib64ldap-devel +%else BuildRequires: openldap-devel %endif +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif @@ -102,8 +106,12 @@ BuildRequires: libheimdal-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # LIBCOM_ERR support %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -114,13 +122,21 @@ BuildRequires: %{_lib}ext2fs-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release} @@ -164,7 +180,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec index 38e159c48..10ea73152 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.2 %endif %define tde_pkg kerberostray %define tde_prefix /opt/trinity @@ -79,8 +79,12 @@ BuildRequires: brp-check-trinity # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: lib64ldap-devel +%else BuildRequires: openldap-devel %endif +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif @@ -102,8 +106,12 @@ BuildRequires: libheimdal-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # LIBCOM_ERR support %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -114,13 +122,21 @@ BuildRequires: %{_lib}ext2fs-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -143,7 +159,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec index e2f5fa46d..d457bfd82 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.2 %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 @@ -109,7 +113,7 @@ databases. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index d0aa408ce..2f5b51151 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.2 %endif %define tde_pkg amarok %define tde_prefix /opt/trinity @@ -72,7 +72,11 @@ BuildRequires: pkgconfig BuildRequires: gettext # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -84,11 +88,15 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -# ALSA support -BuildRequires: alsa-lib-devel +# ALSA supportl +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif # ESOUND support -BuildRequires: esound-devel +#BuildRequires: esound-devel # PCRE support BuildRequires: pcre-devel @@ -106,9 +114,21 @@ BuildRequires: libusb-compat-0.1-devel BuildRequires: libusb-devel %endif BuildRequires: mysql-devel -BuildRequires: SDL-devel BuildRequires: taglib-devel -BuildRequires: sqlite-devel + +# SDL support +%if 0%{?mdkver} +BuildRequires: %{_lib}SDL-devel +%else +BuildRequires: SDL-devel +%endif + +# SQLITE3 support +%if 0%{?mgaversion} +BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel +%endif # POSTGRESQL support BuildRequires: postgresql @@ -153,13 +173,13 @@ BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 %if 0%{?pclinuxos} == 0 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_ifp 1 -BuildRequires: libifp-devel +BuildRequires: %{_lib}ifp-devel %endif %endif # KARMA support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} == 0 +%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 24090000 %define with_karma 1 BuildRequires: libkarma-devel BuildRequires: karma-sharp @@ -175,29 +195,45 @@ BuildRequires: libgpod-devel >= 0.4.2 # MTP players %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_mtp 1 +%if 0%{?mdkver} +BuildRequires: %{_lib}mtp-devel +%else BuildRequires: libmtp-devel %endif +%endif # Creative Nomad Jukebox %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 %define with_njb 1 -BuildRequires: libnjb-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}njb-devel +%else +BuildRequires: libmtp-devel +%endif %endif # VISUAL support %if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_libvisual 1 +%if 0%{?mdkver} +BuildRequires: %{_lib}visual-devel +%else BuildRequires: libvisual-devel %endif +%endif # MUSICBRAINZ support %if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} %if 0%{?fedora} >= 24 BuildRequires: libmusicbrainz5-devel %else +%if 0%{?mgaversion} >= 9 +BuildRequires: %{_lib}musicbrainz5-devel +%else BuildRequires: libmusicbrainz-devel %endif %endif +%endif # TUNEPIMP support %if 0%{?pclinuxos} @@ -232,8 +268,12 @@ BuildRequires: xine-lib-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define with_xine 1 +%if 0%{?mdkver} +BuildRequires: %{_lib}xine-devel +%else BuildRequires: %{_lib}xine1.2-devel %endif +%endif %if 0%{?sle_version} && 0%{?sle_version} <= 150000 %define with_xine 1 BuildRequires: libxine-devel @@ -252,9 +292,11 @@ BuildRequires: trinity-akode-devel # MP4V2 support %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?mdkver} < 24090000 %define with_mp4v2 1 BuildRequires: libmp4v2-devel %endif +%endif # ruby BuildRequires: ruby @@ -471,7 +513,7 @@ 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 +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec index 60a487700..8dad74e8c 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.2 %endif %define tde_pkg codeine %define tde_prefix /opt/trinity @@ -81,8 +81,12 @@ BuildRequires: brp-check-trinity %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}xine-devel +%else BuildRequires: %{_lib}xine1.2-devel %endif +%endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: xine-lib-devel %endif @@ -114,7 +118,7 @@ Features: %build -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec index e995c3215..ba760d943 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.2 %endif %define tde_pkg k3b-i18n %define tde_prefix /opt/trinity @@ -351,7 +351,7 @@ This package contains the Ukrainian translations for K3B. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec index ed7d62590..ddbdf76df 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.2 %endif %define tde_pkg k3b %define tde_prefix /opt/trinity @@ -77,14 +77,26 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -BuildRequires: alsa-lib-devel +# ALSA supportl +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif + BuildRequires: audiofile-devel BuildRequires: gettext -BuildRequires: libmpcdec-devel -BuildRequires: libvorbis-devel BuildRequires: taglib-devel BuildRequires: zlib-devel +# VORBIS support +%if 0%{?mdkver} || 0%{?mgaversion} +%define libvorbis_devel %{_lib}vorbis-devel +%else +%define libvorbis_devel libvorbis-devel +%endif +BuildRequires: %{libvorbis_devel} + # IDN support BuildRequires: libidn-devel @@ -96,13 +108,26 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} Requires(post): coreutils Requires(postun): coreutils @@ -126,8 +151,12 @@ Requires: cdrdao # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # HAL support %if 0%{?rhel} == 5 @@ -149,13 +178,21 @@ Requires: trinity-dbus-tqt >= 1:0.63 # SNDFILE support %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4 %define with_sndfile 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}sndfile-devel +%else BuildRequires: libsndfile-devel %endif +%endif # SAMPLERATE support %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4 %define with_samplerate 1 -BuildRequires: libsamplerate-devel +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}samplerate-devel +%else +BuildRequires: libsamplerate-devel +%endif %endif # DVDREAD support @@ -227,6 +264,17 @@ BuildRequires: ffmpeg-devel %endif %endif +# MUSEPACK +%if 0%{?fedora} == 0 || 0%{?fedora} <= 37 +# Looking for mpc_decoder_setup in mpcdec - not found +%define with_musepack 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}mpcdec-devel +%else +BuildRequires: libmpcdec-devel +%endif +%endif + %description K3b provides a comfortable user interface to perform most CD/DVD @@ -260,8 +308,10 @@ start. %{tde_tdelibdir}/libk3blibsndfiledecoder.la %{tde_tdelibdir}/libk3blibsndfiledecoder.so %endif +%if 0%{?with_musepack} %{tde_tdelibdir}/libk3bmpcdecoder.la %{tde_tdelibdir}/libk3bmpcdecoder.so +%endif %{tde_tdelibdir}/libk3boggvorbisdecoder.la %{tde_tdelibdir}/libk3boggvorbisdecoder.so %{tde_tdelibdir}/libk3boggvorbisencoder.la @@ -426,7 +476,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=c++11" %endif -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -453,7 +503,7 @@ fi -DWITH_ALL_OPTIONS="ON" \ -DWITH_MUSICBRAINZ="OFF" \ -DWITH_FFMPEG_ALL_CODECS="ON" \ - -DWITH_MUSEPACK="ON" \ + -DWITH_MUSEPACK="%{!?with_musepack:OFF}%{?with_musepack:ON}" \ -DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \ -DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \ %if 0%{?rhel} == 5 diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec index 0a9801a8d..69ac53556 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.2 %endif %define tde_pkg k9copy %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-k3b-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -94,8 +94,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -129,38 +133,43 @@ This is the Trinity version. # Fix permissions on doc files chmod -x AUTHORS COPYING -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" # FFMPEG ... if [ -d /usr/include/ffmpeg ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg" + RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg" fi - -# NOTICE: --enable-final causes FTBFS ! -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --mandir=%{tde_mandir} \ + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DINCLUDE_INSTALL_DIR="%{tde_includedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --enable-k3bdevices + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -168,7 +177,7 @@ fi %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make -C build install DESTDIR=%{buildroot} %find_lang %{tde_pkg} diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec index c37dad135..12eca9676 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.2 %endif # TDE specific building variables @@ -73,8 +73,12 @@ BuildRequires: desktop-file-utils %if 0%{?suse_version} BuildRequires: mozilla-nspr-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}nspr-devel +%else BuildRequires: nspr-devel %endif +%endif %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}xaw-devel @@ -107,7 +111,7 @@ if [ -d "%{_includedir}/nspr4" ]; then RPM_OPT_FLAGS="-I%{_includedir}/nspr4 ${RPM_OPT_FLAGS}" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -124,11 +128,7 @@ fi -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \ -DWITH_GCC_VISIBILITY=ON \ \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ \ .. diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec index da41a4682..e445da856 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.2 %endif %define tde_pkg kaffeine %define tde_prefix /opt/trinity @@ -79,13 +79,22 @@ BuildRequires: brp-check-trinity %endif # VORBIS support -BuildRequires: libvorbis-devel +%if 0%{?mdkver} || 0%{?mgaversion} +%define libvorbis_devel %{_lib}vorbis-devel +%else +%define libvorbis_devel libvorbis-devel +%endif +BuildRequires: %{libvorbis_devel} # CDDA support BuildRequires: libcdio-devel %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}cdda-devel +%else BuildRequires: libcdda-devel %endif +%endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} BuildRequires: cdparanoia BuildRequires: cdparanoia-devel @@ -134,9 +143,14 @@ BuildRequires: %{_lib}xcb-devel %if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_gstreamer 1 %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}gstreamer-devel +BuildRequires: %{_lib}gst-plugins-base1.0-devel +%else BuildRequires: %{_lib}gstreamer1.0-devel BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel %endif +%endif %if 0%{?rhel} == 4 BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-devel @@ -155,8 +169,12 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}xine-devel +%else BuildRequires: %{_lib}xine1.2-devel %endif +%endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: xine-lib-devel %endif @@ -283,7 +301,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec index 74db046b5..09a2fd48b 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.2 %endif %define tde_pkg kmplayer %define tde_prefix /opt/trinity @@ -84,9 +84,14 @@ BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} # GSTREAMER support %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}gstreamer-devel +BuildRequires: %{_lib}gst-plugins-base1.0-devel +%else BuildRequires: %{_lib}gstreamer1.0-devel BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel %endif +%endif %if 0%{?rhel} == 4 BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-devel @@ -104,8 +109,12 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}xine-devel +%else BuildRequires: %{_lib}xine1.2-devel %endif +%endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: xine-lib-devel %endif @@ -130,7 +139,11 @@ BuildRequires: xorg-x11-libXv-devel %endif # GTK2 stuff +%if 0%{?mdkver} +BuildRequires: %{_lib}gtk+2.0-devel +%else BuildRequires: gtk2-devel +%endif # DBUS stuff %if 0%{?suse_version} @@ -202,8 +215,6 @@ Core files needed for KMPlayer. %files base %defattr(-,root,root,-) -%{tde_libdir}/libkmplayercommon.la -%{tde_libdir}/libkmplayercommon.so %{tde_bindir}/kgstplayer %{tde_bindir}/kxineplayer %dir %{tde_datadir}/config @@ -254,6 +265,21 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE. ########## +%package devel +Group: Applications/Multimedia +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Summary: Media player for Trinity (devlopment files) + +%description devel +Development files for KMPlayer, a basic audio/video viewer application for TDE. + +%files devel +%defattr(-,root,root,-) +%{tde_libdir}/libkmplayercommon.la +%{tde_libdir}/libkmplayercommon.so + +########## + %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -269,7 +295,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/multimedia/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec index bb86e0371..c63c48e0d 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.2 %endif %define tde_pkg kplayer %define tde_prefix /opt/trinity @@ -70,10 +70,18 @@ BuildRequires: libtool BuildRequires: libidn-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -121,7 +129,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec index 14d1f1fb0..e1830719f 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.2 %endif %define tde_pkg mplayerthumbs %define tde_prefix /opt/trinity @@ -69,7 +69,11 @@ BuildRequires: fdupes BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -114,7 +118,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -165,6 +169,7 @@ fi %{tde_datadir}/services/mplayer-thumbnailer.desktop %{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/ %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/mplayer-thumbnailer.mo %changelog diff --git a/redhat/applications/multimedia/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec index 3e6834a7f..99fb2abbb 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.2 %endif %define tde_pkg rosegarden %define tde_prefix /opt/trinity @@ -81,28 +81,51 @@ BuildRequires: brp-check-trinity %endif BuildRequires: fftw-devel -BuildRequires: liblo-devel BuildRequires: fontconfig-devel +# LO support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}lo-devel +%else +BuildRequires: liblo-devel +%endif + # DSSI support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} BuildRequires: dssi-devel %endif # LRDF support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}lrdf-devel +%endif +%if 0%{?fedora} || 0%{?suse_version} BuildRequires: liblrdf-devel %endif +# LADSPA support +%if 0%{?mdkver} +BuildRequires: ladspa-devel +%endif + +# RAPTOR support +%if 0%{?mdkver} +BuildRequires: %{_lib}raptor-devel +%endif + # JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: %{_lib}jack-devel %else BuildRequires: jack-audio-connection-kit-devel %endif # ACL support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # LIRC support %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 @@ -134,7 +157,11 @@ Requires: libsndfile-utils %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} @@ -177,7 +204,7 @@ This package provides the data files necessary for running Rosegarden unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec index 6c3ffae19..6b713c452 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.2 %endif %define tde_pkg soundkonverter %define tde_prefix /opt/trinity @@ -80,8 +80,12 @@ BuildRequires: taglib-devel # CDDA support %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}cdda-devel +%else BuildRequires: libcdda-devel %endif +%endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: cdparanoia-devel %endif @@ -130,7 +134,7 @@ See the 'trinity-soundkonverter' package for more information. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -178,7 +182,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING NEWS README %{tde_bindir}/soundkonverter %{tde_bindir}/userscript.sh %{tde_tdeappdir}/soundkonverter.desktop diff --git a/redhat/applications/multimedia/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec index 4070f8b6b..8032ed76f 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.2 %endif %define tde_pkg tderadio %define tde_prefix /opt/trinity @@ -80,7 +80,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}sndfile-devel +%else BuildRequires: libsndfile-devel +%endif + %{?with_lirc:BuildRequires: lirc-devel} # LAME support @@ -154,7 +159,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -187,8 +192,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang %{tde_pkg} - # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner @@ -206,7 +209,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%files -f %{tde_pkg}.lang +%files %defattr(-,root,root,-) %{tde_bindir}/convert-presets %{tde_bindir}/tderadio @@ -223,7 +226,9 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/*/*/tderadio*.png %{tde_datadir}/icons/locolor/*/*/tderadio*.png %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo +%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo %lang(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..fa032db4d 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.2 %endif %define tde_pkg basket %define tde_prefix /opt/trinity @@ -107,7 +107,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/office/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec index bef708968..f16cae934 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.2 %endif %define tde_pkg kbibtex %define tde_prefix /opt/trinity @@ -68,19 +68,31 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif # YAZ support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} BuildRequires: libyaz-devel %endif @@ -115,7 +127,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/office/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec index 22ba62914..7add6600f 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.2 %endif %define tde_pkg kbookreader %define tde_prefix /opt/trinity @@ -67,13 +67,21 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/office/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec index 967b8a3c6..f1d311cd3 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.2 %endif %define tde_pkg keximdb %define tde_prefix /opt/trinity @@ -73,10 +73,18 @@ BuildRequires: libtool BuildRequires: libidn-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -115,7 +123,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/office/kile/kile.spec b/redhat/applications/office/kile/kile.spec index d7d26d1e1..e9e333318 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.2 %endif %define tde_pkg kile %define tde_prefix /opt/trinity @@ -155,7 +155,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/office/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec index fa7afc315..2be7ff5c0 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.2 %endif %define tde_pkg kmymoney %define tde_prefix /opt/trinity @@ -86,7 +86,13 @@ BuildRequires: brp-check-trinity BuildRequires: html2ps BuildRequires: recode + +# OFX support +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}ofx-devel +%else BuildRequires: libofx-devel +%endif # OPENSP support %if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion} @@ -204,7 +210,7 @@ This package contains development files needed for KMyMoney plugins. unset QTDIR QTLIB QTINC export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/office/knowit/knowit.spec b/redhat/applications/office/knowit/knowit.spec index 4f1c28370..38e1219ca 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.2 %endif %define tde_pkg knowit %define tde_prefix /opt/trinity @@ -70,10 +70,18 @@ BuildRequires: libtool BuildRequires: libidn-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -109,7 +117,7 @@ but TDE-based, and requires Trinity. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/office/koffice-i18n/koffice-i18n.spec b/redhat/applications/office/koffice-i18n/koffice-i18n.spec index 077854145..c21d72bf7 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.2 %endif %define tde_pkg koffice-i18n %define tde_prefix /opt/trinity @@ -587,7 +587,7 @@ for l in . %{TDE_LANGS}; do pushd ${l} fi - if ! rpm -E %%cmake|grep -q "cd build"; then + if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -910,7 +910,6 @@ done %if "%( grep -w lv <<< '%{TDE_LANGS}' )" != "" %files Latvian %defattr(-,root,root,-) -%{tde_datadir}/locale/lv %{tde_datadir}/locale/lv/* %endif diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec index e137cc9b9..9ec132b50 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.2 %endif %define tde_pkg koffice %define tde_prefix /opt/trinity @@ -46,7 +46,7 @@ %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') # Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 +%global _disable_ld_no_undefined 1 Name: trinity-%{tde_pkg} @@ -96,22 +96,65 @@ BuildRequires: brp-check-trinity BuildRequires: fontconfig-devel BuildRequires: libart_lgpl-devel -BuildRequires: libtiff-devel -BuildRequires: libjpeg-devel -BuildRequires: ImageMagick-devel BuildRequires: zlib-devel -BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: gettext-devel BuildRequires: mysql-devel BuildRequires: perl BuildRequires: doxygen BuildRequires: aspell-devel -BuildRequires: libxslt-devel -BuildRequires: OpenEXR-devel -BuildRequires: libexif-devel BuildRequires: readline-devel +# EXIF support +%if 0%{?mdkver} +BuildRequires: %{_lib}exif-devel +%else +BuildRequires: libexif-devel +%endif + +# IMAGEMAGICK support +%if 0%{?mdkver} +BuildRequires: %{_lib}magick-devel +%else +BuildRequires: ImageMagick-devel +%endif + +# JPEG support +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel + +# OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else +BuildRequires: openssl-devel +%endif + +# OPENEXR support +%if 0%{?mdkver} +BuildRequires: %{_lib}openexr-devel +%else +BuildRequires: OpenEXR-devel +%endif + +# TIFF support +%if 0%{?mdkver} +BuildRequires: %{_lib}tiff-devel +%else +BuildRequires: libtiff-devel +%endif + +# XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else +BuildRequires: libxslt-devel +%endif + # PYTHON support # lib/kross/configure.in.in : # WARNING: Building Kross python plugin is now prohibited at all times, @@ -164,10 +207,10 @@ BuildRequires: freetype-devel %endif # LIBPNG support -%if 0%{?mgaversion} +%if 0%{?mdkver} || 0%{?mgaversion} BuildRequires: %{_lib}png-devel %endif -%if 0%{?mdkversion} && 0%{?pclinuxos} == 0 +%if 0%{?mdkversion} && 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0 BuildRequires: %{_lib}png15-devel %endif %if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} @@ -181,9 +224,13 @@ BuildRequires: libpng-devel BuildRequires: GraphicsMagick >= 1.1.0 %endif %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?mdkver} +BuildRequires: %{_lib}graphicsmagick-devel +%else BuildRequires: GraphicsMagick-devel >= 1.1.0 %endif %endif +%endif # UTEMPTER support %if 0%{?suse_version} @@ -226,29 +273,45 @@ BuildRequires: postgresql-server-devel %else BuildRequires: postgresql-devel %endif +%if 0%{?mdkver} +BuildRequires: %{_lib}pqxx-devel +%else BuildRequires: libpqxx-devel %endif %endif +%endif Obsoletes: trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release} # WPD support # For chalk and filters +%if 0%{?mdkver} +BuildRequires: %{_lib}wpd-devel +%else BuildRequires: libwpd-devel +%endif Obsoletes: trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release} # WV2 support %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} < 24090000 BuildRequires: %{_lib}wv2-devel %endif +%endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: wv2-devel %endif # MESA support %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0 BuildRequires: %{_lib}mesagl-devel +%endif +%if 0%{?mdkver} >= 24090000 +BuildRequires: %{_lib}glu-devel +%else BuildRequires: %{_lib}mesaglu1-devel %endif +%endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: libGL-devel BuildRequires: libGLU-devel @@ -1072,8 +1135,12 @@ This package is part of the TDE Office Suite. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?mdkver} +touch config.h.in +%endif + %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -1122,6 +1189,12 @@ CXXFLAGS="${CXXFLAGS} -std=c++11" %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \ %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \ +%if %{?with_postgresql} +# Ensure PQXX was detected + + +%endif + %__make %{?_smp_mflags} || %__make @@ -1129,11 +1202,6 @@ CXXFLAGS="${CXXFLAGS} -std=c++11" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -#%__mkdir_p "%{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/" -#for i in {16x16,22x22,32x32,48x48,64x64,128x128}; do -# mv "%{buildroot}%{tde_datadir}/icons/crystalsvg/$i/apps/kplato.png %{buildroot}/opt/kde3/share/icons/hicolor/$i/apps/; -#done - # Fix desktop icon location %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}" diff --git a/redhat/applications/office/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec index dd4c68ad5..828963b48 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.2 %endif %define tde_pkg kpilot %define tde_prefix /opt/trinity @@ -69,16 +69,28 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # ICAL support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}ical-devel +%else BuildRequires: libical-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -130,7 +142,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -143,7 +155,6 @@ fi -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}" \ @@ -169,7 +180,7 @@ export PATH="%{tde_bindir}:${PATH}" # Unwanted files %__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so -%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/ +%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{tde_includedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/ # Updates applications categories for openSUSE %if 0%{?suse_version} diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec index ee92c8f4b..e51a25226 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.2 %endif %define tde_pkg tellico %define tde_prefix /opt/trinity @@ -110,7 +110,12 @@ BuildRequires: %{_lib}yaz-devel BuildRequires: libxml2-devel # XSLT support -BuildRequires: libxslt-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else +BuildRequires: libxslt-devel +%endif + %if 0%{?rhel} == 4 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241) BuildRequires: libgcrypt-devel @@ -145,13 +150,26 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} # PYTHON support %global python python3 @@ -220,14 +238,10 @@ documentation. %{tde_datadir}/apps/tellico/*.xml %{tde_datadir}/apps/tellico/*.png %{tde_datadir}/apps/tellico/entry-templates -%if 0%{?rhel} == 7 || 0%{?suse_version} %{tde_datadir}/apps/tellico/*.py* -%if 0%{?rhel} == 7 +%if 0%{?rhel} == 7 || 0%{?mgaversion} == 8 %{tde_datadir}/apps/tellico/__pycache__/ %endif -%else -%pycached %{tde_datadir}/apps/tellico/*.py -%endif %{tde_datadir}/apps/tellico/pics %{tde_datadir}/apps/tellico/report-templates %{tde_datadir}/apps/tellico/tellico.dtd @@ -305,7 +319,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/settings/kima/kima.spec b/redhat/applications/settings/kima/kima.spec index 827385dc7..b5dcaed59 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.2 %endif %define tde_pkg kima %define tde_prefix /opt/trinity @@ -80,14 +80,22 @@ BuildRequires: brp-check-trinity # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec index 5aae73aa9..0fae4bcdc 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.2 %endif %define tde_pkg kiosktool %define tde_prefix /opt/trinity @@ -69,13 +69,21 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -112,7 +120,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec index 4381ff697..81cea639a 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.2 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity @@ -66,16 +66,28 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # XKBFILES support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}xkbfile-devel +%else BuildRequires: libxkbfile-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -119,7 +131,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/settings/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec index 918f57f48..00dc8836c 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.2 %endif %define tde_pkg klcddimmer %define tde_prefix /opt/trinity @@ -69,7 +69,11 @@ BuildRequires: pkgconfig BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -104,7 +108,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index 7998140e5..16d3e34ca 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.2 %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* ########## @@ -177,7 +178,7 @@ Requires: %{name} = %{version}-%{release} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index 946a06d97..ccacc149f 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.2 %endif %define tde_pkg tde-guidance %define tde_prefix /opt/trinity @@ -63,12 +63,13 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: trinity-pytdeextensions BuildRequires: trinity-libpythonize0-devel BuildRequires: trinity-pytde BuildRequires: chrpath -BuildRequires: autoconf automake libtool m4 +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -92,14 +93,6 @@ BuildRequires: pytqt-devel BuildRequires: trinity-pytde-devel BuildRequires: trinity-pytqt-tools -# LIBXXF86VM support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xxf86vm-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210 -BuildRequires: libXxf86vm-devel -%endif - # XSCREENSAVER support # RHEL 4: disabled # RHEL 6: available in EPEL @@ -144,7 +137,9 @@ BuildRequires: xscreensaver-gl %endif # PYTHON support +%if "%{python}" == "" %global python python3 +%endif %global __python %__python3 %global python_sitearch %{python3_sitearch} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -173,7 +168,6 @@ look after your system: o userconfig - User and Group administration o serviceconfig - Service/daemon administration o mountconfig - Disk and filesystem administration - o wineconfig - Wine configuration These tools are available in Trinity Control Center, System Settings or can be run as standalone applications. @@ -181,55 +175,46 @@ or can be run as standalone applications. %files %defattr(-,root,root,-) %doc ChangeLog COPYING README TODO -%{tde_bindir}/grubconfig %{tde_bindir}/mountconfig %{tde_bindir}/serviceconfig %{tde_bindir}/userconfig -%{tde_bindir}/wineconfig %attr(0644,root,root) %{tde_tdelibdir}/*.so %attr(0644,root,root) %{tde_tdelibdir}/*.la %{tde_datadir}/apps/guidance/ %{tde_tdeappdir}/*.desktop %{tde_datadir}/icons/crystalsvg/*/*/*.png -%if 0%{?rhel} == 7 || 0%{?suse_version} -%{python_sitearch}/%{name}/SMBShareSelectDialog.py* -%{python_sitearch}/%{name}/SimpleCommandRunner.py* -%{python_sitearch}/%{name}/fuser.py* -%{python_sitearch}/%{name}/fuser_ui.py* -%{python_sitearch}/%{name}/grubconfig.py* -%{python_sitearch}/%{name}/mountconfig.py* -%{python_sitearch}/%{name}/serviceconfig.py* -%{python_sitearch}/%{name}/sizeview.py* -%{python_sitearch}/%{name}/unixauthdb.py* -%{python_sitearch}/%{name}/userconfig.py* -%{python_sitearch}/%{name}/wineconfig.py* +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%{python_sitelib}/tde-guidance/SMBShareSelectDialog.py* +%{python_sitelib}/tde-guidance/SimpleCommandRunner.py* +%{python_sitelib}/tde-guidance/fuser.py* +%{python_sitelib}/tde-guidance/fuser_ui.py* +%{python_sitelib}/tde-guidance/mountconfig.py* +%{python_sitelib}/tde-guidance/serviceconfig.py* +%{python_sitelib}/tde-guidance/sizeview.py* +%{python_sitelib}/tde-guidance/unixauthdb.py* +%{python_sitelib}/tde-guidance/userconfig.py* %if 0%{?rhel} == 7 -%{python_sitearch}/%{name}/__pycache__/SMBShareSelectDialog.*.pyc -%{python_sitearch}/%{name}/__pycache__/SimpleCommandRunner.*.pyc -%{python_sitearch}/%{name}/__pycache__/fuser.*.pyc -%{python_sitearch}/%{name}/__pycache__/fuser_ui.*.pyc -%{python_sitearch}/%{name}/__pycache__/grubconfig.*.pyc -%{python_sitearch}/%{name}/__pycache__/mountconfig.*.pyc -%{python_sitearch}/%{name}/__pycache__/serviceconfig.*.pyc -%{python_sitearch}/%{name}/__pycache__/sizeview.*.pyc -%{python_sitearch}/%{name}/__pycache__/unixauthdb.*.pyc -%{python_sitearch}/%{name}/__pycache__/userconfig.*.pyc -%{python_sitearch}/%{name}/__pycache__/wineconfig.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/SMBShareSelectDialog.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/SimpleCommandRunner.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/fuser.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/fuser_ui.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/mountconfig.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/serviceconfig.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/sizeview.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/unixauthdb.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/userconfig.*.pyc %endif %else -%pycached %{python_sitearch}/%{name}/SMBShareSelectDialog.py -%pycached %{python_sitearch}/%{name}/SimpleCommandRunner.py -%pycached %{python_sitearch}/%{name}/fuser.py -%pycached %{python_sitearch}/%{name}/fuser_ui.py -%pycached %{python_sitearch}/%{name}/grubconfig.py -%pycached %{python_sitearch}/%{name}/mountconfig.py -%pycached %{python_sitearch}/%{name}/serviceconfig.py -%pycached %{python_sitearch}/%{name}/sizeview.py -%pycached %{python_sitearch}/%{name}/unixauthdb.py -%pycached %{python_sitearch}/%{name}/userconfig.py -%pycached %{python_sitearch}/%{name}/wineconfig.py +%pycached %{python_sitelib}/tde-guidance/SMBShareSelectDialog.py +%pycached %{python_sitelib}/tde-guidance/SimpleCommandRunner.py +%pycached %{python_sitelib}/tde-guidance/fuser.py +%pycached %{python_sitelib}/tde-guidance/fuser_ui.py +%pycached %{python_sitelib}/tde-guidance/mountconfig.py +%pycached %{python_sitelib}/tde-guidance/serviceconfig.py +%pycached %{python_sitelib}/tde-guidance/sizeview.py +%pycached %{python_sitelib}/tde-guidance/unixauthdb.py +%pycached %{python_sitelib}/tde-guidance/userconfig.py %endif -%{tde_tdedocdir}/HTML/en/guidance/ # Files from powermanager %if 0%{?with_powermanager} @@ -239,6 +224,11 @@ or can be run as standalone applications. %exclude %{tde_datadir}/apps/guidance/pics/processor.png %endif +%{tde_tdedocdir}/HTML/en/tde-guidance/ +%{tde_mandir}/man1/mountconfig-trinity.1* +%{tde_mandir}/man1/serviceconfig-trinity.1* +%{tde_mandir}/man1/userconfig-trinity.1* + ########## %package backends @@ -258,29 +248,15 @@ Guidance configuration tools. %files backends %defattr(-,root,root,-) -%dir %{python_sitearch}/%{name} -%if 0%{?rhel} == 7 || 0%{?suse_version} -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/drivedetect.py* -%{python_sitearch}/%{name}/wineread.py* -%{python_sitearch}/%{name}/winewrite.py* -%{python_sitearch}/%{name}/xf86misc.py* +%dir %{python_sitelib}/tde-guidance +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%{python_sitelib}/tde-guidance/MicroHAL.py* %if 0%{?rhel} == 7 -%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc -%{python_sitearch}/%{name}/__pycache__/drivedetect.*.pyc -%{python_sitearch}/%{name}/__pycache__/wineread.*.pyc -%{python_sitearch}/%{name}/__pycache__/winewrite.*.pyc -%{python_sitearch}/%{name}/__pycache__/xf86misc.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc %endif %else -%pycached %{python_sitearch}/%{name}/MicroHAL.py -%pycached %{python_sitearch}/%{name}/drivedetect.py -%pycached %{python_sitearch}/%{name}/wineread.py -%pycached %{python_sitearch}/%{name}/winewrite.py -%pycached %{python_sitearch}/%{name}/xf86misc.py +%pycached %{python_sitelib}/tde-guidance/MicroHAL.py %endif -%{python_sitearch}/ixf86misc*.so -%{python_sitearch}/xf86misc*.pyc ########## @@ -307,32 +283,32 @@ suspend using HAL. %files powermanager %defattr(-,root,root,-) %{tde_bindir}/guidance-power-manager -%if 0%{?rhel} == 7 || 0%{?suse_version} -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/guidance-power-manager.py* -%{python_sitearch}/%{name}/powermanage.py* -%{python_sitearch}/%{name}/gpmhelper.py* -%{python_sitearch}/%{name}/powermanager_ui.py* -%{python_sitearch}/%{name}/guidance_power_manager_ui.py* -%{python_sitearch}/%{name}/notify.py* -%{python_sitearch}/%{name}/tooltip.py* -%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc -%{python_sitearch}/%{name}/__pycache__/guidance-power-manager.*.pyc -%{python_sitearch}/%{name}/__pycache__/powermanage.*.pyc -%{python_sitearch}/%{name}/__pycache__/gpmhelper.*.pyc -%{python_sitearch}/%{name}/__pycache__/powermanager_ui.*.pyc -%{python_sitearch}/%{name}/__pycache__/guidance_power_manager_ui.*.pyc -%{python_sitearch}/%{name}/__pycache__/notify.*.pyc -%{python_sitearch}/%{name}/__pycache__/tooltip.*.pyc +%if 0%{?mdkver} ||0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%{python_sitelib}/tde-guidance/MicroHAL.py* +%{python_sitelib}/tde-guidance/guidance-power-manager.py* +%{python_sitelib}/tde-guidance/powermanage.py* +%{python_sitelib}/tde-guidance/gpmhelper.py* +%{python_sitelib}/tde-guidance/powermanager_ui.py* +%{python_sitelib}/tde-guidance/guidance_power_manager_ui.py* +%{python_sitelib}/tde-guidance/notify.py* +%{python_sitelib}/tde-guidance/tooltip.py* +%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/guidance-power-manager.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/powermanage.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/gpmhelper.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/powermanager_ui.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/guidance_power_manager_ui.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/notify.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/tooltip.*.pyc %else -%pycached %{python_sitearch}/%{name}/MicroHAL.py -%pycached %{python_sitearch}/%{name}/guidance-power-manager.py -%pycached %{python_sitearch}/%{name}/powermanage.py -%pycached %{python_sitearch}/%{name}/gpmhelper.py -%pycached %{python_sitearch}/%{name}/powermanager_ui.py -%pycached %{python_sitearch}/%{name}/guidance_power_manager_ui.py -%pycached %{python_sitearch}/%{name}/notify.py -%pycached %{python_sitearch}/%{name}/tooltip.py +%pycached %{python_sitelib}/tde-guidance/MicroHAL.py +%pycached %{python_sitelib}/tde-guidance/guidance-power-manager.py +%pycached %{python_sitelib}/tde-guidance/powermanage.py +%pycached %{python_sitelib}/tde-guidance/gpmhelper.py +%pycached %{python_sitelib}/tde-guidance/powermanager_ui.py +%pycached %{python_sitelib}/tde-guidance/guidance_power_manager_ui.py +%pycached %{python_sitelib}/tde-guidance/notify.py +%pycached %{python_sitelib}/tde-guidance/tooltip.py %endif %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png %{tde_datadir}/apps/guidance/pics/ac-adapter.png @@ -363,151 +339,43 @@ suspend using HAL. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -#export PYTHONPATH=%{python_sitearch}/pytqt +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia -export PYTHONDONTWRITEBYTECODE= - -# FTBFS on PCLOS ... export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}" -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build fi -%__python ./setup.py build +# Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" \ + .. + +%__make %{?_smp_mflags} || %__make %install -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" -export SIPTQT_DIR="%{python_sitearch}/sip4_tqt" -export PYTHONPATH="%{python_sitearch}/pytqt" - -# Support for 'sip4-tqt' -export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}" - -# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled. -export PYTHONDONTWRITEBYTECODE= - -%__rm -rf %{buildroot} -%__python ./setup.py install \ - --prefix=%{tde_prefix} \ - --root=%{buildroot} - -# Fix temporary build directories remaining inside .py files -for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do - %__sed -i "${f}" -e "s|%{buildroot}||g" -done - -##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules) -# install icons to right place -%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png -%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png - -# fix binary-or-shlib-defines-rpath -chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so - -# fix executable-not-elf-or-script -%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png - -# move python modules in %{python_sitearch} (/usr/lib/pythonXX/site-packages) -%__mkdir_p %{buildroot}%{python_sitearch}/%{name} -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name} - -# Generates the startup scripts -%__rm -f %{buildroot}%{tde_bindir}/* -%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig -%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig -%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig -%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig -%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig - -# fix script-not-executable -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py - -##### BACKENDS INSTALLATION - -# The xf86misc stuff should not go under /opt/trinity bur under /usr !!! -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc*.so %{buildroot}%{python_sitearch}/ -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/__pycache__/xf86misc*.pyc %{buildroot}%{python_sitearch}/ -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}/ - -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%endif - -%if 0%{?with_powermanager} -##### POWERMANAGER INSTALLATION -# install icon to right place -%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \ - %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%__install -D -p -m0644 kde/powermanager/pics/*.png \ - %{buildroot}%{tde_datadir}/apps/guidance/pics/ - -# install desktop file -%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \ - %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop - -# copy python modules in PYSUPPORT_PATH -%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name} - -# generate guidance-power-manager script -cat <<EOF >%{?buildroot}%{tde_bindir}/guidance-power-manager -#!/bin/sh -export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/sip4-tqt -%{python_sitearch}/%{name}/guidance-power-manager.py & -EOF -chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager - -# fix script-not-executable -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py - -%else -%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py* -%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui - -%endif - -# Replace all '#!' calls to python with /usr/bin/python -# and make them executable -for i in `find %{buildroot} -type f`; do - sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/env %python\1,' \ - $i > $i.temp; - if cmp --quiet $i $i.temp; then - rm -f $i.temp; - else - mv -f $i.temp $i; - chmod 755 $i; - echo "fixed interpreter: $i"; - fi; -done - -# Removes useless files -find %{buildroot} -name "*.egg-info" -exec rm -f {} \; -find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; -%__rm -rf %{buildroot}%{tde_libdir}/python*/site-packages/guidance-*.egg-info/ +%__rm -fr $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %clean diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec index 18b2af3d8..39cf4c8dc 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.2 %endif %define tde_pkg tde-systemsettings %define tde_prefix /opt/trinity @@ -110,7 +110,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec index bae1fa842..78b5236f7 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.2 %endif %define tde_pkg tdenetworkmanager %define tde_prefix /opt/trinity @@ -98,7 +98,7 @@ Requires: NetworkManager-gnome Requires: networkmanager %endif %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} != 8 +%if 0%{?mgaversion} && 0%{?mgaversion} <= 7 BuildRequires: %{_lib}nm-util-devel %endif %endif @@ -107,29 +107,45 @@ BuildRequires: %{_lib}nm-util-devel %if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 BuildRequires: NetworkManager-libnm-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}nm-devel +%else BuildRequires: NetworkManager-glib-devel %endif %endif %endif +%endif %if 0%{?suse_version} BuildRequires: NetworkManager-devel Requires: NetworkManager %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # DBUS support BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9 BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # IDN support BuildRequires: libidn-devel @@ -142,7 +158,11 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -209,7 +229,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec index 78395d8da..e14e40149 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.2 %endif %define tde_pkg tdesudo %define tde_prefix /opt/trinity @@ -66,13 +66,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -113,7 +121,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec index 00322f76c..b60b75b61 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.2 %endif %define tde_pkg wlassistant %define tde_prefix /opt/trinity @@ -110,7 +110,11 @@ BuildRequires: %{python} BuildRequires: %{python}-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -143,7 +147,7 @@ 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 +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec index be49385f3..b9278b00a 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.2 %endif %define tde_pkg dolphin %define tde_prefix /opt/trinity @@ -68,13 +68,21 @@ BuildRequires: pkgconfig BuildRequires: libtool # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/katapult/katapult.spec b/redhat/applications/system/katapult/katapult.spec index a2d25b15f..ec9756fd2 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.2 %endif %define tde_pkg katapult %define tde_prefix /opt/trinity @@ -66,13 +66,21 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec index 415697e00..849735a3c 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.2 %endif %define tde_pkg kbfx %define tde_prefix /opt/trinity @@ -91,10 +91,18 @@ BuildRequires: gamin-devel BuildRequires: pcre-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -137,7 +145,7 @@ 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 +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -228,6 +236,7 @@ export PATH="%{tde_bindir}:${PATH}" %lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo %lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kbfxconfigapp.mo %{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop diff --git a/redhat/applications/system/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec index 09b86d7a6..fcf85ed7d 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.2 %endif %define tde_pkg kcmautostart %define tde_prefix /opt/trinity @@ -66,13 +66,21 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec index 380ea714c..693084f0d 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.2 %endif %define tde_pkg kdbusnotification %define tde_prefix /opt/trinity @@ -75,7 +75,11 @@ BuildRequires: brp-check-trinity %endif # GTK2 stuff +%if 0%{?mdkver} +BuildRequires: %{_lib}gtk+2.0-devel +%else BuildRequires: gtk2-devel +%endif # DBUS stuff %if 0%{?suse_version} @@ -85,13 +89,21 @@ BuildRequires: dbus-glib-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -123,7 +135,7 @@ if [ -r "/usr/include/harfbuzz/hb.h" ]; then RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec index 015eaa364..4b892dcf1 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.2 %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 @@ -76,7 +83,11 @@ BuildRequires: clamav-devel Requires: clamav # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -95,7 +106,7 @@ A TDE front-end for the Clam AntiVirus antivirus toolkit. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec index b6f820d57..0b8398d96 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.2 %endif %define tde_pkg knemo %define tde_prefix /opt/trinity @@ -89,28 +89,44 @@ Requires: net-tools-deprecated %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # Wireless support -%define with_wifi 1 +# Wifi support %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 -BuildRequires: wireless-tools-devel +%define wifi_devel wireless-tools-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mdkversion} -BuildRequires: %{_lib}iw29-devel +%define wifi_devel %{_lib}iw29-devel %endif %if 0%{?rhel} == 5 || 0%{?suse_version} -BuildRequires: wireless-tools +%define wifi_devel wireless-tools %endif %if 0%{?suse_version} || 0%{?mgaversion} >= 3 -BuildRequires: libiw-devel +%define wifi_devel libiw-devel %endif +%if 0%{?mdkver} +%define wifi_devel %nil +%endif +%if "%{wifi_devel}" != "" +%define with_wifi 1 +BuildRequires: %{wifi_devel} +%endif + %description @@ -141,7 +157,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec index 33cddaa00..3eccc8401 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.2 %endif %define tde_pkg knetload %define tde_prefix /opt/trinity @@ -67,13 +67,21 @@ BuildRequires: pkgconfig BuildRequires: libtool # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec index 6fc41e1f5..7f8f0a3ce 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.2 %endif %define tde_pkg knetstats %define tde_prefix /opt/trinity @@ -67,13 +67,21 @@ BuildRequires: pkgconfig BuildRequires: libtool # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/kooldock/kooldock.spec b/redhat/applications/system/kooldock/kooldock.spec index 410e8e783..36cc07ac7 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.2 %endif %define tde_pkg kooldock %define tde_prefix /opt/trinity @@ -71,10 +71,18 @@ BuildRequires: libtool BuildRequires: libidn-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -118,7 +126,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec index cf314c68f..e07247721 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.2 %endif %define tde_pkg krusader %define tde_prefix /opt/trinity @@ -110,7 +110,7 @@ great on your desktop. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -169,6 +169,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %{tde_tdeappdir}/krusader.desktop %{tde_tdeappdir}/krusader_root-mode.desktop %{tde_datadir}/apps/krusader +%{tde_datadir}/apps/tdeconf_update/krusader_tqt_selection.upd %{tde_datadir}/icons/crystalsvg/*/apps/*.png %{tde_datadir}/icons/locolor/*/apps/*.png %{tde_datadir}/services/krarc.protocol diff --git a/redhat/applications/system/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec index f86297e04..ef3ca8ff9 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.2 %endif %define tde_pkg kshutdown %define tde_prefix /opt/trinity @@ -66,13 +66,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -115,7 +123,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec index 731557a72..6af7a8049 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.2 %endif %define tde_pkg ksystemlog %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec index 1a36e6ce4..74a5caa52 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.2 %endif %define tde_pkg kvkbd %define tde_prefix /opt/trinity @@ -66,13 +66,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -108,7 +116,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi 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..790250940 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.2 %endif %define tde_pkg polkit-agent-tde %define tde_prefix /opt/trinity @@ -89,7 +89,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec index ac53e189a..0bb7cda1f 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.2 %endif %define tde_pkg smartcardauth %define tde_prefix /opt/trinity @@ -163,7 +163,7 @@ in addition to the PKCS certificate functionality unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/tastymenu/tastymenu.spec b/redhat/applications/system/tastymenu/tastymenu.spec index 635273ad1..1956800a0 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.2 %endif %define tde_pkg tastymenu %define tde_prefix /opt/trinity @@ -68,13 +68,21 @@ BuildRequires: pkgconfig BuildRequires: libtool # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -107,7 +115,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/tdebluez/tdebluez.spec b/redhat/applications/system/tdebluez/tdebluez.spec index e17236b1c..7bffd6839 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.2 %endif %define tde_pkg tdebluez %define tde_prefix /opt/trinity @@ -68,7 +68,11 @@ BuildRequires: pkgconfig BuildRequires: libtool # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -208,7 +212,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec index 1b7f796f1..811015d8d 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.2 %endif %define tde_pkg tdedocker %define tde_prefix /opt/trinity @@ -66,16 +66,28 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # XKBFILES support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}xkbfile-devel +%else BuildRequires: libxkbfile-devel +%endif # XMU support %if 0%{?suse_version} == 1140 @@ -85,7 +97,7 @@ BuildRequires: xorg-x11-libXmu-devel BuildRequires: libXmu-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} >= 4 -BuildRequires: libxmu-devel +BuildRequires: %{_lib}xmu-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel @@ -136,7 +148,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -190,7 +202,6 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdeappdir}/tdedocker.desktop %{tde_datadir}/apps/tdedocker/ %{tde_datadir}/icons/hicolor/*/apps/tdedocker.png -%{tde_datadir}/apps/tdedocker/icons/question.png %{tde_mandir}/man1/tdedocker.1* diff --git a/redhat/applications/system/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec index a57c0e328..ebbce92b3 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.2 %endif %define tde_pkg tdepowersave %define tde_prefix /opt/trinity @@ -82,8 +82,12 @@ BuildRequires: brp-check-trinity # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # XSCREENSAVER support # Disabled on RHEL4 @@ -111,7 +115,11 @@ BuildRequires: xscreensaver %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -124,7 +132,11 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Obsoletes: trinity-kpowersave < %{?epoch:%{epoch}:}%{version}-%{release} @@ -179,7 +191,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec index 8277d6397..93761e347 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.2 %endif %define tde_pkg tdesshaskpass %define tde_prefix /opt/trinity @@ -66,13 +66,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -145,12 +153,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING README.md %{tde_bindir}/* diff --git a/redhat/applications/system/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec index 97d9157af..bacb6c882 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.2 %endif %define tde_pkg yakuake %define tde_prefix /opt/trinity @@ -66,13 +66,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -105,7 +113,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec index 57f61207f..aa49a5634 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.2 %endif %define tde_pkg tdeio-appinfo %define tde_prefix /opt/trinity @@ -67,13 +67,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec index 3efdf5d7e..f4631631e 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.2 %endif %define tde_pkg tdeio-apt %define tde_prefix /opt/trinity @@ -66,7 +66,11 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -108,7 +112,7 @@ browsing the packages easier. It provides: unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec index 947e89b16..8dc6b9097 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.2 %endif %define tde_pkg tdeio-ftps %define tde_prefix /opt/trinity @@ -67,13 +67,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -111,7 +119,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec index 8b833c35e..18dab2b6b 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.2 %endif %define tde_pkg tdeio-gopher %define tde_prefix /opt/trinity @@ -67,7 +67,11 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -107,7 +111,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec index e8a4418ed..c58492e13 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.2 %endif %define tde_pkg tdeio-locate %define tde_prefix /opt/trinity @@ -77,7 +77,11 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -90,7 +94,11 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Obsoletes: trinity-kio-locate < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-kio-locate = %{?epoch:%{epoch}:}%{version}-%{release} @@ -123,7 +131,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec index 8a3804e89..5881bdfbe 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.2 %endif %define tde_pkg tdeio-sword %define tde_prefix /opt/trinity @@ -72,13 +72,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -121,7 +129,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec index 6bb629f89..73a3a7b33 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.2 %endif %define tde_pkg tdeio-umountwrapper %define tde_prefix /opt/trinity @@ -71,13 +71,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -113,7 +121,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi 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..833a7dcd9 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.2 %endif %define tde_pkg gtk-qt-engine %define tde_prefix /opt/trinity @@ -79,9 +79,13 @@ BuildRequires: %{_lib}gtk+2.0-devel %if 0%{?pclinuxos} BuildRequires: %{_lib}gtk+2.0_0-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}gtk+2.0-devel +%else BuildRequires: gtk+2.0-devel %endif %endif +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -122,7 +126,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi 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 ce227d406..43c565fd1 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.2 %endif %define tde_pkg gtk3-tqt-engine %define tde_prefix /opt/trinity @@ -86,6 +86,34 @@ BuildRequires: gtk+3.0-devel %description GTK3 style engine which uses the active TDE style to draw its widgets +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_libdir}/libtqtcairo.so.0 +%{tde_libdir}/libtqtcairo.so.0.0.0 +%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.la +%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so +%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0 +%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0 +%dir %{_datadir}/themes/tdegtk +%dir %{_datadir}/themes/tdegtk/gtk-3.0 +%{_datadir}/themes/tdegtk/gtk-3.0/gtk.css + +########## + +%package devel +Summary: Files for the development of applications which will use %{name} +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description devel +%{summary}. + +%files devel +%defattr(-,root,root,-) +%{tde_libdir}/libtqtcairo.la +%{tde_libdir}/libtqtcairo.so + ########## %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -103,7 +131,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -142,20 +170,4 @@ fi %__rm -rf %{buildroot} -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_libdir}/libtqtcairo.la -%{tde_libdir}/libtqtcairo.so -%{tde_libdir}/libtqtcairo.so.0 -%{tde_libdir}/libtqtcairo.so.0.0.0 -%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.la -%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so -%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0 -%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0 -%dir %{_datadir}/themes/tdegtk -%dir %{_datadir}/themes/tdegtk/gtk-3.0 -%{_datadir}/themes/tdegtk/gtk-3.0/gtk.css - - %changelog diff --git a/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec index 76893f3c9..029d46345 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.2 %endif %define tde_pkg kgtk-qt3 %define tde_prefix /opt/trinity @@ -84,8 +84,12 @@ BuildRequires: libidn-devel %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} BuildRequires: gtk2-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}gtk+2.0-devel +%else BuildRequires: gtk+2.0-devel %endif +%endif # GAMIN support # Not on openSUSE. @@ -95,10 +99,18 @@ BuildRequires: gamin-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -128,7 +140,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi 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..1d2ae2a1a 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.2 %endif %define tde_pkg ksplash-engine-moodin %define tde_prefix /opt/trinity @@ -70,7 +70,11 @@ BuildRequires: fdupes BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -119,7 +123,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -165,9 +169,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..588d43858 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.2 %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..eb1c1224d 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.2 %endif %define tde_pkg tde-style-baghira %define tde_prefix /opt/trinity @@ -67,8 +67,14 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# JPEG support +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} -BuildRequires: libjpeg-devel +BuildRequires: %{libjpeg}-devel %else BuildRequires: jpeg-devel %endif @@ -92,7 +98,7 @@ Panther and Jaguar looks, and also includes its own 'Baghira' look %build -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi 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..7bde60350 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.2 %endif %define tde_pkg tde-style-domino %define tde_prefix /opt/trinity @@ -67,10 +67,16 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# JPEG support +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} -BuildRequires: libjpeg-devel +BuildRequires: %{libjpeg}-devel %else -BuildRequires: jpeg-devel +BuildRequires: jpeg-devel %endif %description @@ -88,7 +94,7 @@ of the widgets by customizable color gradients. %build -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi 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..8f6d5dbea 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.2 %endif %define tde_pkg tde-style-ia-ora %define tde_prefix /opt/trinity @@ -66,13 +66,21 @@ BuildRequires: pkgconfig BuildRequires: libtool # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Requires: trinity-twin @@ -96,7 +104,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -145,6 +153,10 @@ fi %{tde_tdelibdir}/twin_iaora_config.so %{tde_datadir}/apps/tdestyle/themes/ia_ora.themerc %{tde_datadir}/apps/twin/iaora.desktop +%{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.la +%{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.so +%{_datadir}/themes/Ia* +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin_iaora.mo %changelog 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..351022128 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.2 %endif %define tde_pkg tde-style-lipstik %define tde_prefix /opt/trinity @@ -84,7 +84,11 @@ BuildRequires: brp-check-trinity BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -111,7 +115,7 @@ Lipstik also provides Lipstik-color-schemes unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec new file mode 100644 index 000000000..fe9f3ef40 --- /dev/null +++ b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec @@ -0,0 +1,149 @@ +# +# spec file for package tde-style-polyester (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.2 +%endif +%define tde_pkg tde-style-polyester +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined' +%define _disable_ld_no_undefined 1 + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Domino widget style and twin decoration for TDE +Group: Graphical desktop/TDE +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# JPEG support +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} +BuildRequires: %{libjpeg}-devel +%else +BuildRequires: jpeg-devel +%endif + +%description +Domino is a style with a soft look. It allows to fine adjust the shininess +of the widgets by customizable color gradients. + + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%{tde_tdelibdir}/plugins/styles/polyester.la +%{tde_tdelibdir}/plugins/styles/polyester.so +%{tde_tdelibdir}/tdestyle_polyester_config.la +%{tde_tdelibdir}/tdestyle_polyester_config.so +%{tde_tdelibdir}/twin3_polyester.la +%{tde_tdelibdir}/twin3_polyester.so +%{tde_tdelibdir}/twin_polyester_config.la +%{tde_tdelibdir}/twin_polyester_config.so +%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterBlue.kcsrc +%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterEmerald.kcsrc +%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterOrangeJuice.kcsrc +%{tde_datadir}/apps/tdestyle/themes/polyester.themerc +%{tde_datadir}/apps/twin/polyester.desktop + + +%changelog 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..c6c675070 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.2 %endif %define tde_pkg tde-style-qtcurve %define tde_prefix /opt/trinity @@ -81,7 +81,11 @@ BuildRequires: brp-check-trinity BuildRequires: libidn-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # GAMIN support # Not on openSUSE. @@ -91,7 +95,11 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Obsoletes: trinity-kde-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release} @@ -137,7 +145,7 @@ fi %__rm -f "po/tr.po" %endif -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/themes/tdmtheme/tdmtheme.spec b/redhat/applications/themes/tdmtheme/tdmtheme.spec index abb9f2240..94a76585f 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.2 %endif %define tde_pkg tdmtheme %define tde_prefix /opt/trinity @@ -67,13 +67,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi 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..2397c1ed6 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.2 %endif %define tde_pkg twin-style-crystal %define tde_prefix /opt/trinity @@ -105,7 +105,7 @@ And it is of course nice to look at. Upstream says: unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi 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..c522aa406 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.2 %endif %define tde_pkg twin-style-dekorator %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec new file mode 100644 index 000000000..6c440c0fe --- /dev/null +++ b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec @@ -0,0 +1,158 @@ +# +# spec file for package twin-style-fahrenheit (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.2 +%endif +%define tde_pkg twin-style-fahrenheit +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE window decoration from SUSE 9.3 +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE. + +It features in additon to the original theme several new button +styles and a changeable titlebar image. + +A color scheme for TDE is provided too. + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{tde_tdelibdir}/twin3_fahrenheit.la +%{tde_tdelibdir}/twin3_fahrenheit.so +%{tde_datadir}/apps/twin/fahrenheit.desktop +%{tde_datadir}/apps/twin/fahrenheit/close.png +%{tde_datadir}/apps/twin/fahrenheit/help.png +%{tde_datadir}/apps/twin/fahrenheit/maximize.png +%{tde_datadir}/apps/twin/fahrenheit/minimize.png +%{tde_datadir}/apps/twin/fahrenheit/minmax.png +%{tde_datadir}/apps/twin/fahrenheit/sticky.png +%{tde_datadir}/apps/twin/fahrenheit/unsticky.png + + +%changelog diff --git a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec index d8734ef3d..dc504b67a 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.2 %endif %define tde_pkg twin-style-machbunt %define tde_prefix /opt/trinity @@ -100,7 +100,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -149,6 +149,6 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/twin3_MachBunt.so %{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc %{tde_datadir}/apps/twin/MachBunt.desktop - +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin-style-machbunt.mo %changelog diff --git a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec index 48ae0e695..d688430b5 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.2 %endif %define tde_pkg twin-style-suse2 %define tde_prefix /opt/trinity @@ -102,7 +102,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec index 432c6072c..4e11d387e 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.2 %endif %define tde_pkg abakus %define tde_prefix /opt/trinity @@ -68,7 +68,11 @@ BuildRequires: bison BuildRequires: flex # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -81,7 +85,11 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -121,7 +129,7 @@ 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 +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec index 09023a7c8..32825f481 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.2 %endif %define tde_pkg filelight %define tde_prefix /opt/trinity @@ -76,13 +76,26 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} # SUSE desktop files utility %if 0%{?suse_version} @@ -117,7 +130,7 @@ directories on your computer. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec index b197f9741..6164dc971 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.2 %endif %define tde_pkg kbarcode %define tde_prefix /opt/trinity @@ -69,13 +69,21 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # PCRE support BuildRequires: pcre-devel @@ -163,7 +171,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec index c2904d693..b3c11038d 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.2 %endif %define tde_pkg kchmviewer %define tde_prefix /opt/trinity @@ -84,13 +84,21 @@ BuildRequires: chmlib-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description KchmViewer is a chm (MS HTML help file format) viewer, written in C++. @@ -131,7 +139,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec index 594396581..04cc9a1cd 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.2 %endif %define tde_pkg kcpuload %define tde_prefix /opt/trinity @@ -70,7 +70,11 @@ BuildRequires: pkgconfig BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -110,7 +114,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec index 1b9bc1148..08cd58522 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.2 %endif %define tde_pkg kdirstat %define tde_prefix /opt/trinity @@ -67,13 +67,21 @@ BuildRequires: pkgconfig BuildRequires: libtool # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -115,7 +123,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec index adbf9d811..d76f6b613 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.2 %endif %define tde_pkg keep %define tde_prefix /opt/trinity @@ -78,13 +78,21 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Requires: rdiff-backup @@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec index ab101e33e..2f96d7d0b 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.2 %endif %define tde_pkg knutclient %define tde_prefix /opt/trinity @@ -67,13 +67,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -171,8 +179,7 @@ fi %doc AUTHORS ChangeLog COPYING README.md %{tde_bindir}/knutclient %{tde_tdeappdir}/knutclient.desktop -%{tde_datadir}/apps/knutclient/knutclientui.rc -%{tde_datadir}/apps/knutclient +%{tde_datadir}/apps/knutclient/ %{tde_tdedocdir}/HTML/cs/knutclient %{tde_tdedocdir}/HTML/en/knutclient %{tde_datadir}/icons/hicolor/*/apps/*.png diff --git a/redhat/applications/utilities/kommando/kommando.spec b/redhat/applications/utilities/kommando/kommando.spec new file mode 100644 index 000000000..cc39c7652 --- /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.2 +%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 <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} + +BuildRequires: desktop-file-utils + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +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 -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + \ + -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..e9d65c5a4 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.2 %endif %define tde_pkg kompose %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ by a scaled screen shot of it. It appears as a panel applet. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec index e36feb919..5b1b0e216 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.2 %endif %define tde_pkg krename %define tde_prefix /opt/trinity @@ -69,10 +69,18 @@ BuildRequires: fdupes BuildRequires: libidn-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -108,7 +116,7 @@ or Exif informations of an image. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec index f89269441..f9f515aa2 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.2 %endif %define tde_pkg ksensors %define tde_prefix /opt/trinity @@ -70,7 +70,11 @@ BuildRequires: fdupes BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -116,7 +120,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec index 7164239fb..be04a512f 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.2 %endif %define tde_pkg mathemagics %define tde_prefix /opt/trinity @@ -78,7 +78,7 @@ Mathemagics is a RPN Calculator. %build -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec index 4a421c78a..a343befe6 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.2 %endif %define tde_pkg qalculate-tde %define tde_prefix /opt/trinity @@ -66,7 +66,11 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}qalculate-devel >= 0.9.6 +%else BuildRequires: libqalculate-devel >= 0.9.6 +%endif %if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?rhel} BuildRequires: cln-devel @@ -114,7 +118,7 @@ This package contains the TDE user interface of qalculate. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 3e4699cd6..895f791e5 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -1,26 +1,35 @@ #!/bin/bash -ex # Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION] -# Example: build_rpm_package.sh tdebase 14.1.0 +# Example: build_rpm_package.sh tdebase 14.1.2 PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}" PATH="$(cd $(dirname $0); pwd):${PATH}" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :) case "${VERSION}" in *~pre*) PREVERSION="${VERSION#*~}";; esac +ARCH="$(uname -i)" +if [ "${ARCH}" = "unknown" ]; then + ARCH="$(uname -m)" +fi DIST="$(rpmdist.sh --dist)" [ -z "${TMPPATH}" ] && TMPPATH="/dev/shm" -BUILDDIR="${TMPPATH}/BUILD${DIST}.$(uname -i)" -BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)" -LOGFILE="${TMPPATH}/log.${COMP##*/}" +BUILDDIR="${TMPPATH}/BUILD${DIST}.${ARCH}" +BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.${ARCH}" +LOGFILE="${TMPPATH}/log.${PKGNAME##*/}" export TEMPDIR="$(mktemp -d)" gather_rpm_sources.sh "${PKGNAME}" "${TDE_VERSION}" "${TEMPDIR}" +specfile="${TEMPDIR}/${SPECFILE##*/}" + +if [ "${DIST}" = ".omv2490" ]; then + sed -i "${specfile}" -e "s|^%patch|%patch |" +fi [ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}" @@ -43,7 +52,7 @@ rpmbuild -ba \ --define "prevers${PREVERSION:+ion} ${PREVERSION:-0}" \ --define "tde_patch 1" \ --define "with_mpeg 1" \ - "${TEMPDIR}/${SPECFILE##*/}" + "${specfile}" RET=$? # Removes BUILDDIR if build succeeded diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh index cc9a33e54..a2e6698ad 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.2}}" ARCH=$(rpm -E %_target_cpu) RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) @@ -8,7 +8,7 @@ RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) [ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}" # RHEL / CentOS / Fedora -if [ -x /usr/bin/yum ]; then +if [ -x "/usr/bin/dnf" ] || [ -x "/usr/bin/yum" ]; then cat <<EOF >/tmp/rpmbuild-tde.repo [rpmbuild.${ARCH}] name=rpmbuild.${ARCH} diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index df6cadc9d..d1ecdb3b0 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -1,13 +1,13 @@ #!/bin/bash # Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION> -# Example: gather_rpm_sources.sh tdebase 14.1.0 /tmp/tdebase +# Example: gather_rpm_sources.sh tdebase 14.1.2 /tmp/tdebase PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}" TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" -DIST="$4" +DIST="$(rpmdist.sh --dist)" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) [ -z "${SPECFILE}" ] && exit 1 @@ -17,7 +17,6 @@ TARBALL=$(get_latest_tarball_filename.sh ${PKGNAME} ${TDE_VERSION} || :) VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :) case "${VERSION}" in *~pre*) PREVERSION="${VERSION#*~}";; esac -DIST="$(rpmdist.sh --dist)" [ -z "${TMPPATH}" ] && TMPPATH="/dev/shm" BUILDDIR="${TMPPATH}/BUILD${DIST}.$(uname -i)" BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)" diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh index b89f9bb7f..bbb18b0cd 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.2-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..51c46e476 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.2}}" 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..1f3cebbfe 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.2}}" [ -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..66429b0d7 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.2}}" [ -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 36090ef86..a2c89cfb8 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.2}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 @@ -12,7 +12,9 @@ TARBALL=$(get_latest_tarball_filename.sh "${PKGNAME}" ${TDE_VERSION}) VERSION=${TARBALL##*/} VERSION=${VERSION#trinity-} VERSION=${VERSION#${PKGNAME}-} +VERSION=${VERSION#${PKGNAME}_} VERSION=${VERSION#*-} VERSION=${VERSION%.tar.gz} VERSION=${VERSION%.tar.bz2} +VERSION=${VERSION%.orig} echo "$VERSION" diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index 529aa49ed..3f42de99d 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.2}}" DIST="$3" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 @@ -31,7 +31,7 @@ while read var val; do --define "tde_version ${TDE_VERSION}" \ --define "name ${name}" \ --define "version ${VERSION}" \ - --define "dist ${DIST:-$(rpm -E %dist)}" \ + --define "dist ${DIST:-$(rpmdist.sh --dist)}" \ -E "${FILE}") [ -r "${file}" ] && break done diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh index 529b11593..a1ba33449 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.2}}" [ -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..e32d7c00f 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.2}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/install_requires.sh b/redhat/build/install_requires.sh index 9c901ac50..5a947539d 100755 --- a/redhat/build/install_requires.sh +++ b/redhat/build/install_requires.sh @@ -1,6 +1,7 @@ #!/bin/bash -PKGFILE="packages$(rpm -E %dist)" +DIST="$(rpmdist.sh --dist)" +PKGFILE="packages${DIST}" # Under Mageia/Mandriva, do not forget to enable "Tainted" and "Nonfree" repositories ! if [ -x /usr/sbin/urpmi ]; then diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh index 336a83cc3..70432b442 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.2}}" 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..997b1f99d 100755 --- a/redhat/build/is_latest_package_installed.sh +++ b/redhat/build/is_latest_package_installed.sh @@ -1,11 +1,12 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}" INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION}) TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION}) SPEC=$(get_spec_version.sh ${PKGNAME} ${TDE_VERSION}) +DIST="$(rpmdist.sh --dist)" # Package containing "~" (e.g. R14 preversion tarballs): if [ "${TARBALL/\~/}" != "${TARBALL}" ]; then @@ -22,7 +23,7 @@ else fi # Other package (e.g. QT3) - if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}$(rpm -E %dist)" = "${SPEC}" ]; then + if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}${DIST}" = "${SPEC}" ]; then echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed." exit 0 fi diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh index 7f06af83e..d7be81993 100755 --- a/redhat/build/rpmdist.sh +++ b/redhat/build/rpmdist.sh @@ -5,7 +5,9 @@ RHEL=0 MGA=0 DIST="" -if [ -r /etc/redhat-release ]; then +if [ -r /etc/openmandriva-release ]; then + a="openmandriva" +elif [ -r /etc/redhat-release ]; then read a b c d e f g < /etc/redhat-release elif [ -r /etc/SuSE-release ] || [ -r /etc/SUSE-brand ] || grep -q "opensuse" "/etc/os-release"; then a="opensuse" @@ -14,13 +16,13 @@ fi case $a in # Mageia release 1 (Official) for x86_64 Mageia*) - DIST=".mga${c}" -# MDKVERSION="201002" + DIST=".mga${c}" + #MDKVERSION="201002" ;; # Mandriva Linux release 2011.0 (Official) for x86_64 Mandriva*) - DIST=".mdv${d}" - MDKVERSION="201100" + DIST=".mdv${d}" + MDKVERSION="201100" ;; # CentOS release 5.7 (Final) # CentOS Linux release 6.0 (Final) @@ -49,6 +51,15 @@ case $a in DIST=".oss" fi ;; + # openmandriva + openmandriva) + . /etc/os-release + if [ "${VERSION_ID}" = "5.0" ]; then + DIST=".omv5000" # 5.0 (Rock) + else + DIST=".omv2490" # Cooker + fi + ;; # PCLinuxOS PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";; #PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos";; diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh index c00078f1e..5a8a13eb4 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.2}}" LOCKFILE="/tmp/lock.${0##*/}" while [ -e "${LOCKFILE}" ]; do @@ -11,24 +11,32 @@ done ARCH="$(rpm -E %{_target_cpu})" RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) +DIST="$(rpmdist.sh --dist)" [ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch" [ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}" +if [ -x "/usr/bin/createrepo_c" ]; then + createrepo="/usr/bin/createrepo_c" +else + createrepo="/usr/bin/createrepo" +fi + if [ -x /usr/sbin/urpmi ]; then REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)' elif [ -x /usr/bin/dnf ]; then - REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)' + REPOUPDATE='(cd ${RPMDIR}; ${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*")' + if [ "${DIST}" = ".el5" ]; then + REPOUPDATE='(cd ${RPMDIR}; ${createrepo} ${ARCH} & ${createrepo} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' else - REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' + REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' fi elif [ -x /usr/bin/apt-get ]; then - REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)' + REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir --topdir=$PWD i586 x86_64 noarch; sudo apt-get update)' fi eval "${REPOUPDATE}; rm -f ${LOCKFILE}" || exit 1 diff --git a/redhat/core/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec index 3884089c7..34bbf3a4b 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.2 %endif %define tde_pkg tde-i18n %define tde_prefix /opt/trinity @@ -1432,7 +1432,7 @@ for l in %{TDE_LANGS}; do ln -s ../cmake cmake fi - if ! rpm -E %%cmake|grep -q "cd build"; then + if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec index 7034a5984..35b6e2804 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.2 %endif %define tde_pkg tdeaccessibility %define tde_prefix /opt/trinity @@ -95,11 +95,23 @@ BuildRequires: trinity-akode-devel %endif # ALSA support -BuildRequires: alsa-lib-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif # GLIB2 support BuildRequires: glib2-devel +# JPEG support +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel + # XCB support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} BuildRequires: libxcb-devel @@ -401,7 +413,7 @@ Summary: Development files for tdeaccessibility Group: Development/Libraries/X11 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel >= %{version} -Requires: libjpeg-devel +Requires: %{libjpeg}-devel Requires: libpng-devel Obsoletes: trinity-kdeaccessibility-devel < %{?epoch:%{epoch}:}%{version}-%{release} @@ -439,7 +451,7 @@ unset QTDIR QTLIB QTINC export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec index 5b57a05de..a11c0c654 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.2 %endif %define tde_pkg tdeaddons %define tde_prefix /opt/trinity @@ -87,13 +87,25 @@ BuildRequires: brp-check-trinity %endif # SDL support -BuildRequires: SDL-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}SDL-devel +%else +BuildRequires: SDL-devel +%endif -# ALSA support +# ALSA supportl +%if 0%{?mdkver} >= 24090000 +BuildRequires: %{_lib}asound-devel +%else BuildRequires: alsa-lib-devel +%endif # OPENSSL support -BuildRequires: openssl-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else +BuildRequires: openssl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -112,7 +124,11 @@ BuildRequires: pcre-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # DB4/DB5 support %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} @@ -692,7 +708,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec index 441e3d866..322b8e869 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.2 %endif %define tde_pkg tdeadmin %define tde_prefix /opt/trinity @@ -88,13 +88,21 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # RPM support BuildRequires: rpm-devel @@ -351,7 +359,7 @@ touch /etc/lilo.conf unset QTDIR QTLIB QTINC export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -387,7 +395,7 @@ fi -DBUILD_SECPOLICY=ON \ -DBUILD_TDEFILE_PLUGINS=ON \ \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 -DKU_FIRSTUID="1000" \ -DKU_FIRSTGID="1000" \ %endif diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec index ad15a0c1d..ab1e7c3cb 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.2 %endif %define tde_pkg tdeartwork %define tde_prefix /opt/trinity @@ -75,10 +75,14 @@ BuildRequires: gettext BuildRequires: libidn-devel # ESOUND support -BuildRequires: esound-devel +#BuildRequires: esound-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # MESA support %if 0%{?rhel} || 0%{?fedora} @@ -86,8 +90,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -172,7 +180,11 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # Metapackage @@ -740,7 +752,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40 new file mode 120000 index 000000000..bcd188214 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc38 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc38 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc38 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc39 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc39 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc39 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc40 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc40 new file mode 120000 index 000000000..9d4df92f4 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc40 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.mga9 b/redhat/core/tdebase/pamd.kdm-trinity-np.mga9 new file mode 100644 index 000000000..f884c1de6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mga9 @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_console.so +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc38 b/redhat/core/tdebase/pamd.kdm-trinity.fc38 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc38 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc39 b/redhat/core/tdebase/pamd.kdm-trinity.fc39 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc39 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc40 b/redhat/core/tdebase/pamd.kdm-trinity.fc40 new file mode 120000 index 000000000..5022f14ef --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc40 @@ -0,0 +1 @@ +pamd.kdm-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.mga9 b/redhat/core/tdebase/pamd.kdm-trinity.mga9 new file mode 100644 index 000000000..cb0982c9a --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.mga9 @@ -0,0 +1,15 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_succeed_if.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth substack system-auth +-auth optional pam_kwallet.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_console.so +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_kwallet.so diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc39 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc39 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc39 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40 new file mode 120000 index 000000000..a7b20accd --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/core/tdebase/pamd.tde.omv5000 b/redhat/core/tdebase/pamd.tde.omv5000 new file mode 100644 index 000000000..9e0557414 --- /dev/null +++ b/redhat/core/tdebase/pamd.tde.omv5000 @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth include system-auth +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session required pam_loginuid.so diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index 9648593b8..c1dcce65c 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.2 %endif %define tde_pkg tdebase %define tde_prefix /opt/trinity @@ -63,10 +63,14 @@ Source1: %{name}-rpmlintrc # Pam configuration files for RHEL / Fedora %if 0%{?suse_version} == 0 -Source2: pamd.kdm-trinity%{?dist} -Source3: pamd.kdm-trinity-np%{?dist} -Source4: pamd.kcheckpass-trinity%{?dist} -Source5: pamd.kscreensaver-trinity%{?dist} +%if 0%{?mdkver} +Source2: pamd.tde.omv5000 +%else +Source2: pamd.kdm-trinity%{?pamd_suffix} +Source3: pamd.kdm-trinity-np%{?pamd_suffix} +Source4: pamd.kcheckpass-trinity%{?pamd_suffix} +Source5: pamd.kscreensaver-trinity%{?pamd_suffix} +%endif %endif # openSUSE: configuration file for TDM @@ -187,6 +191,12 @@ Requires: mandriva-theme %define tde_starticon /usr/share/icons/mandriva.png %endif +# OpenMandriva +%if 0%{?mdkver} +Requires: distro-release-theme +%define tde_bg /usr/share/wallpapers/default.png +%endif + # PCLINUXOS %if 0%{?pclinuxos} Requires: desktop-common-data @@ -202,7 +212,7 @@ Requires: hicolor-icon-theme-branding %endif # OpenSuse TW Theme -%if "%{?suse_version}" == "1550" +%if "%{?suse_version}" == "1699" Requires: wallpaper-branding %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg Requires: hicolor-icon-theme-branding @@ -221,19 +231,36 @@ BuildRequires: fdupes BuildRequires: htdig # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # AUDIOFILE support BuildRequires: audiofile-devel # ALSA supportl -BuildRequires: alsa-lib-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif # RAW1394 support +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}raw1394-devel +%else BuildRequires: libraw1394-devel +%endif # VORBIS support -BuildRequires: libvorbis-devel +%if 0%{?mdkver} || 0%{?mgaversion} +%define libvorbis_devel %{_lib}vorbis-devel +%else +%define libvorbis_devel libvorbis-devel +%endif +BuildRequires: %{libvorbis_devel} # GLIB2 support BuildRequires: glib2-devel @@ -242,9 +269,13 @@ BuildRequires: glib2-devel BuildRequires: pcre-devel # SASL support -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}sasl-devel +%else BuildRequires: %{_lib}sasl2-devel %endif +%endif %if 0%{?suse_version} BuildRequires: cyrus-sasl-devel %endif @@ -266,10 +297,10 @@ BuildRequires: libusb-devel %endif # ESOUND support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_esound 1 -BuildRequires: esound-devel -%endif +#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +#define with_esound 1 +#BuildRequires: esound-devel +#endif # IDN support BuildRequires: libidn-devel @@ -283,8 +314,12 @@ BuildRequires: gamin-devel # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: lib64ldap-devel +%else BuildRequires: openldap-devel %endif +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif @@ -306,13 +341,21 @@ BuildRequires: libsensors4-devel %if 0%{?suse_version} >= 1310 BuildRequires: udev %endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel +%endif %define with_tsak 1 %define with_tdehwlib 1 %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # XRANDR support # On RHEL5, xrandr library is too old. @@ -337,8 +380,12 @@ BuildRequires: hal-devel >= 0.5 # Disabled on RHEL4 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_exr 1 +%if 0%{?mdkver} +BuildRequires: %{_lib}openexr-devel +%else BuildRequires: OpenEXR-devel %endif +%endif # XSCREENSAVER support # RHEL 4: disabled @@ -396,8 +443,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -428,8 +479,12 @@ BuildRequires: libart_lgpl-devel BuildRequires: samba-common %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?mdkver} +BuildRequires: %{_lib}smbclient-devel +%else BuildRequires: libsmbclient-devel %endif +%endif # IMAKE %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 @@ -441,8 +496,15 @@ BuildRequires: imake BuildRequires: xorg-x11-libxkbfile-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}xkbfile-devel +%else BuildRequires: libxkbfile-devel %endif +%if 0%{?fedora} || 0%{?mdkver} || 0%{?rhel} >= 7 +BuildRequires: xkeyboard-config-devel +%endif +%endif # XDMCP support %if 0%{?mgaversion} || 0%{?mdkversion} @@ -514,16 +576,22 @@ BuildRequires: font-util BuildRequires: bdftopcf %endif +%if 0%{?mdkver} < 24090000 %if 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: drakconf %endif +%endif # LIBCONFIG support # Needed for "compton" stuff %if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} %define with_libconfig 1 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}config-devel +%else BuildRequires: libconfig-devel %endif +%endif # KBDLEDSYNC support %if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} @@ -553,7 +621,12 @@ BuildRequires: libnsl-devel %endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} # SELINUX support %if 0%{?rhel} >= 6 || 0%{?fedora} @@ -728,6 +801,7 @@ Such as the desktop right-click-"Create New" list %files runtime-data-common %defattr(-,root,root,-) +%{tde_datadir}/apps/kxkb/ %{tde_datadir}/desktop-directories/ %{tde_datadir}/icons/hicolor/*/apps/kxkb.png %{tde_datadir}/icons/hicolor/*/apps/knetattach.* @@ -1145,11 +1219,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 +1907,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 +2166,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 @@ -2116,10 +2183,10 @@ already. Most users won't need this. %if 0%{?suse_version} >= 1210 /usr/lib/X11/displaymanagers/ %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 +%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} >= 7 /usr/lib/systemd/system/tdm.service %endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 +%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} || 0%{?suse_version} %{_datadir}/xsessions/tde.desktop %endif @@ -2616,8 +2683,10 @@ ever launching another application. %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop +%if 0%{?mdkver} < 24090000 %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase +%endif %{tde_datadir}/apps/konqueror/tiles/ %{tde_datadir}/autostart/konqy_preload.desktop %{tde_datadir}/config.kcfg/keditbookmarks.kcfg @@ -2636,6 +2705,8 @@ ever launching another application. %{tde_mandir}/man1/kfmclient.1* %{tde_mandir}/man1/konqueror.1* +%if 0%{?mdkver} < 24090000 + %post -n trinity-konqueror if [ $1 -eq 1 ]; then update-alternatives --install \ @@ -2652,6 +2723,8 @@ if [ $1 -eq 0 ]; then %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || : fi +%endif + ########## %package -n trinity-konqueror-devel @@ -2826,10 +2899,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 || : @@ -2837,8 +2906,10 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess %postun -n trinity-ksmserver %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} < 24090000 fndSession %endif +%endif # openSUSE 15.0 alternatives %if 0%{?suse_version} >= 1500 @@ -3007,6 +3078,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 +3272,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 \ @@ -3260,7 +3335,7 @@ if [ -d "/usr/include/tirpc" ]; then RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -3332,7 +3407,7 @@ fi %if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320 -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \ %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver} -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \ %endif .. @@ -3351,7 +3426,7 @@ fi # Adds a GDM/KDM/XDM session called 'TDE' # Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'. -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mdkver} || 0%{?mgaversion} >= 6 %__install -D -m 644 \ "%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \ "%{?buildroot}%{_datadir}/xsessions/tde.desktop" @@ -3381,24 +3456,29 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k" %else %if 0%{?mgaversion} >= 6 FNDSESSION_EXEC="/usr/sbin/chksession -l" -%else -FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions" -%endif %endif EOF %endif +%endif # PAM configuration files (except openSUSE) %if 0%{?suse_version} == 0 +%if 0%{?mdkver} +%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity" +%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np" +%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" +%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity" +%else %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity" %__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np" %__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" %__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity" %endif +%endif # TDM configuration %__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver} -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else -e "s/^#*MinShowUID=.*/MinShowUID=500/" @@ -3413,11 +3493,13 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" fi +%if 0%{?mdkver} < 24090000 # Makes 'media_safelyremove.desktop' an alternative. # This allows the use of 'tdeio-umountwrapper' package. %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" %__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives" %__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop" +%endif # SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm' # You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' diff --git a/redhat/core/tdebase/tdm.fc38.te b/redhat/core/tdebase/tdm.fc38.te new file mode 100644 index 000000000..afe6de52a --- /dev/null +++ b/redhat/core/tdebase/tdm.fc38.te @@ -0,0 +1,11 @@ + +module tdm 1.0; + +require { + type fprintd_t; + type init_t; + class dbus send_msg; +} + +#============= fprintd_t ============== +allow fprintd_t init_t:dbus send_msg; diff --git a/redhat/core/tdebase/tdm.fc39.te b/redhat/core/tdebase/tdm.fc39.te new file mode 100644 index 000000000..f3bcb40d4 --- /dev/null +++ b/redhat/core/tdebase/tdm.fc39.te @@ -0,0 +1,30 @@ + +module tdm 1.0; + +require { + type etc_t; + type fprintd_t; + type init_t; + type tmp_t; + type unconfined_service_t; + type unconfined_t; + type var_lib_t; + type var_run_t; + type xdm_t; + class capability2 mac_admin; + class dbus send_msg; + class fifo_file { getattr open read setattr unlink }; + class file { create entrypoint getattr lock map open read rename unlink write }; + class lnk_file unlink; + class process transition; +} + +allow fprintd_t init_t:dbus send_msg; +allow unconfined_service_t unconfined_t:process transition; +allow unconfined_t self:capability2 mac_admin; +allow xdm_t etc_t:file { create rename unlink write }; +allow xdm_t tmp_t:fifo_file { getattr open read setattr unlink }; +allow xdm_t tmp_t:file { map open unlink }; +allow xdm_t tmp_t:lnk_file unlink; +allow xdm_t var_lib_t:file { unlink }; +allow xdm_t var_run_t:file { getattr lock open read write }; diff --git a/redhat/core/tdebase/tdm.fc40.te b/redhat/core/tdebase/tdm.fc40.te new file mode 120000 index 000000000..6d3f39b54 --- /dev/null +++ b/redhat/core/tdebase/tdm.fc40.te @@ -0,0 +1 @@ +tdm.fc39.te
\ No newline at end of file diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index 9f3bf5d1b..f194d330e 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.2 %endif %define tde_pkg tdebindings %define tde_prefix /opt/trinity @@ -107,8 +107,12 @@ Requires: evolution28-pango BuildRequires: evolution28-atk-devel Requires: evolution28-atk %else +%if 0%{?mdkver} +BuildRequires: %{_lib}gtk+2.0-devel +%else BuildRequires: gtk2-devel %endif +%endif # XULRUNNER support %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 @@ -119,7 +123,11 @@ BuildRequires: mozilla-xulrunner20-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # GTK1 support %if 0%{?fedora} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) @@ -161,8 +169,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -185,13 +197,13 @@ BuildRequires: rubypick %endif # Check for Ruby library directory -%if "%{?ruby_libarchdir}" != "" +%if "%{?ruby_libarchdir}" != "" && "%{?ruby_libarchdir}" != "%{_libdir}/%{name}" %define ruby_arch %{?ruby_libarchdir} %else %if "%{?rb_archdir}" != "" %define ruby_arch %{?rb_archdir} %else -%if "%{%ruby_archdir}" != "" +%if "%{?ruby_archdir}" != "" %define ruby_arch %{?ruby_archdir} %else %{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')} @@ -686,7 +698,7 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{python_sitearch}/pcop.la %{python_sitearch}/pcop.so -%if 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/pydcop.py* %if 0%{?rhel} == 7 %{python_sitearch}/__pycache__/pydcop.*.pyc @@ -1076,6 +1088,10 @@ exit 2 exit 3 %endif +%if 0%{?mdkver} +touch config.h.in +%endif + # [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 %__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \ @@ -1102,7 +1118,7 @@ exit 3 %endif %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -1139,9 +1155,8 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_t EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu" %endif -if [ -d "/usr/include/python3.6m" ]; then - EXTRA_INCLUDES="/usr/include/python3.6m:${EXTRA_INCLUDES}" -fi +# Force python version +export PYTHON=%{__python} # Warning: GCC visibility causes FTBFS [Bug #1285] %configure \ @@ -1171,6 +1186,11 @@ fi %{?with_java:--with-java=%{java_home}} %{!?with_java:--without-java} \ %{?with_qscintilla:--enable-qscintilla} %{!?with_qscintilla:--disable-qscintilla} +# Ensure python was detected properly +if grep "LIBPYTHON=''" "config.log"; then + exit 1 +fi + # Build dcopperl with specific options pushd dcopperl CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3 diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec index 7bbef35e9..7cb4d8318 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.2 %endif %define tde_pkg tdeedu %define tde_prefix /opt/trinity @@ -81,13 +81,21 @@ BuildRequires: fdupes BuildRequires: doxygen # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # LIBUSB support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} @@ -103,7 +111,7 @@ BuildRequires: libusb-devel %endif # PYTHON3 support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8 %global python python3 %global __python %__python3 %global python_sitearch %{python3_sitearch} @@ -123,8 +131,12 @@ BuildRequires: %{_lib}boost_python3-devel BuildRequires: libboost_%{python}-devel %endif %if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} == 7 +BuildRequires: boost-python36-devel +%else BuildRequires: boost-%{python}-devel %endif +%endif # OCAML support %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 @@ -1153,7 +1165,7 @@ sed -i "kig/pykig/pykig.py" \ export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec index 273705e9f..26bb8d057 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.2 %endif %define tde_pkg tdegames %define tde_prefix /opt/trinity @@ -97,13 +97,26 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} # SUSE desktop files utility %if 0%{?suse_version} @@ -1183,7 +1196,7 @@ 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 +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec index 1be2d079d..67a60e45f 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.2 %endif %define tde_pkg tdegraphics %define tde_prefix /opt/trinity @@ -95,29 +95,49 @@ BuildRequires: libusb-devel %endif # MNG support +%if 0%{?mdkver} +BuildRequires: %{_lib}mng-devel +%else BuildRequires: libmng-devel +%endif # TIFF support -BuildRequires: libtiff-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}tiff-devel +%else +BuildRequires: libtiff-devel +%endif # PCRE support BuildRequires: pcre-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # GIF support %if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8 BuildRequires: giflib-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}gif-devel +%else BuildRequires: libungif-devel %endif +%endif # GPHOTO2 support -%if 0%{?suse_version} -BuildRequires: libgphoto2-devel +%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}gphoto-devel %else -BuildRequires: gphoto2-devel +BuildRequires: gphoto2-devel +%endif +%else +BuildRequires: libgphoto2-devel %endif # PAPER support @@ -169,7 +189,7 @@ BuildRequires: xorg-x11-libXmu-devel BuildRequires: libXmu-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} >= 4 -BuildRequires: libxmu-devel +BuildRequires: %{_lib}xmu-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel @@ -181,8 +201,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} >= 24090000 +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -195,11 +219,19 @@ BuildRequires: xorg-x11-Mesa-libGLU %if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}drm-devel +%else BuildRequires: libdrm-devel %endif +%endif # OPENEXR support +%if 0%{?mdkver} >= 24090000 +BuildRequires: %{_lib}openexr-devel +%else BuildRequires: OpenEXR-devel +%endif # POPPLER support %define with_pdf 1 @@ -231,7 +263,11 @@ BuildRequires: lcms-devel BuildRequires: fribidi-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # kamera %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} @@ -1058,7 +1094,7 @@ 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 +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec index e66e5d75c..df2eaf1d3 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.2 %endif %define tde_pkg tdelibs %define tde_prefix /opt/trinity @@ -105,25 +105,49 @@ BuildRequires: brp-check-trinity BuildRequires: krb5-devel # XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif # ALSA support -BuildRequires: alsa-lib-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif # IDN support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}idn-devel +%else BuildRequires: libidn-devel +%endif # CUPS support BuildRequires: cups-devel # TIFF support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}tiff-devel +%else BuildRequires: libtiff-devel +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # ACL support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # GLIB2 support BuildRequires: glib2-devel @@ -148,8 +172,12 @@ BuildRequires: gamin-devel # PCRE support %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_pcre 1 +%if 0%{?mgaversion} >= 9 +BuildRequires: %{_lib}pcre-devel +%else BuildRequires: pcre-devel %endif +%endif # INOTIFY support %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -214,7 +242,12 @@ Requires: avahi # OPENEXR support %if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_openexr 1 +%if 0%{?mdkver} +BuildRequires: %{_lib}openexr-devel +%else BuildRequires: OpenEXR-devel +%endif + %if 0%{?pclinuxos} BuildRequires: libpthread-stubs %endif @@ -241,10 +274,12 @@ BuildRequires: xorg-x11-devel %endif # ICEAUTH -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 +%if 0%{?fedora} >= 34 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1220 Requires: iceauth BuildRequires: iceauth %endif + +# Xorg %if 0%{?rhel} >= 5 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) Requires: xorg-x11-server-utils BuildRequires: xorg-x11-server-utils @@ -276,8 +311,8 @@ Requires: ca-certificates %define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt %endif %endif -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} +%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver} Requires: rootcerts %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %else @@ -322,22 +357,26 @@ Requires: %{cacert} %define xt_devel libXt-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -%define xt_devel libxt-devel +%define xt_devel %{_lib}xt-devel %endif %{?xt_devel:BuildRequires: %{xt_devel}} ### New features in TDE R14 # LIBMAGIC support +%if 0%{?mdkver} +BuildRequires: %{_lib}magic-devel +%else %if 0%{?rhel} != 5 BuildRequires: file-devel %endif +%endif # NETWORKMANAGER support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} %define with_nm 1 %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} != 8 +%if 0%{?mgaversion} && 0%{?mgaversion} <= 7 BuildRequires: %{_lib}nm-util-devel %endif %endif @@ -356,8 +395,12 @@ BuildRequires: NetworkManager-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # HAL support %if 0%{?rhel} == 5 @@ -377,15 +420,23 @@ Requires: udisks %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7 %define with_udisks2 1 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -BuildRequires: libudisks2-devel -%else +%define udisks2 udisks2 +%define udisks2_devel libudisks2-devel +%endif %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 -BuildRequires: libudisks2-0-devel -%else -BuildRequires: udisks2-devel +%define udisks2 udisks2 +%define udisks2_devel libudisks2-0-devel %endif +%if 0%{?mdkversion} || 0%{?mgaversion} +%define udisks2 udisks2 +%define udisks2_devel udisks2-devel %endif -Requires: udisks2 +%if 0%{?mdkver} +%define udisks2 udisks +%define udisks2_devel %{_lib}udisks-devel +%endif +Requires: %{udisks2} +BuildRequires: %{udisks2_devel} %endif # DEVICEKIT POWER support @@ -443,7 +494,12 @@ BuildRequires: libr-devel >= 0.6.0 %endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} # INTLTOOL support BuildRequires: intltool @@ -593,7 +649,7 @@ Requires: libtqt3-mt-devel >= 3.5.0 Requires: libtqt4-devel = %{tde_epoch}:4.2.0 Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 Requires: libart_lgpl-devel -Requires: libattr-devel +Requires: %{libattr_devel} Requires: intltool %{?xcomposite_devel:Requires: %{xcomposite_devel}} %{?xt_devel:Requires: %{xt_devel}} @@ -647,7 +703,7 @@ fi export TDEDIR="%{tde_prefix}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec index 08056f129..4aa7a0d1a 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.2 %endif %define tde_pkg tdemultimedia %define tde_prefix /opt/trinity @@ -111,21 +111,48 @@ BuildRequires: zlib-devel #BuildRequires: libmusicbrainz-devel libtunepimp-devel # Audio libraries -BuildRequires: libvorbis-devel BuildRequires: audiofile-devel -BuildRequires: libtheora-devel -BuildRequires: alsa-lib-devel BuildRequires: cdparanoia #BuildRequires: libmpg123-devel +# VORBIS support +%if 0%{?mdkver} || 0%{?mgaversion} +%define libvorbis_devel %{_lib}vorbis-devel +%else +%define libvorbis_devel libvorbis-devel +%endif +BuildRequires: %{libvorbis_devel} + +# THEORA +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}theora-devel +%else +BuildRequires: libtheora-devel +%endif + +# ALSA support +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif + # CDDA support %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}cdda-devel +%else BuildRequires: libcdda-devel %endif +%endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: cdparanoia-devel %endif +# CDIO support +BuildRequires: libcdio-devel +BuildRequires: libcdio-paranoia-devel + # FLAC support %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?pclinuxos} @@ -140,9 +167,14 @@ BuildRequires: flac-devel # GSTREAMER support %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}gstreamer-devel +BuildRequires: %{_lib}gst-plugins-base1.0-devel +%else BuildRequires: %{_lib}gstreamer1.0-devel BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel %endif +%endif %if 0%{?rhel} == 4 BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-devel @@ -178,8 +210,12 @@ BuildRequires: libXxf86vm-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}xine-devel +%else BuildRequires: %{_lib}xine1.2-devel %endif +%endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: xine-lib-devel %endif @@ -212,13 +248,26 @@ BuildRequires: libmp3lame-devel BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} %if 0%{?fedora} || 0%{?rhel} BuildRequires: lame-devel @@ -787,6 +836,7 @@ This package contains audiofile plugins for aRts. ########## %if 0%{?with_mpeg} + %package -n trinity-libarts-mpeglib Summary: Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video Group: Productivity/Multimedia/Other @@ -800,7 +850,7 @@ This is the arts (TDE Sound daemon) plugin. %files -n trinity-libarts-mpeglib %defattr(-,root,root,-) %{tde_bindir}/mpeglibartsplay -%{tde_libdir}/libarts_mpeglib-0.3.0.so* +%{tde_libdir}/libarts_mpeglib-0.3.0.so.* %{tde_libdir}/libarts_mpeglib.la %{tde_libdir}/libarts_splay.so.* %{tde_libdir}/libarts_splay.la @@ -1004,6 +1054,7 @@ noatun plugins. %{tde_libdir}/libarts_audiofile.so %if 0%{?with_mpeg} %{tde_libdir}/libarts_mpeglib.so +%{tde_libdir}/libarts_mpeglib-0.3.0.so %{tde_libdir}/libarts_splay.so %endif %if 0%{?with_xine} @@ -1067,7 +1118,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec index 2dd26ce3e..0a6e431ca 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.2 %endif %define tde_pkg tdenetwork %define tde_prefix /opt/trinity @@ -114,7 +114,11 @@ Requires: avahi %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # TLS support BuildRequires: gnutls-devel @@ -129,8 +133,12 @@ BuildRequires: sqlite-devel # GADU support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_gadu 1 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}gadu-devel +%else BuildRequires: libgadu-devel %endif +%endif # PCRE support BuildRequires: pcre-devel @@ -158,7 +166,7 @@ BuildRequires: xorg-x11-libXmu-devel BuildRequires: libXmu-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} >= 4 -BuildRequires: libxmu-devel +BuildRequires: %{_lib}xmu-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel @@ -177,18 +185,24 @@ BuildRequires: libXxf86vm-devel #define _with_xmms --with-xmms # Wifi support -%define with_wifi 1 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 -BuildRequires: wireless-tools-devel +%define wifi_devel wireless-tools-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mdkversion} -BuildRequires: %{_lib}iw29-devel +%define wifi_devel %{_lib}iw29-devel %endif %if 0%{?rhel} == 5 || 0%{?suse_version} -BuildRequires: wireless-tools +%define wifi_devel wireless-tools %endif %if 0%{?suse_version} || 0%{?mgaversion} >= 3 -BuildRequires: libiw-devel +%define wifi_devel libiw-devel +%endif +%if 0%{?mdkver} +%define wifi_devel %nil +%endif +%if "%{wifi_devel}" != "" +%define with_wifi 1 +BuildRequires: %{wifi_devel} %endif # OpenSLP support @@ -217,7 +231,13 @@ BuildRequires: kernel-headers # XML support BuildRequires: libxml2-devel + +# XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif #jabber BuildRequires: libidn-devel @@ -234,7 +254,11 @@ BuildRequires: speex-devel #Requires: jasper # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # MEANWHILE support %if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version} @@ -715,7 +739,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 @@ -1062,6 +1086,7 @@ A tdeioslave and tded module that provide Zeroconf support. Try %{tde_datadir}/apps/zeroconf/_nfs._tcp %{tde_datadir}/apps/zeroconf/_ssh._tcp %{tde_datadir}/apps/zeroconf/_rfb._tcp +%{tde_datadir}/apps/zeroconf/_sftp-ssh._tcp %{tde_tdelibdir}/tdeio_zeroconf.so %{tde_tdelibdir}/tdeio_zeroconf.la %{tde_tdelibdir}/kded_dnssdwatcher.so @@ -1099,7 +1124,7 @@ 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 +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec index e3a9f483e..de1c98944 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.2 %endif %define tde_pkg tdepim %define tde_prefix /opt/trinity @@ -75,15 +75,38 @@ BuildRequires: desktop-file-utils BuildRequires: make BuildRequires: gpgme-devel -BuildRequires: libgpg-error-devel BuildRequires: flex -BuildRequires: libical-devel BuildRequires: boost-devel BuildRequires: pcre-devel BuildRequires: libidn-devel +# ICAL support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}ical-devel +%else +BuildRequires: libical-devel +%endif + +# GPG-ERROR support +%if 0%{?mdkver} +BuildRequires: %{_lib}gpg-error-devel +%else +BuildRequires: libgpg-error-devel +%endif + # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif + +# ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else +BuildRequires: libacl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -126,8 +149,12 @@ BuildRequires: curl-devel BuildRequires: glib2-devel # SASL support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}sasl-devel +%else BuildRequires: %{_lib}sasl2-devel +%endif %else BuildRequires: cyrus-sasl-devel %endif @@ -187,9 +214,6 @@ BuildRequires: xscreensaver-gl %endif %endif -# ACL support -BuildRequires: libacl-devel - Requires: trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} @@ -835,8 +859,12 @@ Requires: gnupg2 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} Requires: pinentry +%if 0%{?mdkver} +Requires: gnupg +%else Requires: dirmngr %endif +%endif %description -n trinity-kleopatra Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm @@ -1845,7 +1873,7 @@ 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 +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec index 53dfffc6e..8d1ac42b6 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.2 %endif %define tde_pkg tdesdk %define tde_prefix /opt/trinity @@ -80,7 +80,11 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -117,12 +121,21 @@ BuildRequires: libdb-4_8-devel # kbabel, F-7+: flex >= 2.5.33-9 BuildRequires: flex +%if 0%{?mdkver} +BuildRequires: flex-devel +%endif # umbrello -BuildRequires: libxslt-devel BuildRequires: libxml2-devel BuildRequires: subversion-devel BuildRequires: neon-devel +# XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else +BuildRequires: libxslt-devel +%endif + # PERL support BuildRequires: perl %if 0%{?fedora} >= 19 @@ -130,7 +143,11 @@ BuildRequires: perl-podlators %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # PYTHON support %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8 @@ -1092,7 +1109,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec index eb823346d..48cf7218a 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.2 %endif %define tde_pkg tdetoys %define tde_prefix /opt/trinity @@ -93,13 +93,21 @@ BuildRequires: gamin-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # PCRE support BuildRequires: pcre-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Obsoletes: trinity-kdetoys < %{?epoch:%{epoch}:}%{version}-%{release} @@ -399,7 +407,7 @@ This package is part of Trinity, and a component of the TDE toys module. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec index eb42326d0..cd0c99dd7 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.2 %endif %define tde_pkg tdeutils %define tde_prefix /opt/trinity @@ -85,7 +85,9 @@ BuildRequires: net-snmp-devel BuildRequires: gmp-devel # PYTHON support +%if "%{python}" == "" %global python python3 +%endif %global __python %__python3 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} BuildRequires: %{python} @@ -139,7 +141,11 @@ BuildRequires: pcre-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # XSCREENSAVER support # RHEL 8: available in EPEL @@ -159,7 +165,11 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # CONSOLEHELPER (usermode) support %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} @@ -169,9 +179,8 @@ BuildRequires: openssl-devel %define dont_relink 1 %endif -%if "%{?tde_version}" == "14.1.0" +%define build_superkaramba 1 %define build_tdefilereplace 1 -%endif Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release} @@ -191,7 +200,9 @@ Requires: trinity-kregexpeditor = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-ksim = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-ktimer = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdewalletmanager = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?build_superkaramba} Requires: trinity-superkaramba = %{?epoch:%{epoch}:}%{version}-%{release} +%endif %if 0%{?build_tdefilereplace} Requires: trinity-tdefilereplace = %{?epoch:%{epoch}:}%{version}-%{release} %endif @@ -756,6 +767,8 @@ keeps a master password to all wallets. ########## +%if 0%{?build_superkaramba} + %package -n trinity-superkaramba Summary: A program based on karamba improving the eyecandy of TDE Group: Applications/Utilities @@ -785,6 +798,8 @@ Here are just some examples of the things that can be done: %{tde_tdedocdir}/HTML/en/superkaramba/ %{tde_mandir}/man1/superkaramba.1* +%endif + ########## %if 0%{?build_tdefilereplace} @@ -870,7 +885,7 @@ This package contains the development files for tdeutils. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 5 +%if 0%{?rhel} == 5 && 0%{?build_superkaramba} # Reverts some older Python stuff %__sed -i "superkaramba/src/"*".cpp" \ -e "s|PyBytes_CheckExact|PyString_CheckExact|g" \ @@ -890,7 +905,7 @@ 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 +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -914,6 +929,11 @@ fi -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ \ +%if 0%{?fedora} == 39 + -DPYTHON_LIBRARY="%{_libdir}/libpython3.11.so.1.0" \ + -DPYTHON_INCLUDE_DIR="%{_includedir}/python3.11" \ +%endif + \ -DWITH_DPMS=ON \ %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \ -DWITH_ASUS=ON \ @@ -928,6 +948,8 @@ fi -DWITH_TDENEWSTUFF=ON \ -DBUILD_ALL=ON \ %{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \ + %{?!build_superkaramba:-DBUILD_SUPERKARAMBA=OFF} \ + %{?!build_tdefilereplace:-DBUILD_TDEFILEREPLACE=OFF} \ .. %__make %{?_smp_mflags} || %__make @@ -971,14 +993,18 @@ export PATH="%{tde_bindir}:${PATH}" # Fix desktop shortcut location if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then %__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%if 0%{?build_superkaramba} %__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop" +%endif %__rm -rf "%{?buildroot}%{tde_datadir}/applnk" fi # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file KEdit Utility TextEditor +%if 0%{?build_superkaramba} %suse_update_desktop_file superkaramba Utility DesktopUtility +%endif %suse_update_desktop_file KCharSelect Utility Accessibility %suse_update_desktop_file khexedit Utility Editor %suse_update_desktop_file Kjots Utility TimeUtility diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec index 5730a8207..3f718693b 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.2 %endif %define tde_pkg tdevelop %define tde_prefix /opt/trinity @@ -137,8 +137,12 @@ BuildRequires: neon-devel # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: lib64ldap-devel +%else BuildRequires: openldap-devel %endif +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif @@ -148,11 +152,20 @@ BuildRequires: openldap24-libs-devel # LIBACL support %if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +# ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel %endif +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # PYTHON support %global python python3 @@ -317,8 +330,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 +448,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 @@ -520,7 +530,6 @@ individual needs. %{tde_libdir}/libkinterfacedesigner.so.0.0.0 %{tde_tdelibdir}/libkdevvisualboyadvance.la %{tde_tdelibdir}/libkdevvisualboyadvance.so -%{tde_datadir}/apps/kdevdesignerpart/pics/ %{tde_datadir}/apps/kdevvisualboyadvance/ %{tde_tdedocdir}/HTML/en/tde_app_devel/ %{tde_datadir}/mimelnk/text/x-fortran.desktop @@ -625,7 +634,7 @@ if [ -d "/usr/include/openldap24" ]; then fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec index 58bc4c371..d0ce64cce 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.2 %endif %define tde_pkg tdewebdev %define tde_prefix /opt/trinity @@ -82,7 +82,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif %if 0%{?rhel} == 4 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241) @@ -99,14 +104,16 @@ BuildRequires: libxml2-devel #endif # ICU support +%if 0%{?mdkver} +BuildRequires: %{_lib}icu-devel +%else BuildRequires: libicu-devel +%endif # 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} @@ -460,7 +467,7 @@ Requires: trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release} unset QTDIR QTLIB QTINC export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec index 11b6ee27a..958b3eed4 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.2 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -73,7 +73,7 @@ BuildRequires: trinity-filesystem >= %{tde_version} # FLAC support %define _with_flac --with-flac %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libflac-devel +BuildRequires: %{_lib}flac-devel %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: flac-devel @@ -83,7 +83,7 @@ BuildRequires: flac-devel %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define _with_jack --with-jack %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libjack-devel +BuildRequires: %{_lib}jack-devel %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: jack-audio-connection-kit-devel @@ -93,14 +93,18 @@ BuildRequires: jack-audio-connection-kit-devel # SAMPLERATE support %if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define _with_libsamplerate --with-libsamplerate +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}samplerate-devel +%else BuildRequires: libsamplerate-devel %endif +%endif # PULSEAUDIO support %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define _with_pulseaudio --with-pulseaudio %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libpulseaudio-devel +BuildRequires: %{_lib}pulseaudio-devel %endif %if 0%{?rhel} || 0%{?fedora} BuildRequires: pulseaudio-libs-devel @@ -114,18 +118,33 @@ BuildRequires: pulseaudio-devel %ifarch %{ix86} x86_64 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define _with_libmad --with-libmad +%if 0%{?mdkver} +BuildRequires: %{_lib}mad-devel +%else BuildRequires: libmad-devel %endif %endif +%endif # ALSA support %if 0%{?suse_version} BuildRequires: alsa-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else BuildRequires: alsa-lib-devel %endif +%endif + +# VORBIS support +%if 0%{?mdkver} || 0%{?mgaversion} +%define libvorbis_devel %{_lib}vorbis-devel +%else +%define libvorbis_devel libvorbis-devel +%endif +BuildRequires: %{libvorbis_devel} -BuildRequires: libvorbis-devel BuildRequires: speex-devel @@ -314,7 +333,7 @@ This package contains the mad decoder for Akode. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index 5e7809a97..5b1ecb63a 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.2 %endif %define tde_pkg arts %define tde_prefix /opt/trinity @@ -72,13 +72,27 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: audiofile-devel -BuildRequires: alsa-lib-devel BuildRequires: glib2-devel BuildRequires: gsl-devel -BuildRequires: libvorbis-devel + +# VORBIS support +%if 0%{?mdkver} || 0%{?mgaversion} +%define libvorbis_devel %{_lib}vorbis-devel +%else +%define libvorbis_devel libvorbis-devel +%endif +BuildRequires: %{libvorbis_devel} + +# ALSA support +%if 0%{?mdkver} +%define alsa_devel %{_lib}asound-devel +%else +%define alsa_devel alsa-lib-devel +%endif +BuildRequires: %{alsa_devel} # ESOUND support -%define with_esound 1 +#define with_esound 1 %if 0%{?with_esound} BuildRequires: esound-devel %endif @@ -117,6 +131,9 @@ BuildRequires: libtool %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} || 0%{?mdkversion} || 0%{?mgaversion} %define mad_devel libmad-devel %endif +%if 0%{?mdkver} +%define mad_devel %{_lib}mad-devel +%endif BuildRequires: %{mad_devel} %endif %endif @@ -177,10 +194,10 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: arts-devel < %{?epoch:%{epoch}:}%{version}-%{release} %endif -Requires: alsa-lib-devel +Requires: %{alsa_devel} Requires: audiofile-devel -Requires: libvorbis-devel -%{?with_esound:Requires: esound-devel} +%{?libvorbis_devel:Requires: %{libvorbis_devel}} +%{?with_esound:Requires: esound-devel} %{?with_libmad:Requires: %{mad_devel}} %{?with_jack:Requires: %{jack_devel}} @@ -244,7 +261,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -271,8 +288,8 @@ fi -DWITH_AUDIOFILE=ON \ -DWITH_VORBIS=ON \ %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \ - %{?with_esound:-DWITH_ESOUND=ON} \ - %{?with_jack:-DWITH_JACK=ON} \ + %{?with_esound:-DWITH_ESOUND=ON} %{!?with_esound:-DWITH_ESOUND=OFF} \ + %{?with_jack:-DWITH_JACK=ON} %{!?with_jack:-DWITH_JACK=OFF} \ .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 3937f6ff3..94e0955f1 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.2 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -68,7 +68,7 @@ BuildRequires: gettext-devel BuildRequires: xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxi-devel +BuildRequires: %{_lib}xi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libXi-devel @@ -86,11 +86,15 @@ BuildRequires: dbus-devel %endif # PCAP support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}cap-devel +%else BuildRequires: libcap-devel +%endif # AVAHI support %if 0%{?mgaversion} || 0%{?mdkversion} -%define avahi_devel libavahi-client-devel +%define avahi_devel %{_lib}avahi-client-devel %endif %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} %define avahi_devel avahi-devel @@ -101,9 +105,12 @@ BuildRequires: libcap-devel %if 0%{?rhel} || 0%{?fedora} BuildRequires: expat-devel %endif -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?suse_version} BuildRequires: libexpat-devel %endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}expat-devel +%endif # NAS support %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} @@ -210,7 +217,7 @@ into a TQt main loop application. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -222,6 +229,8 @@ fi -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ + \ + -DLIB_INSTALL_DIR="%{_libdir}" \ .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec index 5c2aef17e..0d9c7b389 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.2 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -158,7 +158,7 @@ See the dbus description for more information about D-BUS in general. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -173,7 +173,6 @@ fi \ -DBIN_INSTALL_DIR=%{_bindir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ - -DLIB_INSTALL_DIR=%{_libdir} \ .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec index 2fd896c2f..758b7cf8c 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.2 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -159,7 +159,7 @@ See the dbus description for more information about D-BUS in general. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index 039697747..63c6772d4 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.2 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -184,7 +184,7 @@ especially suitable for embedded applications. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -199,6 +199,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DLIB_INSTALL_DIR="%{_libdir}" \ -DSHARE_INSTALL_PREFIX="%{_datadir}" \ \ -DWITH_ALL_OPTIONS=ON \ @@ -222,5 +223,4 @@ fi %__rm -rf $RPM_BUILD_ROOT - %changelog 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..0fe560871 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.2 %endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity @@ -60,16 +60,24 @@ BuildRequires: libtool BuildRequires: fdupes # GTK2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}gtk+2.0-devel +%else %if 0%{?rhel} == 4 BuildRequires: evolution28-gtk2-devel %else BuildRequires: glib2-devel BuildRequires: gtk2-devel %endif +%endif # CURL support %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libcurl_devel %{_lib}curl-devel >= 7.15.5 +%else %define libcurl_devel libcurl-devel >= 7.15.5 +%endif %else %define libcurl_devel curl-devel >= 7.15.5 %endif @@ -156,7 +164,7 @@ This package includes the development files. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -171,6 +179,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DLIB_INSTALL_DIR="%{_libdir}" \ -DSHARE_INSTALL_PREFIX="%{_datadir}" \ \ -DWITH_ALL_OPTIONS=ON \ diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index a06752bc1..cf992da1e 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.2 %endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity @@ -61,7 +61,11 @@ BuildRequires: libtool # CURL support %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libcurl_devel %{_lib}curl-devel >= 7.15.5 +%else %define libcurl_devel libcurl-devel >= 7.15.5 +%endif %else # Specific CURL version for TDE on RHEL 5 (and older) %define libcurl_devel curl-devel >= 7.15.5 @@ -69,12 +73,16 @@ BuildRequires: libtool %{?libcurl_devel:BuildRequires: %{libcurl_devel}} # GTK2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}gtk+2.0-devel +%else %if 0%{?rhel} == 4 BuildRequires: evolution28-gtk2-devel %else BuildRequires: glib2-devel BuildRequires: gtk2-devel %endif +%endif %description Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. @@ -158,7 +166,7 @@ This package contains the development files. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -173,6 +181,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DLIB_INSTALL_DIR="%{_libdir}" \ -DSHARE_INSTALL_PREFIX="%{_datadir}" \ \ -DWITH_ALL_OPTIONS=ON \ diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index aa965f98c..cb3214d20 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.2 %endif %define tde_pkg polkit-tqt @@ -52,14 +52,17 @@ Source1: %{name}-rpmlintrc BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: trinity-dbus-1-tqt-devel -BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: libtqt4-devel BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: gettext +%if 0%{?mdkver} +BuildRequires: %{_lib}polkit1-devel +%else BuildRequires: polkit-devel +%endif %description PolicyKit is an application-level toolkit for defining and handling the policy @@ -195,7 +198,7 @@ This package contains example files and applications. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec index d7285cd3c..ade0f5694 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.2 %endif %define tde_pkg pytqt %define tde_prefix /opt/trinity @@ -73,7 +73,9 @@ BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1 BuildRequires: gcc-c++ # PYTHON support +%if "%{python}" == "" %global python python3 +%endif %global __python %__python3 %global python_sitearch %{python3_sitearch} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -86,8 +88,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -101,7 +107,7 @@ BuildRequires: xorg-x11-libXmu-devel BuildRequires: libXmu-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} >= 4 -BuildRequires: libxmu-devel +BuildRequires: %{_lib}xmu-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel @@ -140,7 +146,7 @@ same way in both languages (with syntax differences, of course) %defattr(-,root,root,-) %doc NEWS README %dir %{python_sitearch}/PyTQt -%if 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/PyTQt/__init__.py* %if 0%{?rhel} == 7 %{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc @@ -230,7 +236,7 @@ packages based on them, like PyTDE. %files -n pytqt-devel %defattr(-,root,root,-) -%if 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/PyTQt/pytqtconfig.py* %if 0%{?rhel} == 7 %{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index 0c60df09d..f4ce700ae 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.2 %endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity @@ -77,7 +77,9 @@ BuildRequires: bison BuildRequires: flex # PYTHON support +%if "%{python}" == "" %global python python3 +%endif %global __python %__python3 %global python_sitearch %{python3_sitearch} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -111,7 +113,7 @@ specificity towards C++ and Python. %files -n sip4-tqt %defattr(-,root,root,-) %{python_sitearch}/sip_tqt.so -%if 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/sip_tqt_config.py* %{python_sitearch}/sip_tqt_distutils.py* %if 0%{?rhel} == 7 diff --git a/redhat/dependencies/tde-cmake/tde-cmake.spec b/redhat/dependencies/tde-cmake/tde-cmake.spec index 71b89c4fb..4901e544e 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.2 %endif %define tde_pkg tde-cmake @@ -73,7 +73,7 @@ intltool-merge used to merge translations into desktop files. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 567649b9a..bc76e9208 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.2 %endif %define tde_pkg tqca-tls %define tde_prefix /opt/trinity @@ -59,7 +59,13 @@ BuildRequires: libtqca-devel >= %{tde_epoch}:1.0 BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ -BuildRequires: openssl-devel >= 0.9.8 + +# OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else +BuildRequires: openssl-devel +%endif %description @@ -101,7 +107,7 @@ contains the TLS plugin. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec index 258b6a3c5..367e18958 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.2 %endif %define tde_pkg tqca %define tde_prefix /opt/trinity @@ -67,7 +67,12 @@ Provides: %{libtqt3}-mt-tqca-tls = %{version}-%{release} BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ + +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel >= 0.9.8 +%endif %description Taking a hint from the similarly-named Java Cryptography Architecture, @@ -160,7 +165,7 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec index b926e184e..155b56e18 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.2 %endif %define tde_pkg tqscintilla @@ -184,7 +184,7 @@ This package contains the documentation for tqscintilla. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -197,6 +197,8 @@ fi -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=ON \ \ + -DLIB_INSTALL_DIR="%{_libdir}" \ + \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" \ .. diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index 4d79d2247..aff20e142 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.2 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -64,13 +64,28 @@ BuildRequires: tar BuildRequires: zlib-devel # JPEG support -BuildRequires: libjpeg-devel +%if 0%{?mdkver} || 0%{?mgaversion} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +%{?libjpeg:BuildRequires: %{libjpeg}-devel} # MNG support -BuildRequires: libmng-devel +%if 0%{?mdkver} || 0%{?mgaversion} +%define libmng %{_lib}mng +%else +%define libmng libmng +%endif +%{?libmng:BuildRequires: %{libmng}-devel} # PNG support -BuildRequires: libpng-devel +%if 0%{?mdkver} || 0%{?mgaversion} +%define libpng %{_lib}png +%else +%define libpng libpng +%endif +%{?libpng:BuildRequires: %{libpng}-devel} # GIF support BuildRequires: giflib-devel @@ -97,9 +112,12 @@ BuildRequires: cups-devel %{?glib2_devel:BuildRequires: %{glib2_devel}} # UUID support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 %define uuid_devel libuuid-devel %endif +%if 0%{?mgaversion} || 0%{?mdkversion} +%define uuid_devel %{_lib}uuid-devel +%endif %if 0%{?rhel} == 5 %define uuid_devel e2fsprogs-devel %endif @@ -108,8 +126,12 @@ BuildRequires: cups-devel # LIBAUDIO support %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_nas 1 +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libaudio_devel %{_lib}audio-devel nas-devel +%else %define libaudio_devel nas-devel %endif +%endif %{?libaudio_devel:BuildRequires: %{libaudio_devel}} # Xrender support @@ -117,7 +139,7 @@ BuildRequires: cups-devel %define xrender_devel libXrender-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define xrender_devel libxrender-devel +%define xrender_devel %{_lib}xrender-devel %endif %{?xrender_devel:BuildRequires: %{xrender_devel}} @@ -126,11 +148,10 @@ BuildRequires: cups-devel %define xrandr_devel libXrandr-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%define xrandr_devel %{_lib}xrandr-devel +%endif %if 0%{?pclinuxos} %define xrandr_devel %{_lib}xrandr2-devel -%else -%define xrandr_devel libxrandr-devel -%endif %endif %{?xrandr_devel:BuildRequires: %{xrandr_devel}} @@ -139,7 +160,7 @@ BuildRequires: cups-devel %define xcursor_devel libXcursor-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define xcursor_devel libxcursor-devel +%define xcursor_devel %{_lib}xcursor-devel %endif %{?xcursor_devel:BuildRequires: %{xcursor_devel}} @@ -148,7 +169,7 @@ BuildRequires: cups-devel %define xinerama_devel libXinerama-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define xinerama_devel libxinerama-devel +%define xinerama_devel %{_lib}xinerama-devel %endif %{?xinerama_devel:BuildRequires: %{xinerama_devel}} @@ -157,7 +178,7 @@ BuildRequires: cups-devel %define xft_devel libXft-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define xft_devel libxft-devel +%define xft_devel %{_lib}xft-devel %endif %{?xft_devel:BuildRequires: %{xft_devel}} @@ -166,7 +187,7 @@ BuildRequires: cups-devel %define xext_devel libXext-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define xext_devel libxext-devel +%define xext_devel %{_lib}xext-devel %endif %{?xext_devel:BuildRequires: %{xext_devel}} @@ -175,7 +196,7 @@ BuildRequires: cups-devel %define x11_devel libX11-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define x11_devel libx11-devel +%define x11_devel %{_lib}x11-devel %endif %{?x11_devel:BuildRequires: %{x11_devel}} @@ -184,7 +205,7 @@ BuildRequires: cups-devel %define sm_devel libSM-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define sm_devel libsm-devel +%define sm_devel %{_lib}sm-devel %endif %{?sm_devel:BuildRequires: %{sm_devel}} @@ -193,7 +214,7 @@ BuildRequires: cups-devel %define ice_devel libICE-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define ice_devel libice-devel +%define ice_devel %{_lib}ice-devel %endif %{?ice_devel:BuildRequires: %{ice_devel}} @@ -210,7 +231,7 @@ BuildRequires: xorg-x11-libXmu-devel BuildRequires: libXmu-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} >= 4 -BuildRequires: libxmu-devel +BuildRequires: %{_lib}xmu-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel @@ -221,7 +242,7 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel %define xi_devel xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -%define xi_devel libxi-devel +%define xi_devel %{_lib}xi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} %define xi_devel libXi-devel @@ -245,9 +266,13 @@ BuildRequires: mesa-libGLU-devel %if 0%{?pclinuxos} BuildRequires: MesaGLU-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -259,12 +284,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 @@ -282,7 +306,7 @@ BuildRequires: firebird-devel %endif # FBCLIENT support -%if 0%{?mgaversion} >= 6 +%if 0%{?mdkver} || 0%{?mgaversion} >= 6 BuildRequires: %{_lib}fbclient-devel %endif @@ -298,6 +322,10 @@ BuildRequires: libtirpc-devel BuildRequires: libnsl-devel BuildRequires: libtirpc-devel %endif +%if 0%{?mdkver} || 0%{?mgaversion} +BuildRequires: %{_lib}nsl-devel +BuildRequires: %{_lib}tirpc-devel +%endif # x86_64 specific stuff %if "%{_lib}" != "lib" @@ -325,7 +353,6 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: coreutils Requires: fontconfig >= 2.0 -Requires: /etc/ld.so.conf.d %description -n %{libtqt3}-mt This is the Trolltech TQt library, version 3. It's necessary for @@ -376,8 +403,8 @@ Requires: %{libtqt3}-mt = %{version}-%{release} Requires: glibc-devel Requires: fontconfig-devel Requires: freetype-devel -Requires: libjpeg-devel -Requires: libpng-devel +Requires: %{libjpeg}-devel +Requires: %{libpng}-devel Requires: zlib-devel %{?glib2_devel:Requires: %{glib2_devel}} @@ -733,8 +760,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 @@ -912,8 +937,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 ########### @@ -1005,6 +1028,7 @@ or automake. Summary: TQt3 Developer applications development files Group: Development/Libraries/X11 Requires: %{libtqt3}-mt-devel = %{version}-%{release} +Requires: tqt3-apps-libs = %{version}-%{release} %description -n tqt3-apps-devel This package is intended for developers who want to develop applications @@ -1025,20 +1049,45 @@ developer includes with his application. %defattr(-,root,root,-) %{_libdir}/libtqtdesignercore.prl %{_libdir}/libtqtdesignercore.so +%{_libdir}/libtqteditor.prl +%{_libdir}/libtqteditor.so +%{_libdir}/libtqassistantclient.prl +%{_libdir}/libtqassistantclient.so +%{_includedir}/tqt3/ntqassistantclient.h + +########### + +%package -n tqt3-apps-libs +Summary: TQt3 Developer applications libraries +Group: Development/Libraries/X11 +Requires: %{libtqt3}-mt = %{version}-%{release} + +%description -n tqt3-apps-libs +This package is intended for developers who want to develop applications +using the additional static libraries that ship with the applications +included with TQt; the TQt Designer and the TQt Assistant. +It allows integrating additional enhancements into the TQt Designer +respectively faciliate the TQt Assistant from within your TQt application +to interactively call the Assistant for displaying online help that the +developer includes with his application. + +%post -n tqt3-apps-libs +/sbin/ldconfig || : + +%postun -n tqt3-apps-libs +/sbin/ldconfig || : + +%files -n tqt3-apps-libs +%defattr(-,root,root,-) %{_libdir}/libtqtdesignercore.so.1 %{_libdir}/libtqtdesignercore.so.1.0 %{_libdir}/libtqtdesignercore.so.1.0.0 -%{_libdir}/libtqteditor.prl -%{_libdir}/libtqteditor.so %{_libdir}/libtqteditor.so.1 %{_libdir}/libtqteditor.so.1.0 %{_libdir}/libtqteditor.so.1.0.0 -%{_libdir}/libtqassistantclient.prl -%{_libdir}/libtqassistantclient.so %{_libdir}/libtqassistantclient.so.1 %{_libdir}/libtqassistantclient.so.1.0 %{_libdir}/libtqassistantclient.so.1.0.0 -%{_includedir}/tqt3/ntqassistantclient.h ########## @@ -1200,6 +1249,7 @@ for full internationalization support of the application towards the end user. %{_datadir}/tqt3/translations/qt_pt-br.qm %{_datadir}/tqt3/translations/qt_ru.qm %{_datadir}/tqt3/translations/qt_sk.qm +%{_datadir}/tqt3/translations/qt_tr.qm %{_datadir}/tqt3/translations/qt_zh-cn.qm %{_datadir}/tqt3/translations/qt_zh-tw.qm @@ -1270,7 +1320,7 @@ echo "sle_version = %{?sle_version}" -e "s|^QMAKE_INCDIR_TQT.*|QMAKE_INCDIR_TQT = %{_includedir}/tqt3|" \ -e "s|\$(QTDIR)|/usr|g" \ -e "s|-lqt|-ltqt|g" \ - -e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = %{?optflags} -pipe -fvisibility=hidden -fvisibility-inlines-hidden|" \ + -e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = ${distrib_cflags} -pipe -fvisibility=hidden -fvisibility-inlines-hidden|" \ -e "s|^QMAKE_INCDIR =.*|QMAKE_INCDIR = %{_includedir}|" \ -e "s|^QMAKE_LIBDIR =.*|QMAKE_LIBDIR = %{_libdir}|" \ -e "s|^QMAKE_RPATH = .*|QMAKE_RPATH =|" \ @@ -1462,12 +1512,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..f36c916fb 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.2 %endif %define tde_pkg tqtinterface @@ -62,18 +62,20 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # UUID support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 %define uuid_devel libuuid-devel %endif +%if 0%{?mgaversion} || 0%{?mdkversion} +%define uuid_devel %{_lib}uuid-devel +%endif %if 0%{?rhel} == 5 %define uuid_devel e2fsprogs-devel %endif %{?uuid_devel:BuildRequires: %{uuid_devel}} - # PTHREAD support %if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mgaversion} >= 7 +%if 0%{?mgaversion} >= 7 || 0%{?mdkver} BuildRequires: %{_lib}npth-devel %else BuildRequires: pth-devel @@ -95,8 +97,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -107,7 +113,7 @@ BuildRequires: Mesa-libGLU-devel BuildRequires: xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxi-devel +BuildRequires: %{_lib}xi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libXi-devel @@ -191,7 +197,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 @@ -214,7 +219,7 @@ although some code has been added for useful functions that are no longer part o %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index cbc2a003f..a53ffd06a 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.2" [ -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..135526498 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.2 ARG ARCH=i686 # Add local repositories diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index 806685e8a..1f123925e 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.2 ARG ARCH=x86_64 # Add local repositories diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 2ed6aa216..6858c0d9b 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.2 ARG ARCH=i686 # Enable proxy diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index e59ee8957..7be807e46 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.2 ARG ARCH=x86_64 # Enable proxy diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index a856eb671..1366cfb18 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.2 ARG ARCH=x86_64 # Enable proxy @@ -22,9 +22,11 @@ RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE # Fix utempter detection # Distro-specific patches +# Fix python3.6 detection (tdebindings; kvirc) RUN chmod a+r /usr/libexec/utempter/utempter \ && sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" \ - && ln -sf libmp4v2.so /usr/lib64/libmp4.so + && ln -sfv libmp4v2.so /usr/lib64/libmp4.so \ + && ln -sfv python3.6m /usr/include/python3.6 # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity \ @@ -38,11 +40,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/el7/packages b/redhat/docker/el7/packages index 78dd12598..a39c59cdd 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -218,6 +218,7 @@ usbutils valgrind wireless-tools-devel xine-lib-devel +xkeyboard-config-devel xmlto xorg-x11-font-utils xscreensaver diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros index e0a64de43..f47c6c067 100644 --- a/redhat/docker/el7/rpmmacros +++ b/redhat/docker/el7/rpmmacros @@ -2,3 +2,5 @@ %_smp_mflags -j8 %jobs 8 %cmake %cmake3 +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 78f152ba6..4cd5365ad 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.2 ARG ARCH=x86_64 # Enable custom repository @@ -30,7 +30,10 @@ COPY rpmbuild.repo rpmbuild.repo RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" # Fix utempter detection -RUN chmod a+r /usr/libexec/utempter/utempter +# Fix python3.6 detection (tdebindings; kvirc) +RUN chmod a+r /usr/libexec/utempter/utempter \ + && ln -sfv python3.6m /usr/include/python3.6 \ + && ln -sfv python3 /usr/bin/python # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity \ @@ -41,19 +44,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/el8/packages b/redhat/docker/el8/packages index 06283e94e..cea7e8a72 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -26,6 +26,8 @@ createrepo_c cryptsetup-devel cups-devel dbus-glib-devel +djvulibre +djvulibre-devel docbook2X doxygen emacs @@ -187,8 +189,6 @@ ppp psutils pulseaudio-libs-devel pylibacl -python2 -python2-devel python3 python3-devel python3-pyxattr @@ -224,6 +224,7 @@ valgrind wget wireless-tools-devel xine-lib-devel +xkeyboard-config-devel xmlto xorg-x11-font-utils xscreensaver diff --git a/redhat/docker/el8/rpmmacros b/redhat/docker/el8/rpmmacros index dc2cb7e68..d2d495cbe 100644 --- a/redhat/docker/el8/rpmmacros +++ b/redhat/docker/el8/rpmmacros @@ -3,3 +3,5 @@ %jobs 8 %_debugsource_packages %nil %_debugsource_template %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 index 32039dce0..5fb5a4c01 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.2 ARG ARCH=x86_64 # Enable proxy @@ -38,63 +38,64 @@ 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 \ +RUN wget -nv -P ${HOME}/rpmbuild/RPMS/x86_64 \ http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \ - http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm + 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/el9/packages b/redhat/docker/el9/packages index da83cd4e3..3d3239b3a 100644 --- a/redhat/docker/el9/packages +++ b/redhat/docker/el9/packages @@ -27,6 +27,8 @@ createrepo_c cryptsetup-devel cups-devel dbus-glib-devel +djvulibre +djvulibre-devel docbook2X doxygen emacs @@ -215,6 +217,7 @@ usbutils valgrind wget xine-lib-devel +xkeyboard-config-devel xmlto xorg-x11-server-utils xorg-x11-util-macros diff --git a/redhat/docker/el9/rpmmacros b/redhat/docker/el9/rpmmacros index a6c71dccc..67367b01a 100644 --- a/redhat/docker/el9/rpmmacros +++ b/redhat/docker/el9/rpmmacros @@ -4,3 +4,5 @@ %__cmake_in_source_build 1 %_debugsource_packages %nil %_debugsource_template %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64 index 2336d4548..a08b86185 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.2 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 index 7ed2344f1..86cae885c 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.2 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64 index adf0c84b3..bc24ab119 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.2 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686 index d9ed83adb..a81c034e9 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.2 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64 index 85e843edd..ed4953b28 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.2 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 index d904832ad..96adf7fac 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.2 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..913b73a18 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.2 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..8a59d571e 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.2 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..f4a295247 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.2 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..fd70b9f98 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.2 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..a8610575f 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.2 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..894f8794f 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.2 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..d48a0be88 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.2 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..67ea30ecb 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.2 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..776f750eb 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.2 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..947dcee69 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.2 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 a17525d51..ceda97e9e 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.2 ARG ARCH=x86_64 # Fix DNF database corruption @@ -35,6 +35,6 @@ RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34 && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-* -RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.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* diff --git a/redhat/docker/f36/packages b/redhat/docker/f36/packages index 71b1f0d27..e9fa47a55 100644 --- a/redhat/docker/f36/packages +++ b/redhat/docker/f36/packages @@ -69,6 +69,7 @@ gtk+-devel gtk-doc guile-devel harfbuzz-devel +heimdal-devel hspell-devel htdig html2ps @@ -192,7 +193,6 @@ pkgconfig(pygtk-2.0) polkit-devel poppler-devel postgresql -postgresql-devel postgresql-private-devel postgresql-server-devel ppp diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64 index 0390ea2f7..fc288134d 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.2 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 cca3f9bb1..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 @@ -194,7 +195,6 @@ pkgconfig(pygtk-2.0) polkit-devel poppler-devel postgresql -postgresql-devel postgresql-private-devel postgresql-server-devel ppp diff --git a/redhat/docker/f38/Dockerfile.x86_64 b/redhat/docker/f38/Dockerfile.x86_64 new file mode 100644 index 000000000..b01609519 --- /dev/null +++ b/redhat/docker/f38/Dockerfile.x86_64 @@ -0,0 +1,41 @@ +FROM fedora:38 + +ARG TDE_VERSION=14.1.2 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ + && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \ + && sed -i /etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|38|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-38.noarch.rpm \ + && dnf -y --enableplugin=ovl update \ + && dnf -y --enableplugin=ovl install --skip-broken $(</packages) + +# Add YUM repository for locally built packages +COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2* diff --git a/redhat/docker/f38/packages b/redhat/docker/f38/packages new file mode 100644 index 000000000..828222df7 --- /dev/null +++ b/redhat/docker/f38/packages @@ -0,0 +1,241 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +boost-python3-devel +byacc +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +dnf-plugin-ovl +docbook2X +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +geoip-devel +gettext-devel +giflib-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +harfbuzz-devel +heimdal-devel +hspell-devel +htdig +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +less +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdb-devel +libdvdread-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libifp-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz5-devel +libnjb-devel +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libusb-compat-0.1-devel +libusb1-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvncserver-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mesa-libGL-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +ocaml-facile-devel +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +ortp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(PAR::Packer) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +pkgconfig(pygtk-2.0) +polkit-devel +poppler-devel +postgresql +postgresql-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python +python3-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texlive-newunicodechar +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f38/rpmbuild.repo b/redhat/docker/f38/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f38/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f38/rpmmacros b/redhat/docker/f38/rpmmacros new file mode 100644 index 000000000..4d5b149f6 --- /dev/null +++ b/redhat/docker/f38/rpmmacros @@ -0,0 +1,10 @@ +%dist .fc38 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%_fortify_level 2 +%source_date_epoch_from_changelog 0 diff --git a/redhat/docker/f39/Dockerfile.x86_64 b/redhat/docker/f39/Dockerfile.x86_64 new file mode 100644 index 000000000..51776f01f --- /dev/null +++ b/redhat/docker/f39/Dockerfile.x86_64 @@ -0,0 +1,41 @@ +FROM fedora:39 + +ARG TDE_VERSION=14.1.2 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ + && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \ + && sed -i /etc/yum.repos.d/fedora{,-updates}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|39|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-39.noarch.rpm \ + && dnf -y --enableplugin=ovl update \ + && dnf -y --enableplugin=ovl install --skip-broken $(</packages) + +# Add YUM repository for locally built packages +COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2* diff --git a/redhat/docker/f39/packages b/redhat/docker/f39/packages new file mode 100644 index 000000000..4a76d8eeb --- /dev/null +++ b/redhat/docker/f39/packages @@ -0,0 +1,242 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +boost-python3-devel +byacc +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +dnf-plugin-ovl +docbook2X +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +geoip-devel +gettext-devel +giflib-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +harfbuzz-devel +heimdal-devel +hspell-devel +htdig +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +less +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdb-devel +libdvdread-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libifp-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz5-devel +libnjb-devel +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libusb-compat-0.1-devel +libusb1-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvncserver-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mesa-libGL-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +ocaml-facile-devel +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +ortp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(PAR::Packer) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +pkgconfig(pygtk-2.0) +polkit-devel +poppler-devel +postgresql +postgresql-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python3.11 +python3.11-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texlive-newunicodechar +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +xbase-devel +xine-lib-devel +xkeyboard-config-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f39/rpmbuild.repo b/redhat/docker/f39/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f39/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f39/rpmmacros b/redhat/docker/f39/rpmmacros new file mode 100644 index 000000000..e199a1097 --- /dev/null +++ b/redhat/docker/f39/rpmmacros @@ -0,0 +1,11 @@ +%dist .fc39 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%source_date_epoch_from_changelog 0 +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/f40/Dockerfile.x86_64 b/redhat/docker/f40/Dockerfile.x86_64 new file mode 100644 index 000000000..775a503cd --- /dev/null +++ b/redhat/docker/f40/Dockerfile.x86_64 @@ -0,0 +1,41 @@ +FROM fedora:40 + +ARG TDE_VERSION=14.1.2 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ + && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \ + && sed -i /etc/yum.repos.d/fedora{,-updates}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|40|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm \ + && dnf -y --enableplugin=ovl update \ + && dnf -y --enableplugin=ovl install --skip-broken $(</packages) + +# Add YUM repository for locally built packages +COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2* diff --git a/redhat/docker/f40/packages b/redhat/docker/f40/packages new file mode 100644 index 000000000..7f1d9cc47 --- /dev/null +++ b/redhat/docker/f40/packages @@ -0,0 +1,242 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +boost-python3-devel +byacc +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +dnf-plugin-ovl +docbook2X +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +geoip-devel +gettext-devel +giflib-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +harfbuzz-devel +heimdal-devel +hspell-devel +htdig +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +less +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdb-devel +libdvdread-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libifp-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz5-devel +libnjb-devel +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libusb-compat-0.1-devel +libusb1-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvncserver-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mesa-libGL-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +ocaml-facile-devel +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +ortp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(PAR::Packer) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +pkgconfig(pygtk-2.0) +polkit-devel +poppler-devel +postgresql +postgresql-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python3 +python3-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texlive-newunicodechar +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +xbase-devel +xine-lib-devel +xkeyboard-config-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f40/rpmbuild.repo b/redhat/docker/f40/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f40/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f40/rpmmacros b/redhat/docker/f40/rpmmacros new file mode 100644 index 000000000..32f75b192 --- /dev/null +++ b/redhat/docker/f40/rpmmacros @@ -0,0 +1,10 @@ +%dist .fc40 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%source_date_epoch_from_changelog 0 +%python python3 diff --git a/redhat/docker/mageia.sh b/redhat/docker/mageia.sh new file mode 100755 index 000000000..e0a84588a --- /dev/null +++ b/redhat/docker/mageia.sh @@ -0,0 +1,34 @@ +#!/bin/bash -e + +NAME="mageia" +VERSION="${1:-9}" # E.g: '9' +IMAGE="${NAME}:${VERSION}" +INSTALLROOT="/dev/shm/${IMAGE}" +ARCH="x86_64" + +sudo rm -rf "${INSTALLROOT}" +sudo mkdir -p "${INSTALLROOT}" +sudo dnf -y \ + --disablerepo="*" \ + --enablerepo="mageia-${ARCH},updates-${ARCH}" \ + --installroot="${INSTALLROOT}" \ + --releasever="${VERSION}" \ + install \ + \ + bash \ + mageia-release-common \ + urpmi \ + vim + +sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb + +FILE="${IMAGE//\//_}.tar" +sudo tar -C "${INSTALLROOT}" -c . >"${FILE}" +sudo rm -rf "${INSTALLROOT}" + +docker rmi -f "${IMAGE}" +docker import "${FILE}" "${IMAGE}" + +pigz "${FILE}" +mkdir -p "${HOME}/tde/docker" +mv -fv "${FILE}.gz" "${HOME}/tde/docker" diff --git a/redhat/docker/mageia32.sh b/redhat/docker/mageia32.sh index 29afb4b59..01aa1f672 100755 --- a/redhat/docker/mageia32.sh +++ b/redhat/docker/mageia32.sh @@ -3,6 +3,7 @@ NAME="mageia32" VERSION="$1" # E.g: '26' IMAGE="${NAME}:${VERSION}" +TAR="${NAME}-${VERSION}.tar" INSTALLROOT="/dev/shm/${IMAGE}" sudo rm -rf "${INSTALLROOT}" @@ -12,8 +13,8 @@ setarch i686 sudo urpmi \ --auto \ bash vim urpmi mageia-release-common -sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +sudo tar -C "${INSTALLROOT}" -c . >"${TAR}" sudo rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" -docker import "${IMAGE}.tar" "${IMAGE}" +docker import "${TAR}" "${IMAGE}" diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64 index 16f58288b..13b664401 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.2 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..3df92c2bc 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.2 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..22a54729b 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.2 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..0c75795b7 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.2 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..71b5dc862 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.2 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..bcb1d59e4 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.2 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..864b12c2b 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.2 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686 index 46d2810d9..1811d8f52 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.0.13 +ARG TDE_VERSION=14.1.2 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 $(</packages) # Enable ccache -RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" - # Fix utempter detection -RUN chmod a+r /usr/libexec/utempter/utempter - # Fix poppler support -RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|" +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" \ + && chmod a+r /usr/libexec/utempter/utempter \ + && sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|" # Add non-root user to build packages RUN rm -rf /home/trinity \ && useradd -m -s /bin/bash -u 1000 trinity \ - && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/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 9d4ef301e..450334eec 100644 --- a/redhat/docker/mga9/Dockerfile.x86_64 +++ b/redhat/docker/mga9/Dockerfile.x86_64 @@ -1,38 +1,36 @@ FROM mageia:9 -ARG TDE_VERSION=14.0.13 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # 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/x86_64/ \ - && 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/x86_64/ \ + && 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 $(</packages) # Enable ccache -RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" - # Fix utempter detection -RUN chmod a+r /usr/libexec/utempter/utempter - # Fix poppler support -RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|" +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" \ + && chmod a+r /usr/libexec/utempter/utempter \ + && sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|" # Add non-root user to build packages RUN rm -rf /home/trinity \ && useradd -m -s /bin/bash -u 1000 trinity \ - && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/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/packages.i686 b/redhat/docker/mga9/packages.i686 index a39a701af..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 @@ -218,8 +218,7 @@ polkit-devel postgresql13 postgresql13-devel ppp -python-devel -python-sip +python3-devel qt4-devel readline-devel recode @@ -231,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 998e0c682..21c9a7d60 100644 --- a/redhat/docker/mga9/packages.x86_64 +++ b/redhat/docker/mga9/packages.x86_64 @@ -69,7 +69,6 @@ karma-sharp kde-dev-scripts lib64apr-devel lib64apr-util-devel -lib64avformat58 lib64binutils-devel lib64boost_python3-devel lib64cln-devel @@ -96,8 +95,10 @@ lib64jpeg-devel lib64lua-devel lib64mad-devel lib64mp3lame-devel +lib64musicbrainz5-devel lib64npth-devel lib64paper-devel +lib64pcre-devel lib64pkcs11-helper-devel lib64poppler-devel lib64pulseaudio-devel @@ -150,7 +151,6 @@ libmng-devel libmp4v2-devel libmpcdec-devel libmtp-devel -libmusicbrainz-devel libnjb-devel libofx-devel libotr-devel @@ -193,6 +193,7 @@ nas-devel neon-devel netpbm net-snmp-devel +net-tools notification-daemon ocaml ocaml-facile-devel @@ -221,8 +222,7 @@ polkit-devel postgresql13 postgresql13-devel ppp -python-devel -python-sip +python3-devel qt4-devel readline-devel recode @@ -234,7 +234,6 @@ scons SDL-devel speex-devel sqlite3-devel -sqlite-devel sshfs-fuse subversion-devel sudo diff --git a/redhat/docker/mga9/rpmmacros b/redhat/docker/mga9/rpmmacros index 2bc3bb37f..e0f078bca 100644 --- a/redhat/docker/mga9/rpmmacros +++ b/redhat/docker/mga9/rpmmacros @@ -1,6 +1,10 @@ +%dist .mga9 %_smp_mflags -j8 %jobs 8 +%__brp_remove_la_files %nil %_program_prefix "" %_debugsource_packages %nil %_debugsource_template %nil %_vpath_builddir . +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/omv5000/Dockerfile.x86_64 b/redhat/docker/omv5000/Dockerfile.x86_64 new file mode 100644 index 000000000..37b186710 --- /dev/null +++ b/redhat/docker/omv5000/Dockerfile.x86_64 @@ -0,0 +1,65 @@ +FROM openmandriva:5.0 + +ARG TDE_VERSION=14.1.2 +ARG ARCH=x86_64 + +COPY packages /packages +RUN set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && dnf -y update \ + && dnf -y install --skip-broken $(</packages) + +# Fix utempter detection +RUN set -x \ + && chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN set -x \ + && rm -rf /home/trinity \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc \ + && chown -R trinity /home/trinity + +# Configure user trinity +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN set -x \ + && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm + +RUN set -x \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm + +RUN set -x \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-Getopt-ArgvFile-1.110.0-10.mga9.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-Getopt-ArgvFile.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-1.18.0-1.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s/MYMETA.yml//" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm diff --git a/redhat/docker/omv5000/packages b/redhat/docker/omv5000/packages new file mode 100644 index 000000000..47a126218 --- /dev/null +++ b/redhat/docker/omv5000/packages @@ -0,0 +1,256 @@ +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +createrepo_c +ctags +cups-devel +curl-devel +db5-devel +dbus-devel +dbus-glib +dbus-glib-devel +djvulibre +docbook2x +docbook-dtd412-xml +docbook-style-xsl +docbook-utils +doxygen +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +flex-devel +fontconfig-devel +freetype-devel +fribidi-devel +gamin-devel +gettext-devel +ghostscript +glib2-devel +glibc-i18ndata +gmime-devel +gnokii-devel +gperf +gpgme-devel +gsl-devel +gtk+3.0-devel +gtk-doc +hspell-devel +html2ps +iceauth +imake +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel +java-devel +kde-dev-scripts +less +lib64acl-devel +lib64alsa-oss-devel +lib64apr-devel +lib64apr-util-devel +lib64asound-devel +lib64attr-devel +lib64audio-devel +lib64binutils-devel +lib64cap-devel +lib64cdda-devel +lib64cdio-devel +lib64cdio_paranoia-devel +lib64cln-devel +lib64clucene-devel +lib64config-devel +lib64cryptsetup-devel +lib64curl-devel +lib64drm-devel +lib64dvdread-devel +lib64exif-devel +lib64exiv2-devel +lib64expat-devel +lib64ext2fs-devel +lib64fbclient-devel +lib64ffmpeg-devel +lib64flac++-devel +lib64flac-devel +lib64fluidsynth-devel +lib64fontenc-devel +lib64gadu-devel +lib64geoip-devel +lib64gif-devel +lib64glu-devel +lib64gmime2.6-devel +lib64gmp-devel +lib64gnutls-devel +lib64gpg-error-devel +lib64gphoto-devel +lib64gpod-devel +lib64graphicsmagick-devel +lib64gstreamer-devel +lib64gst-plugins-base1.0-devel +lib64gtk+2.0-devel +lib64hiredis-devel +lib64ical-devel +lib64icu-devel +lib64idn-devel +lib64ifp-devel +lib64jack-devel +lib64magick-devel +lib64inotifytools-devel +lib64jasper-devel +lib64jpeg-devel +lib64lame-devel +lib64lcms-devel +lib64ldap-devel +lib64lirc_client-devel +lib64lo-devel +lib64lrdf-devel +lib64ltdl-devel +lib64lua-devel +lib64mad-devel +lib64magic-devel +lib64memcached-devel +lib64mng-devel +lib64mpcdec-devel +lib64mtp-devel +lib64musicbrainz5-devel +lib64nettle-devel +lib64njb-devel +lib64nm-devel +lib64npth-devel +lib64nsl-devel +lib64nspr-devel +lib64ofx-devel +lib64openexr-devel +lib64otr-devel +lib64paper-devel +lib64pcre-devel +lib64pcsclite-devel +lib64pkcs11-helper-devel +lib64polkit1-devel +lib64poppler-devel +lib64pqxx-devel +lib64pth-devel +lib64pulseaudio-devel +lib64qalculate-devel +lib64raptor-devel +lib64raw1394-devel +lib64rsvg2-devel +lib64rsync-devel +lib64samplerate-devel +lib64sane1-devel +lib64sasl-devel +lib64SDL-devel +lib64smbclient-devel +lib64sndfile-devel +lib64t1lib-devel +lib64tasn1-devel +lib64theora-devel +lib64tiff-devel +lib64tirpc-devel +lib64twolame-devel +lib64udev-devel +lib64udisks-devel +lib64usb-compat0.1-devel +lib64usb1.0-devel +lib64utempter0 +lib64utempter-devel +lib64v4l-devel +lib64visual-devel +lib64vorbis-devel +lib64wmf-devel +lib64wpd-devel +lib64xaw-devel +lib64xdg-basedir-devel +lib64xi-devel +lib64xine-devel +lib64xkbfile-devel +lib64xscrnsaver-devel +lib64xslt-devel +lib64xtst-devel +lib64xxf86dga-devel +lib64xxf86vm-devel +lib64wrap-devel +librsvg +lm_sensors-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +net-tools +notification-daemon +ocaml +opensc +openslp-devel +opensp-devel +openssh-clients +optipng +pam-devel +pciutils-devel +perl-devel +perl(Archive::Zip) +perl(ExtUtils::CBuilder) +perl(ExtUtils::Embed) +perl-ExtUtils-MakeMaker +perl(IPC::Run3) +perl(Module::ScanDeps) +perl(PAR::Dist) +perl-pcsc-perl +perl(Test::More) +perl(Tk) +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +postgresql +postgresql-devel +ppp +python3-devel +python-pylibacl +python-pyyaml +python-setuptools_scm +pyxattr +readline-devel +recode +rpm-build +rpm-devel +ruby-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +taglib-devel +tcp_wrappers +torsocks +transfig +unixODBC-devel +usbutils +valgrind +x11-font-util +xbase-devel +xkeyboard-config-devel +xmlto +xscreensaver +xscreensaver-base +xscreensaver-extrusion +xscreensaver-gl +zlib-devel diff --git a/redhat/docker/omv5000/rpmmacros b/redhat/docker/omv5000/rpmmacros new file mode 100644 index 000000000..0a954f906 --- /dev/null +++ b/redhat/docker/omv5000/rpmmacros @@ -0,0 +1,11 @@ +%dist %nil +%_smp_mflags -j8 +%jobs 8 +%dont_remove_libtool_files 1 +%_disable_rebuild_configure 1 +%_program_prefix "" +%_debugsource_packages %nil +%_debugsource_template %nil +%_vpath_builddir . +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64 new file mode 100644 index 000000000..55f8a0abf --- /dev/null +++ b/redhat/docker/omvcooker/Dockerfile.x86_64 @@ -0,0 +1,65 @@ +FROM openmandriva/cooker:latest + +ARG TDE_VERSION=14.1.2 +ARG ARCH=x86_64 + +COPY packages /packages +RUN set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && dnf -y update \ + && dnf -y install --skip-broken $(</packages) + +# Fix utempter detection +RUN set -x \ + && chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN set -x \ + && rm -rf /home/trinity \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc \ + && chown -R trinity /home/trinity + +# Configure user trinity +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN set -x \ + && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm + +#RUN set -x \ +# && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --define "mkrel %nil" --nodeps \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm + +RUN set -x \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-Getopt-ArgvFile-1.110.0-10.mga9.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-Getopt-ArgvFile.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-1.18.0-1.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s/MYMETA.yml//" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages new file mode 100644 index 000000000..47a126218 --- /dev/null +++ b/redhat/docker/omvcooker/packages @@ -0,0 +1,256 @@ +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +createrepo_c +ctags +cups-devel +curl-devel +db5-devel +dbus-devel +dbus-glib +dbus-glib-devel +djvulibre +docbook2x +docbook-dtd412-xml +docbook-style-xsl +docbook-utils +doxygen +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +flex-devel +fontconfig-devel +freetype-devel +fribidi-devel +gamin-devel +gettext-devel +ghostscript +glib2-devel +glibc-i18ndata +gmime-devel +gnokii-devel +gperf +gpgme-devel +gsl-devel +gtk+3.0-devel +gtk-doc +hspell-devel +html2ps +iceauth +imake +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel +java-devel +kde-dev-scripts +less +lib64acl-devel +lib64alsa-oss-devel +lib64apr-devel +lib64apr-util-devel +lib64asound-devel +lib64attr-devel +lib64audio-devel +lib64binutils-devel +lib64cap-devel +lib64cdda-devel +lib64cdio-devel +lib64cdio_paranoia-devel +lib64cln-devel +lib64clucene-devel +lib64config-devel +lib64cryptsetup-devel +lib64curl-devel +lib64drm-devel +lib64dvdread-devel +lib64exif-devel +lib64exiv2-devel +lib64expat-devel +lib64ext2fs-devel +lib64fbclient-devel +lib64ffmpeg-devel +lib64flac++-devel +lib64flac-devel +lib64fluidsynth-devel +lib64fontenc-devel +lib64gadu-devel +lib64geoip-devel +lib64gif-devel +lib64glu-devel +lib64gmime2.6-devel +lib64gmp-devel +lib64gnutls-devel +lib64gpg-error-devel +lib64gphoto-devel +lib64gpod-devel +lib64graphicsmagick-devel +lib64gstreamer-devel +lib64gst-plugins-base1.0-devel +lib64gtk+2.0-devel +lib64hiredis-devel +lib64ical-devel +lib64icu-devel +lib64idn-devel +lib64ifp-devel +lib64jack-devel +lib64magick-devel +lib64inotifytools-devel +lib64jasper-devel +lib64jpeg-devel +lib64lame-devel +lib64lcms-devel +lib64ldap-devel +lib64lirc_client-devel +lib64lo-devel +lib64lrdf-devel +lib64ltdl-devel +lib64lua-devel +lib64mad-devel +lib64magic-devel +lib64memcached-devel +lib64mng-devel +lib64mpcdec-devel +lib64mtp-devel +lib64musicbrainz5-devel +lib64nettle-devel +lib64njb-devel +lib64nm-devel +lib64npth-devel +lib64nsl-devel +lib64nspr-devel +lib64ofx-devel +lib64openexr-devel +lib64otr-devel +lib64paper-devel +lib64pcre-devel +lib64pcsclite-devel +lib64pkcs11-helper-devel +lib64polkit1-devel +lib64poppler-devel +lib64pqxx-devel +lib64pth-devel +lib64pulseaudio-devel +lib64qalculate-devel +lib64raptor-devel +lib64raw1394-devel +lib64rsvg2-devel +lib64rsync-devel +lib64samplerate-devel +lib64sane1-devel +lib64sasl-devel +lib64SDL-devel +lib64smbclient-devel +lib64sndfile-devel +lib64t1lib-devel +lib64tasn1-devel +lib64theora-devel +lib64tiff-devel +lib64tirpc-devel +lib64twolame-devel +lib64udev-devel +lib64udisks-devel +lib64usb-compat0.1-devel +lib64usb1.0-devel +lib64utempter0 +lib64utempter-devel +lib64v4l-devel +lib64visual-devel +lib64vorbis-devel +lib64wmf-devel +lib64wpd-devel +lib64xaw-devel +lib64xdg-basedir-devel +lib64xi-devel +lib64xine-devel +lib64xkbfile-devel +lib64xscrnsaver-devel +lib64xslt-devel +lib64xtst-devel +lib64xxf86dga-devel +lib64xxf86vm-devel +lib64wrap-devel +librsvg +lm_sensors-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +net-tools +notification-daemon +ocaml +opensc +openslp-devel +opensp-devel +openssh-clients +optipng +pam-devel +pciutils-devel +perl-devel +perl(Archive::Zip) +perl(ExtUtils::CBuilder) +perl(ExtUtils::Embed) +perl-ExtUtils-MakeMaker +perl(IPC::Run3) +perl(Module::ScanDeps) +perl(PAR::Dist) +perl-pcsc-perl +perl(Test::More) +perl(Tk) +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +postgresql +postgresql-devel +ppp +python3-devel +python-pylibacl +python-pyyaml +python-setuptools_scm +pyxattr +readline-devel +recode +rpm-build +rpm-devel +ruby-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +taglib-devel +tcp_wrappers +torsocks +transfig +unixODBC-devel +usbutils +valgrind +x11-font-util +xbase-devel +xkeyboard-config-devel +xmlto +xscreensaver +xscreensaver-base +xscreensaver-extrusion +xscreensaver-gl +zlib-devel diff --git a/redhat/docker/omvcooker/rpmmacros b/redhat/docker/omvcooker/rpmmacros new file mode 100644 index 000000000..0a954f906 --- /dev/null +++ b/redhat/docker/omvcooker/rpmmacros @@ -0,0 +1,11 @@ +%dist %nil +%_smp_mflags -j8 +%jobs 8 +%dont_remove_libtool_files 1 +%_disable_rebuild_configure 1 +%_program_prefix "" +%_debugsource_packages %nil +%_debugsource_template %nil +%_vpath_builddir . +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/openmandriva.sh b/redhat/docker/openmandriva.sh new file mode 100755 index 000000000..ff121c54e --- /dev/null +++ b/redhat/docker/openmandriva.sh @@ -0,0 +1,27 @@ +#!/bin/bash -ex + +NAME="openmandriva" +VERSION="${1:-5.0}" # E.g: '26' +IMAGE="${NAME}:${VERSION}" +TAR="${NAME}-${VERSION}.tar" +INSTALLROOT="/dev/shm/${IMAGE}" + +sudo rm -rf "${INSTALLROOT}" +sudo dnf install \ + --assumeyes \ + --disablerepo="*" \ + --enablerepo="omv*" \ + --installroot="${INSTALLROOT}" \ + --nodocs \ + --nogpgcheck \ + --refresh \ + --releasever="${VERSION}" \ + --repofrompath 'omv-release,http://mirror.openmandriva.org/$releasever/repository/x86_64/main/release/' \ + --repofrompath 'omv-updates,http://mirror.openmandriva.org/$releasever/repository/x86_64/main/updates/' \ + bash curl dnf vim + +sudo tar -C "${INSTALLROOT}" -c . >"${TAR}" +sudo rm -rf "${INSTALLROOT}" + +docker rmi -f "${IMAGE}" +docker import "${TAR}" "${IMAGE}" diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh index 1a78e6340..5d4dce450 100755 --- a/redhat/docker/opensuse32.sh +++ b/redhat/docker/opensuse32.sh @@ -1,9 +1,13 @@ #!/bin/bash -e +if [ "$(whoami)" != "root" ]; then + sudo exec $0 $@ +fi + VERSION="$1" # E.g: '42.3' if [ "${VERSION}" = "tumbleweed" ]; then - URL="http://download.opensuse.org/tumbleweed" + URL="https://download.opensuse.org/ports/i586/tumbleweed" NAME="opensuse32/tumbleweed" else URL="http://download.opensuse.org/distribution/leap/${VERSION}" @@ -13,25 +17,38 @@ fi IMAGE="${NAME}:latest" INSTALLROOT="/dev/shm/${IMAGE}" -sudo rm -rf "${INSTALLROOT}" -sudo mkdir -p "${INSTALLROOT}" +for dir in dev proc sys; do + if [ -d "${INSTALLROOT}/${dir}" ]; then + umount "${INSTALLROOT}/${dir}" + fi +done + +rm -rf "${INSTALLROOT}" +mkdir -p "${INSTALLROOT}" -sudo zypper --root "${INSTALLROOT}" \ +for dir in dev proc sys; do + mkdir -p "${INSTALLROOT}/${dir}" + mount --bind "/${dir}" "${INSTALLROOT}/${dir}" +done + +zypper --root "${INSTALLROOT}" \ ar "${URL}/repo/oss/" "oss" -sudo zypper --root "${INSTALLROOT}" \ +zypper --root "${INSTALLROOT}" \ ar "${URL}/repo/non-oss/" "non-oss" if [ "${VERSION}" != "tumbleweed" ]; then - sudo zypper --root "${INSTALLROOT}" \ + zypper --root "${INSTALLROOT}" \ ar "http://download.opensuse.org/update/leap/${VERSION}/oss/" "update-oss" - sudo zypper --root "${INSTALLROOT}" \ + zypper --root "${INSTALLROOT}" \ ar "http://download.opensuse.org/update/leap/${VERSION}/non-oss/" "update-non-oss" fi -sudo zypper --root "${INSTALLROOT}" \ +zypper --root "${INSTALLROOT}" \ --gpg-auto-import-keys ref -sudo setarch i686 zypper --root "${INSTALLROOT}" \ +setarch i686 zypper --root "${INSTALLROOT}" \ install --download-only -y \ bash \ + ca-certificates \ + curl \ docbook-utils \ filesystem \ gawk \ @@ -47,16 +64,23 @@ sudo setarch i686 zypper --root "${INSTALLROOT}" \ xz \ zlib \ zypper -sudo rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm" +rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm" + +chroot "${INSTALLROOT}" rpmdb --rebuilddb + +for dir in dev proc sys; do + umount "${INSTALLROOT}/${dir}" +done -sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb +rm -rfv "${INSTALLROOT}/var/cache/zypp/packages/"* FILE="${IMAGE//\//_}.tar" -sudo tar -C "${INSTALLROOT}" -c . >"${FILE}" -sudo rm -rf "${INSTALLROOT}" +tar -C "${INSTALLROOT}" -c . >"${FILE}" +rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" docker import "${FILE}" "${IMAGE}" pigz "${FILE}" -mv -fv "${FILE}.gz" "${HOME}/tde/docker" +mkdir -p "/home/${SUDO_USER}/tde/docker" +mv -fv "${FILE}.gz" "/home/${SUDO_USER}/tde/docker" diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64 index 69f9fdbe2..5ebc69ac7 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.2 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..f80f0aaa0 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.2 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..8bbccfb44 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.2 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..be2e75b61 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.2 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..fd2294119 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.2 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..d2e770b22 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.2 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..8285a64f0 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.2 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 new file mode 100644 index 000000000..394650a12 --- /dev/null +++ b/redhat/docker/oss155/Dockerfile.x86_64 @@ -0,0 +1,38 @@ +FROM opensuse/leap:15.5 + +ARG TDE_VERSION=14.1.2 +ARG ARCH=x86_64 + +# Add PACKMAN repository +# Install Trinity build dependencies +COPY packages /packages +RUN set -x \ + && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \ + && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.5/ packman \ + && zypper -n refresh \ + && zypper -n update \ + && zypper -n install -l $(</packages) + +RUN ln -sfv python3.6m /usr/include/python3.6 \ + && ln -sfv python3 /usr/bin/python + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Add YUM repository for locally built packages +RUN 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.5/repo/oss/src/libheimdal-7.8.0-bp155.2.7.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install diff --git a/redhat/docker/oss155/packages b/redhat/docker/oss155/packages new file mode 100644 index 000000000..3d3897e5b --- /dev/null +++ b/redhat/docker/oss155/packages @@ -0,0 +1,225 @@ +alsa-devel +aspell +aspell-devel +audiofile-devel +automake +bdftopcf +binutils-devel +bison +brp-check-suse +brp-extract-appdata +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +cln-devel +clucene-core-devel +cmake +createrepo_c +cups-devel +curl +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-utils +docbook-xsl-stylesheets +docbook2x +doxygen GraphicsMagick +dssi-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +font-util +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +git +glu-devel +gmime-devel +gmime2_6-devel +gmp-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gstreamer-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +iceauth +ImageMagick-devel +imake +imlib2-devel +intltool +java-1_8_0-openjdk-devel +less +libacl-devel +libao-devel +libart_lgpl-devel +libavahi-devel +libavcodec-devel +libblkid-devel +libboost_python-py3-1_66_0-devel +libboost_system1_66_0-devel +libbz2-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcryptsetup-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libexempi-devel +libexiv2-devel +libfontenc-devel +libgadu-devel +libGeoIP-devel +libgpgme-devel +libgphoto2-devel +libgpod-devel +libgssglue-devel +libical-devel +libICE-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +libjpeg8-devel +liblcms2-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libmysqld-devel +libneon-devel +libnjb-devel +libnsl-devel +libofx-devel +libotr-devel +libpaper-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpulse-devel +libqalculate-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libSM-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libtag-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtwolame-devel +libudev1 +libudisks2-0-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXdmcp-devel +libxine-devel +libxkbfile-devel +libXpm-devel +libXmu-devel +libXScrnSaver-devel +libxslt-devel +libXt-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +make +makeinfo +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +net-tools +net-tools-deprecated +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +perl(JSON) +perl-PAR-Packer +perl-pcsc +pkcs11-helper-devel +polkit-devel +postgresql +postgresql-devel +postgresql-server-devel +ppp +python3-devel +python3-sip-devel +recode +rpcgen +rpm-build +rpmlint +rsvg-convert +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +sword-devel +systemd-sysvinit +texinfo +torsocks +transfig +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +vim +wget +wireless-tools +wv2-devel +xbase-devel +xcb-proto-devel +xorg-x11 +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss155/rpmmacros b/redhat/docker/oss155/rpmmacros new file mode 100644 index 000000000..7fe3f58e6 --- /dev/null +++ b/redhat/docker/oss155/rpmmacros @@ -0,0 +1,7 @@ +%dist .oss155 +%_smp_mflags -j8 +%jobs 8 +%sle_version 150500 +%_build_insert_debug_package %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/oss156/Dockerfile.x86_64 b/redhat/docker/oss156/Dockerfile.x86_64 new file mode 100644 index 000000000..a41198e38 --- /dev/null +++ b/redhat/docker/oss156/Dockerfile.x86_64 @@ -0,0 +1,41 @@ +FROM opensuse/leap:15.6 + +ARG TDE_VERSION=14.1.2 +ARG ARCH=x86_64 + +# Add PACKMAN repository +# Install Trinity build dependencies +COPY packages /packages +RUN set -x \ + && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \ + && echo HTTP_PROXY="http://proxy.vtf:3128/" >>/etc/sysconfig/proxy \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.6/ packman \ + && zypper -n refresh \ + && zypper -n update \ + && zypper -n install -l $(</packages) + +RUN ln -sfv python3.6m /usr/include/python3.6 + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Add YUM repository for locally built packages +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ + && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch + +RUN rpm -Uvh http://download.opensuse.org/source/distribution/leap/15.5/repo/oss/src/perl-PAR-Packer-1.057-bp155.1.4.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer"*".rpm" + +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/libheimdal-7.8.0-bp156.4.4.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install diff --git a/redhat/docker/oss156/packages b/redhat/docker/oss156/packages new file mode 100644 index 000000000..cb0acc404 --- /dev/null +++ b/redhat/docker/oss156/packages @@ -0,0 +1,231 @@ +alsa-devel +aspell +aspell-devel +audiofile-devel +automake +bdftopcf +binutils-devel +bison +brp-check-suse +brp-extract-appdata +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +cln-devel +clucene-core-devel +cmake +createrepo_c +cups-devel +curl +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-utils +docbook-xsl-stylesheets +docbook2x +doxygen GraphicsMagick +dssi-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +font-util +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +git +glu-devel +gmime-devel +gmime2_6-devel +gmp-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gstreamer-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +iceauth +ImageMagick-devel +imake +imlib2-devel +intltool +java-1_8_0-openjdk-devel +less +libacl-devel +libao-devel +libart_lgpl-devel +libavahi-devel +libavcodec-devel +libblkid-devel +libboost_python-py3-1_66_0-devel +libboost_system1_66_0-devel +libbz2-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcryptsetup-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libexempi-devel +libexiv2-devel +libfontenc-devel +libgadu-devel +libGeoIP-devel +libgpgme-devel +libgphoto2-devel +libgpod-devel +libgssglue-devel +libical-devel +libICE-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +libjpeg8-devel +liblcms2-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libmysqld-devel +libneon-devel +libnjb-devel +libnsl-devel +libofx-devel +libotr-devel +libpaper-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpulse-devel +libqalculate-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libSM-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libtag-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtwolame-devel +libudev1 +libudisks2-0-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXdmcp-devel +libxine-devel +libxkbfile-devel +libXpm-devel +libXmu-devel +libXScrnSaver-devel +libxslt-devel +libXt-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +make +makeinfo +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +net-tools +net-tools-deprecated +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +perl(Archive::Zip) +perl(Getopt::ArgvFile) +perl(IPC::Run3) +perl(JSON) +perl(Module::ScanDeps) +perl(PAR) +perl(PAR::Dist) +perl-macros +perl-pcsc +pkcs11-helper-devel +polkit-devel +postgresql +postgresql-devel +postgresql-server-devel +ppp +python3-devel +python3-sip-devel +recode +rpcgen +rpm-build +rpmlint +rsvg-convert +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +sword-devel +systemd-sysvinit +texinfo +torsocks +transfig +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +vim +wget +wireless-tools +wv2-devel +xbase-devel +xcb-proto-devel +xorg-x11 +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss156/rpmmacros b/redhat/docker/oss156/rpmmacros new file mode 100644 index 000000000..f34912d6c --- /dev/null +++ b/redhat/docker/oss156/rpmmacros @@ -0,0 +1,7 @@ +%dist .oss156 +%_smp_mflags -j8 +%jobs 8 +%sle_version 150600 +%_build_insert_debug_package %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64 index 72102ab0c..47b0054bd 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.2 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..640c56f42 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.2 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..8da0fffe3 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.2 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index ec076eabd..19aa7b6f4 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,24 +1,21 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=i686 # Add PACKMAN repository COPY packages /packages -RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \ - && zypper ar -f -G -n gnome http://ftp.lysator.liu.se/pub/opensuse/repositories/GNOME:/Next/openSUSE_Factory gnome \ +RUN set -x \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \ && setarch ${ARCH} zypper -n refresh \ - && setarch ${ARCH} zypper -n dup \ && setarch ${ARCH} zypper -n update \ + && setarch ${ARCH} zypper -n dup \ && setarch ${ARCH} zypper -n install --allow-vendor-change $(</packages) # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity \ +RUN /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers -# Fix postgresql -RUN ln -sfv /usr/lib/postgresql10/bin/pg_config /usr/bin/pg_config - USER trinity COPY rpmmacros /home/trinity/.rpmmacros @@ -28,12 +25,15 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${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 -# Add GeoIP -RUN setarch ${ARCH} rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \ + && 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.23.3-3.9.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.3-1.5.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,-texgy-fonts,-emmentaler-fonts}"-2"*".rpm" + && 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 d708590cd..50ac34c5b 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -1,19 +1,19 @@ FROM opensuse/tumbleweed:latest -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add PACKMAN repository COPY packages /packages -RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \ +RUN set -x \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \ && zypper -n refresh \ - && zypper -n install busybox perl shadow \ && zypper -n dup \ && zypper -n update \ - && zypper -n install $(</packages) + && zypper -n install --allow-vendor-change $(</packages) # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity \ +RUN /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers USER trinity @@ -25,6 +25,11 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${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 -# Add GeoIP -RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ + && export ac_cv_sys_large_files=no \ + && export ac_cv_sys_file_offset_bits=no \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 263bd6947..7032cacde 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -33,6 +33,7 @@ docbook-xsl-stylesheets doxygen GraphicsMagick docbook2x dssi-devel +extractpdfmark fdupes ffmpeg-4-libavcodec-devel ffmpeg-4-libavdevice-devel @@ -158,6 +159,7 @@ libyaz-devel lirc-devel make makeinfo +mc meanwhile-devel Mesa-devel Mesa-libGL-devel @@ -178,10 +180,13 @@ patch pciutils-devel pcre-devel pcsc-lite-devel +perl-JSON perl-PAR-Packer perl-pcsc pkcs11-helper-devel +pkgconfig(bdw-gc) pkgconfig(guile-1.8) +pkgconfig(guile-3.0) polkit-devel postgresql postgresql-devel @@ -201,6 +206,7 @@ ruby ruby-devel sane-backends-devel scons +shadow speex-devel sqlite3-devel subversion-devel diff --git a/redhat/docker/osstw/rpmmacros b/redhat/docker/osstw/rpmmacros index cb1ceaa06..37788e61e 100644 --- a/redhat/docker/osstw/rpmmacros +++ b/redhat/docker/osstw/rpmmacros @@ -1,4 +1,5 @@ %dist .osstw %_smp_mflags -j8 %jobs 8 -%__python %__python2 +%python python3 +%__python %__python3 diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg index 30bb665db..504e271c8 100644 --- a/redhat/docker/pclinuxos.pkg +++ b/redhat/docker/pclinuxos.pkg @@ -22,13 +22,13 @@ gawk gcrypt gdk-pixbuf2.0 glibc -glibc-devel gnupg gnutls grep gzip icu icu69-data +icu71-data info-install kernel-userspace-headers krb5 @@ -39,7 +39,6 @@ lib64apt-pkg0 lib64assuan0 lib64attr1 lib64audit1 -lib64audit-devel lib64blkid1 lib64brotlicommon1 lib64brotlidec1 @@ -50,6 +49,7 @@ lib64cdio12 lib64crack2 lib64curl4 lib64db4.8 +lib64db5.3 lib64dbnss4.8 lib64elfutils1 lib64ev4 @@ -69,8 +69,12 @@ lib64glib2.0_0 lib64gmp10 lib64gnutls30 lib64gpg-error0 +libgpg-error-common +lib64gsasl lib64gudev1.0_0 lib64icu69 +lib64icu71 +lib64idn11 lib64idn2_0 lib64intl8 lib64iso9660_7 @@ -84,8 +88,10 @@ lib64ksba8 lib64ldap2.4_2 lib64cap-ng0 lib64lua5.1 +lib64lua5.2 lib64lzma5 lib64magic1 +lib64mnl0 lib64mount1 lib64mpfr6 lib64ncurses5 @@ -97,11 +103,11 @@ lib64notify4 lib64npth0 lib64nspr4 lib64nss3 +lib64ntlm lib64openssl1.0.0 lib64openssl1.1.0 lib64opts25 lib64pam0 -lib64pam-devel lib64pam_userpass1 lib64pcre1 lib64pcre2_0 @@ -110,13 +116,15 @@ lib64png16_16 lib64png3 lib64popt0 lib64psl5 -lib64python3.6 +lib64python3.10 lib64readline7 lib64readline8 lib64rpm1 lib64rtmp1 lib64sasl2 lib64secret1_0 +lib64selinux +lib64sharpyuv0 lib64sigsegv2 lib64smartcols1 lib64sqlite3_0 @@ -127,6 +135,7 @@ lib64tiff3 lib64tiff5 lib64tirpc3 lib64udev0 +lib64udev lib64unbound8 lib64unistring2 lib64usb1.0_0 @@ -137,16 +146,17 @@ lib64webp7 lib64x11_6 lib64xau6 lib64xcrypt1 -lib64xcrypt-devel lib64xdmcp6 lib64xml2_2 lib64zstd1 libgcc1 +libgomp1 libidn2-i18n libnotify libstdc++6 libtirpc libxcb +lsb-release makedev mktemp multiarch-utils @@ -158,6 +168,7 @@ openssl p11-kit pam pam_tcb +patch perl perl-base perl-File-Sync @@ -169,6 +180,7 @@ popt-data procps publicsuffix-list-dafsa python3 +python3-rpm-macros rmt rootcerts rpm diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh index cd7689569..42ab539cc 100755 --- a/redhat/docker/pclinuxos.sh +++ b/redhat/docker/pclinuxos.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex NAME="pclinuxos" -VERSION="${1:-2021}" # E.g: '2020' +VERSION="${1:-2024}" # E.g: '2020' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" @@ -29,19 +29,17 @@ sudo mount --bind "/dev" "${INSTALLROOT}/dev" sudo mkdir -p "${INSTALLROOT}/var/lib/rpm" sudo rpmdb --initdb --root="${INSTALLROOT}" -sudo rpm -Uvh --noscripts --root="${INSTALLROOT}" "/dev/shm/packages/"*".rpm" - -# Fix lzma library location -sudo mv "${INSTALLROOT}/lib/liblzma."* "${INSTALLROOT}/lib64" +sudo rpm -Uvh --noscripts --nodeps --root="${INSTALLROOT}" "/dev/shm/packages/"*".rpm" # Réinstall distro from inside chroot sudo mount --bind "/dev/shm" "${INSTALLROOT}/dev/shm" sudo rm -rf "${INSTALLROOT}/var/lib/rpm" sudo chroot "${INSTALLROOT}" rpmdb --initdb -sudo chroot "${INSTALLROOT}" rpm -Uvh "/dev/shm/packages/"*".rpm" +sudo chroot "${INSTALLROOT}" rpm -Uvh --nodeps "/dev/shm/packages/"*".rpm" sudo cp "/etc/resolv.conf" "${INSTALLROOT}/etc/resolv.conf" sudo chroot "${INSTALLROOT}" apt-get -y update +sudo chroot "${INSTALLROOT}" apt-get -y --fix-broken install sudo chroot "${INSTALLROOT}" apt-get -y upgrade sudo umount "${INSTALLROOT}/dev/shm" @@ -52,7 +50,4 @@ sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}" docker run -ti --rm "${IMAGE}" ls -l sudo rm -rf "${INSTALLROOT}" -docker image save "${IMAGE}" >"${IMAGE}.tar" -rm -f "${IMAGE}.tar.gz" -pigz -9 "${IMAGE}.tar" -mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs" +docker image save "${IMAGE}" | pigz -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz" diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 2aa9f8200..1d92b8a8a 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,13 +1,13 @@ -FROM pclinuxos:2021 +FROM pclinuxos:2024 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Update distribution # Install Trinity build dependencies COPY packages.${ARCH} /packages -RUN apt-get -y update \ - && apt-get -y install glibc \ +RUN set -x \ + && apt-get -y update \ && apt-get -y dist-upgrade \ && apt-get -y install $(</packages) @@ -26,8 +26,7 @@ COPY genla.sh /usr/bin/genla.sh RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ && genla.sh libjpeg \ && genla.sh liblcms \ - && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la \ - && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so + && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la # Add non-root user to build packages RUN rm -rf /home/trinity \ @@ -56,3 +55,8 @@ 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/release/html2ps-2.0-3.b7.8.mga8.src.rpm \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm + +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/updates/heimdal-7.7.1-1.3.mga8.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%autopatch|%patch1|" -e "/Conflicts: krb5-devel/ s|^|#|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \ + && echo sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index 85dd12684..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 @@ -65,6 +67,7 @@ lib64gstreamer-plugins-base1.0-devel lib64idn-devel lib64inotifytools-devel lib64iw29-devel +lib64jack-devel lib64nm-devel lib64mpcdec-devel lib64OpenSP5-devel @@ -84,6 +87,7 @@ lib64xaw-devel lib64xine1.2-devel lib64xtst-devel lib64yaz-devel +libattr-devel libcap-devel libcdda-devel libcln-devel @@ -158,6 +162,7 @@ net-snmp-devel ocaml OpenEXR-devel openldap-devel +openldap-servers opensc openslp-devel pam-devel @@ -168,12 +173,13 @@ perl-PAR-Packer perl-pcsc-perl pilot-link-devel pkgconfig(pygtk-2.0) +popt-devel postgresql postgresql-devel ppp pth-devel python3 -python-devel +python3-devel python-rpm qt4-devel recode diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros index a8b78eb0d..5c9fcc2e4 100644 --- a/redhat/docker/pclinuxos/rpmmacros +++ b/redhat/docker/pclinuxos/rpmmacros @@ -3,3 +3,5 @@ %jobs 8 %pclinuxos 2022 %configure %configure2_5x +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh index 028dfc578..bb626a9cc 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.2" [ -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..c5f8fb873 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.2" [ -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..2773f64ce 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.2" [ -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..5a59db78c 100755 --- a/redhat/docker/run.sh +++ b/redhat/docker/run.sh @@ -4,12 +4,13 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" DIST="$(sed -n ${DISTRIB}/rpmmacros -e "/%dist/ s|.* ||p")" +if [ "${DIST}" = "%nil" ]; then DIST=".${DISTRIB}"; fi mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}" @@ -18,6 +19,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 +35,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..31e63ef48 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.2 %endif %define tde_prefix /opt/trinity diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec index 2470b3412..a03d6bd5f 100644 --- a/redhat/extras/fileshareset/fileshareset.spec +++ b/redhat/extras/fileshareset/fileshareset.spec @@ -67,7 +67,7 @@ This utility was originally written for openSUSE KDE3. %prep %setup -q -n fileshareset2 -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "." || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "." || %__cp -f "/usr/share/libtool/ltmain.sh" "." aclocal autoconf automake -a -c @@ -97,7 +97,7 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset" # Rename binary to avoid conflict with kde3 mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2" -ln -sf "fileshareset2" "%{?buildroot}%{_bindir}/filesharelist" +ln -sf "fileshareset2" "%{?buildroot}%{_bindir}/filesharelist" %clean diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec index dab280946..f1a779fc9 100644 --- a/redhat/extras/htdig/htdig.spec +++ b/redhat/extras/htdig/htdig.spec @@ -1,6 +1,12 @@ %define _disable_ld_as_needed 1 %define _disable_ld_no_undefined 1 +%if 0%{?mdkver} >= 5000000 +%global __cc /usr/bin/gcc +%global __cxx /usr/bin/g++ +%global prefer_gcc 1 +%endif + %define contentdir /var/www Summary: A web indexing and searching system for a small domain or intranet @@ -26,6 +32,9 @@ BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-buildroot +Provides: group(htdig) +Provides: user(htdig) + %description The ht://Dig system is a complete world wide web indexing and searching system for a small domain or intranet. This system is not meant to replace the need @@ -105,10 +114,10 @@ Libraries needed to develop for htdig. %defattr(-,root,root) %doc ChangeLog %doc htdoc/* -%{_libdir}/htdig/*.a +#%{_libdir}/htdig/*.a %{_libdir}/htdig/*.la %{_libdir}/htdig/*[a-z].so -%{_libdir}/htdig_db/*.a +#%{_libdir}/htdig_db/*.a %{_libdir}/htdig_db/*.la %{_libdir}/htdig_db/*[a-z].so %{_includedir}/* @@ -204,6 +213,10 @@ autoreconf -fiv --with-apache=/usr/sbin/httpd \ --with-zlib=%{_prefix} +%if 0%{?fedora} == 40 +echo "#define HAVE_SHMGET 1" >>"db/db_config.h" +%endif + %__make %{?_smp_mflags} mv htdoc/ChangeLog . diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec index 8c26664fe..35f83a72e 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.3.0 Release: 1%{?dist} Summary: PIN or passphrase entry dialogs Group: System/Libraries @@ -45,7 +45,13 @@ BuildRequires: autoconf automake libtool m4 BuildRequires: pkgconfig BuildRequires: libassuan-devel + +# SECRET support +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}secret-devel +%else BuildRequires: libsecret-devel +%endif Requires: pinentry @@ -92,6 +98,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 e05691fba..a73b9c7ee 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.2 %endif # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". @@ -159,17 +159,18 @@ 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 Requires: trinity-kopete-otr Requires: trinity-kpicosim -%if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599 +%if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599 && 0%{?suse_version} != 1699 %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6 Requires: trinity-kpilot %endif %endif -#Requires: trinity-kplayer +Requires: trinity-kplayer Requires: trinity-krecipes Requires: trinity-krename Requires: trinity-krusader @@ -211,6 +212,7 @@ Requires: trinity-tde-style-domino Requires: trinity-tde-style-ia-ora Requires: trinity-tde-style-lipstik Requires: trinity-tde-style-qtcurve +Requires: trinity-tde-style-polyester Requires: trinity-tde-systemsettings Requires: trinity-tdedocker %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7 @@ -236,6 +238,7 @@ Requires: trinity-tellico Requires: trinity-tork Requires: trinity-twin-style-crystal Requires: trinity-twin-style-dekorator +Requires: trinity-twin-style-fahrenheit Requires: trinity-twin-style-machbunt Requires: trinity-twin-style-suse2 Requires: trinity-wlassistant diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec index 60ef22ddc..e6fccabdb 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.2 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -65,7 +65,6 @@ This package installs the Trinity directory structure. %dir %{tde_bindir} %dir %{tde_datadir} -%dir %{tde_confdir} %dir %{tde_confdir}/magic %dir %{tde_docdir} diff --git a/redhat/libheimdal-7.7.0-bp153.1.19.src.rpm b/redhat/libheimdal-7.7.0-bp153.1.19.src.rpm Binary files differnew file mode 100644 index 000000000..bb7546295 --- /dev/null +++ b/redhat/libheimdal-7.7.0-bp153.1.19.src.rpm diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec index a7fbe66a1..68bc75af8 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.2 %endif %define tde_pkg kipi-plugins %define tde_prefix /opt/trinity @@ -79,7 +79,12 @@ BuildRequires: gettext BuildRequires: gcc-c++ # JPEG support -BuildRequires: libjpeg-devel +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel # EXIV2 %if 0%{?mgaversion} || 0%{?mdkversion} @@ -95,8 +100,12 @@ BuildRequires: libexiv2-devel # GPOD (ipod) support %if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_gpod 1 +%if 0%{?mdkver} +BuildRequires: %{_lib}gpod-devel >= 0.4.2 +%else BuildRequires: libgpod-devel >= 0.4.2 %endif +%endif # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 @@ -107,16 +116,28 @@ BuildRequires: lcms-devel # GPHOTO2 support %if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}gphoto-devel +%else BuildRequires: gphoto2-devel +%endif %else BuildRequires: libgphoto2-devel %endif # TIFF support +%if 0%{?mdkver} +BuildRequires: %{_lib}tiff-devel +%else BuildRequires: libtiff-devel +%endif # XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif # MESA support %if 0%{?rhel} || 0%{?fedora} @@ -127,9 +148,13 @@ BuildRequires: mesa-libGLU-devel %if 0%{?pclinuxos} BuildRequires: MesaGLU-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -201,7 +226,7 @@ PicasaWebExport: Export pictures to Picasa web service %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec index 05f951ecc..e881fc9b8 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.2 %endif %define tde_pkg libkdcraw %define tde_prefix /opt/trinity @@ -74,7 +74,12 @@ BuildRequires: lcms-devel %endif # JPEG support -BuildRequires: libjpeg-devel +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel # AUTOTOOLS %if 0%{?mgaversion} || 0%{?mdkversion} @@ -168,7 +173,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec index 5b6d29cc1..c44f92c28 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.2 %endif %define tde_pkg libkexiv2 %define tde_prefix /opt/trinity @@ -86,7 +86,11 @@ BuildRequires: libexiv2-devel BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -149,7 +153,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec index 9eb9a7bc1..38e0d979c 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.2 %endif %define tde_pkg libkipi %define tde_prefix /opt/trinity @@ -80,16 +80,29 @@ BuildRequires: lcms-devel %endif # JPEG support -BuildRequires: libjpeg-devel +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # CMAKE BuildRequires: trinity-tde-cmake >= %{tde_version} @@ -169,7 +182,7 @@ Homepage: http://www.kipi-plugins.org/ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec index f20dcbf71..8168d4711 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.2 %endif %define tde_pkg libksquirrel %define tde_prefix /opt/trinity @@ -71,8 +71,8 @@ BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: pkgconfig -# AUTOTOOLS -BuildRequires: automake autoconf libtool +# CMAKE +BuildRequires: cmake libtool %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}ltdl-devel %endif @@ -92,33 +92,49 @@ BuildRequires: gettext BuildRequires: gettext-devel # OPENEXR support +%if 0%{?mdkver} +BuildRequires: %{_lib}openexr-devel +%else BuildRequires: OpenEXR-devel +%endif # TIFF support +%if 0%{?mdkver} +BuildRequires: %{_lib}tiff-devel +%else BuildRequires: libtiff-devel +%endif # GIF support %if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8 -BuildRequires: giflib-devel +BuildRequires: giflib-devel %else -BuildRequires: libungif-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}gif-devel +%else +BuildRequires: libungif-devel +%endif %endif # MNG support +%if 0%{?mdkver} +BuildRequires: %{_lib}mng-devel +%else BuildRequires: libmng-devel +%endif # DJVU support -%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_djvu 1 BuildRequires: djvulibre %endif # XMEDCON support -%if 0%{?fedora} -%define with_xmedcon 1 -BuildRequires: xmedcon -BuildRequires: xmedcon-devel -%endif +#if 0%{?fedora} +#define with_xmedcon 1 +#BuildRequires: xmedcon +#BuildRequires: xmedcon-devel +#endif # RSVG support %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -133,6 +149,9 @@ BuildRequires: librsvg2 BuildRequires: librsvg2-tools %endif %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}rsvg2-devel +%endif BuildRequires: librsvg %endif %if 0%{?suse_version} @@ -170,7 +189,11 @@ BuildRequires: freetype-devel %endif # WMF support +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}wmf-devel +%else BuildRequires: libwmf-devel +%endif # XML2 support BuildRequires: libxml2-devel @@ -244,6 +267,8 @@ This package contains the runtime libraries for KSquirrel. %{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0.8.0 %{tde_libdir}/ksquirrel-libs/libkls_mng.so.0 %{tde_libdir}/ksquirrel-libs/libkls_mng.so.0.8.0 +%{tde_libdir}/ksquirrel-libs/libkls_msp.so.0 +%{tde_libdir}/ksquirrel-libs/libkls_msp.so.0.8.0 %{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0 %{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0.8.0 %{tde_libdir}/ksquirrel-libs/libkls_neo.so.0 @@ -311,7 +336,7 @@ This package contains the runtime libraries for KSquirrel. %{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0 %{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0.8.0 %{tde_libdir}/libksquirrel-libs-png.so.0 -%{tde_libdir}/libksquirrel-libs-png.so.0.0.0 +%{tde_libdir}/libksquirrel-libs-png.so.0.8.0 %{tde_libdir}/libksquirrel-libs.so.0 %{tde_libdir}/libksquirrel-libs.so.0.8.0 %dir %{tde_datadir}/ksquirrel-libs @@ -362,6 +387,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 @@ -417,6 +443,8 @@ This package contains the development libraries for KSquirrel. %{tde_libdir}/ksquirrel-libs/libkls_mdl.so %{tde_libdir}/ksquirrel-libs/libkls_mng.la %{tde_libdir}/ksquirrel-libs/libkls_mng.so +%{tde_libdir}/ksquirrel-libs/libkls_msp.la +%{tde_libdir}/ksquirrel-libs/libkls_msp.so %{tde_libdir}/ksquirrel-libs/libkls_mtv.la %{tde_libdir}/ksquirrel-libs/libkls_mtv.so %{tde_libdir}/ksquirrel-libs/libkls_neo.la @@ -543,44 +571,47 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then %__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|" fi -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -%if 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 || 0%{?fedora} >= 34 -CXXFLAGS="${CXXFLAGS} -std=c++11" -%endif +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_includedir} \ +%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}" \ + -DINCLUDE_INSTALL_DIR="%{tde_includedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - %{?with_djvu:--enable-djvu} + -DBUILD_ALL=ON \ + -DBUILD_DICOM=OFF \ + -DBUILD_PICT=OFF \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make -C build install DESTDIR=%{buildroot} %clean diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index 878c2fbd0..80c14f13b 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.2 %endif %define tde_pkg libtdeldap %define tde_prefix /opt/trinity @@ -77,17 +77,25 @@ BuildRequires: libtool-ltdl-devel %endif # SASL support -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}sasl-devel +%else BuildRequires: %{_lib}sasl2-devel %endif +%endif %if 0%{?suse_version} BuildRequires: cyrus-sasl-devel %endif # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: lib64ldap-devel +%else BuildRequires: openldap-devel %endif +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif @@ -106,8 +114,12 @@ BuildRequires: libheimdal-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # LIBCOM_ERR support %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -118,13 +130,21 @@ BuildRequires: %{_lib}ext2fs-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -181,7 +201,7 @@ if [ -d "%{_libdir}/heimdal/lib/pkgconfig" ]; then PKG_CONFIG_PATH="%{_libdir}/heimdal/lib/pkgconfig:${PKG_CONFIG_PATH}" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec index 42421f156..38ad6cce6 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.2 %endif %define tde_pkg libtqt-perl %define tde_prefix /opt/trinity @@ -122,7 +122,7 @@ It provides an object-oriented interface and is easy to use. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/libraries/pytde/pytde.spec b/redhat/libraries/pytde/pytde.spec index cfe105cbb..23c576859 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.2 %endif %define tde_pkg pytde %define tde_prefix /opt/trinity @@ -63,7 +63,9 @@ BuildRequires: autoconf automake libtool m4 BuildRequires: gcc-c++ # PYTHON support +%if "%{python}" == "" %global python python3 +%endif %global __python %__python3 %global python_sitearch %{python3_sitearch} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -91,7 +93,7 @@ from tdeio, tdejs, tdehtml and tdeprint. %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{python_sitearch}/*.so -%if 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/dcopexport.py* %{python_sitearch}/dcopext.py* %{python_sitearch}/pytdeconfig.py* diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index edab0594a..4cbfab470 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.2 %endif %define tde_pkg pytdeextensions %define tde_prefix /opt/trinity @@ -75,7 +75,9 @@ BuildRequires: sip4-tqt-devel >= 4.10.5 Requires: sip4-tqt >= 4.10.5 # PYTHON support +%if "%{python}" == "" %global python python3 +%endif %global __python %__python3 %global python_sitearch %{python3_sitearch} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -183,7 +185,7 @@ done %__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g" %endif -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 || 0%{?sle_version} >= 150600 %__sed -i "app_templates/kcontrol_module/setup.py" \ "app_templates/kcontrol_module/src/kcontrol_module.py" \ "app_templates/kdeapp/setup.py" \ |