RPM: many updates for upcoming R14.1.3

Signed-off-by: François Andriot <albator78@libertysurf.fr>
r14.1.x
François Andriot 4 months ago
parent e81c987a3b
commit 4c78786737

@ -27,7 +27,7 @@ all: dependencies core libraries applications i18n meta external
dependencies: tde-cmake tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt pytqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
core: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions pytde
applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice kommando kompose konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tdebluez tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-polyester tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-fahrenheit twin-style-machbunt twin-style-suse2 wlassistant yakuake
applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice kommando kompose konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tdebluez tde-ebook-reader tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-polyester tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-fahrenheit twin-style-machbunt twin-style-mallory twin-style-suse2 wlassistant yakuake
i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
### Trinity Dependencies
@ -181,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 .fc38 .fc39 .fc40 .fc41))
ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39 .fc40 .fc41 .omv2490 .omv5000))
$(call buildpkg,3rdparty/wv2)
endif
@ -474,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)
@ -533,6 +533,9 @@ tdebluez:
tdedocker: tdebase
$(call buildpkg,applications/system/tdedocker)
tde-ebook-reader:
$(call buildpkg,applications/office/tde-ebook-reader)
tde-guidance: tdebase pytdeextensions
$(call buildpkg,applications/settings/tde-guidance)
@ -603,7 +606,7 @@ tdesvn: tdebase
$(call buildpkg,applications/development/tdesvn)
tde-systemsettings: tdebase
# $(call buildpkg,applications/settings/tde-systemsettings)
$(call buildpkg,applications/settings/tde-systemsettings)
tdmtheme: tdebase
$(call buildpkg,applications/tdmtheme)
@ -626,13 +629,14 @@ twin-style-fahrenheit: tdebase
twin-style-machbunt: tdebase
$(call buildpkg,applications/themes/twin-style-machbunt)
twin-style-mallory: tdebase
$(call buildpkg,applications/themes/twin-style-mallory)
twin-style-suse2: tdebase
$(call buildpkg,applications/themes/twin-style-suse2)
wlassistant: tdebase
ifeq (,$(filter $(DIST), .omv2490 .omv5000 ))
$(call buildpkg,applications/settings/wlassistant)
endif
yakuake: tdebase
$(call buildpkg,applications/system/yakuake)
@ -659,7 +663,7 @@ fileshareset:
$(call buildpkg,extras/fileshareset)
pinentry-tqt: tqtinterface
ifeq (,$(filter $(DIST), .el5 .el6 .el7 .omv2490 .omv5000 ))
ifeq (,$(filter $(DIST), .el5 .el6 .el7 ))
$(call buildpkg,extras/pinentry-tqt)
endif

@ -161,9 +161,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# Incorrect extension on manpage
%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1
%find_lang %{tde_pkg}
%clean

@ -80,24 +80,20 @@ BuildRequires: brp-check-trinity
%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: mesaglu-devel
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-Mesa-libGLU
%endif
%description

@ -190,6 +190,6 @@ fi
%{tde_datadir}/pixmaps/tork.xpm
%{tde_mandir}/man1/tork.1*
%{tde_mandir}/man1/torkarkollon.1*
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/libkickermenu_tork.mo
%changelog

@ -100,7 +100,7 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel
@ -128,7 +128,11 @@ BuildRequires: libheimdal-devel
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?pclinuxos}
BuildRequires: %{_lib}udev1-devel
%else
BuildRequires: %{_lib}udev-devel
%endif
%else
BuildRequires: libudev-devel
%endif

@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel

@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel

@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel

@ -89,7 +89,7 @@ BuildRequires: brp-check-trinity
%endif
# ALSA supportl
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}asound-devel
%else
BuildRequires: alsa-lib-devel
@ -173,13 +173,17 @@ BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
%if 0%{?pclinuxos} == 0
%if ( 0%{?fedora} && 0%{?fedora} <= 40 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_ifp 1
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ifp-devel
%else
BuildRequires: libifp-devel
%endif
%endif
%endif
# KARMA support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 24090000
%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 5000000
%define with_karma 1
BuildRequires: libkarma-devel
BuildRequires: karma-sharp
@ -268,7 +272,7 @@ BuildRequires: xine-lib-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%define with_xine 1
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel
@ -292,7 +296,7 @@ BuildRequires: trinity-akode-devel
# MP4V2 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?mdkver} < 24090000
%if 0%{?mdkver} < 5000000
%define with_mp4v2 1
BuildRequires: libmp4v2-devel
%endif

@ -81,7 +81,7 @@ BuildRequires: brp-check-trinity
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel

@ -78,7 +78,7 @@ BuildRequires: brp-check-trinity
%endif
# ALSA supportl
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}asound-devel
%else
BuildRequires: alsa-lib-devel
@ -91,7 +91,11 @@ BuildRequires: zlib-devel
# VORBIS support
%if 0%{?mdkver} || 0%{?mgaversion}
%if 0%{?pclinuxos}
%define libvorbis_devel %{_lib}vorbis0-devel
%else
%define libvorbis_devel %{_lib}vorbis-devel
%endif
%else
%define libvorbis_devel libvorbis-devel
%endif
@ -152,7 +156,11 @@ Requires: cdrdao
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?pclinuxos}
BuildRequires: %{_lib}udev1-devel
%else
BuildRequires: %{_lib}udev-devel
%endif
%else
BuildRequires: libudev-devel
%endif

@ -89,24 +89,20 @@ BuildRequires: libdvdread-devel
%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: mesaglu-devel
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-Mesa-libGLU
%endif
%description

@ -80,7 +80,11 @@ BuildRequires: brp-check-trinity
# VORBIS support
%if 0%{?mdkver} || 0%{?mgaversion}
%if 0%{?pclinuxos}
%define libvorbis_devel %{_lib}vorbis0-devel
%else
%define libvorbis_devel %{_lib}vorbis-devel
%endif
%else
%define libvorbis_devel libvorbis-devel
%endif
@ -143,7 +147,7 @@ BuildRequires: %{_lib}xcb-devel
%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gstreamer 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gstreamer-devel
BuildRequires: %{_lib}gst-plugins-base1.0-devel
%else
@ -169,7 +173,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel

@ -84,7 +84,7 @@ BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gstreamer-devel
BuildRequires: %{_lib}gst-plugins-base1.0-devel
%else
@ -109,7 +109,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel
@ -139,7 +139,7 @@ BuildRequires: xorg-x11-libXv-devel
%endif
# GTK2 stuff
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gtk+2.0-devel
%else
BuildRequires: gtk2-devel

@ -169,7 +169,7 @@ fi
%{tde_datadir}/services/mplayer-thumbnailer.desktop
%{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo
%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/mplayer-thumbnailer.mo
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/mplayer-thumbnailer.mo
%changelog

@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@ -133,40 +133,45 @@ See the 'trinity-soundkonverter' package for more information.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
--program-prefix="" \
if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
--disable-dependency-tracking \
--disable-debug \
--enable-final \
--enable-new-ldflags \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags}
-DWITH_ALL_OPTIONS=ON \
%{?!with_dvb:-DWITH_DVB=OFF} \
%{?!with_lame:-DWITH_LAME=OFF} \
%{?!with_xcb:-DWITH_XCB=OFF} \
-DBUILD_ALL=ON \
..
%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg}
@ -182,9 +187,8 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%doc AUTHORS ChangeLog COPYING README
%{tde_bindir}/soundkonverter
%{tde_bindir}/userscript.sh
%{tde_tdeappdir}/soundkonverter.desktop
%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
%{tde_datadir}/apps/soundkonverter

@ -48,6 +48,10 @@
# Required for Mageia 2: removes the ldflag '--no-undefined'
%global _disable_ld_no_undefined 1
%if 0%{?mdkver} >= 5000000
%global build_cxxflags %optflags -Wl,--allow-shlib-undefined
%endif
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
@ -210,7 +214,7 @@ BuildRequires: freetype-devel
%if 0%{?mdkver} || 0%{?mgaversion}
BuildRequires: %{_lib}png-devel
%endif
%if 0%{?mdkversion} && 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
%if 0%{?mdkversion} && 0%{?mdkver} < 5000000 && 0%{?pclinuxos} == 0
BuildRequires: %{_lib}png15-devel
%endif
%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
@ -293,32 +297,32 @@ Obsoletes: trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
# WV2 support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mdkver} < 24090000
%define with_wv2 1
%if 0%{mdkver} >= 5000000
BuildRequires: wv2-devel
%else
BuildRequires: %{_lib}wv2-devel
%endif
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%define with_wv2 1
BuildRequires: wv2-devel
%endif
# MESA support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
BuildRequires: %{_lib}mesagl-devel
%endif
%if 0%{?mdkver} >= 24090000
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: %{_lib}mesaglu1-devel
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version} >= 1220
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
# LIBXI support
@ -883,7 +887,9 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_tdelibdir}/libwmlimport.*
%{tde_tdelibdir}/libwpexport.*
%{tde_tdelibdir}/libwpimport.*
%if 0%{?with_wv2}
%{tde_tdelibdir}/libmswordimport.*
%endif
%{tde_tdelibdir}/libxsltimport.*
%{tde_tdelibdir}/libxsltexport.*
%{tde_tdelibdir}/libhancomwordimport.*
@ -1189,10 +1195,18 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
%{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
%{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
# Ensure PQXX was detected (required by kexidb/pgsql)
%if "%{?with_postgresql}" != ""
# Ensure PQXX was detected
if grep 'S\["compile_pgsql_plugin_TRUE"\]="#"' config.status; then
exit 1
fi
%endif
# Ensure WV2 was detected
%if 0%{?with_wv2}
if grep 'S\["include_wv2_msword_filter_TRUE"\]="#"' config.status; then
exit 2
fi
%endif
%__make %{?_smp_mflags} || %__make

@ -0,0 +1,251 @@
#
# spec file for package tde-ebook-reader (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
%define tde_version 14.1.2
%endif
%define tde_pkg tde-ebook-reader
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.99.6
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: e-book reader for TDE
Group: Applications/Publishing
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# UNIBREAK support
%if 0%{?mgaversion} || 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}unibreak-devel
%else
BuildRequires: libunibreak-devel
%endif
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
%description
tde-ebook-reader is an e-book reader for TDE.
Main features:
* supports several open e-book formats: fb2, html, chm, plucker,
palmdoc, ztxt, tcr (psion text), rtf, oeb, openreader, non-DRM'ed
mobipocket, plain text, epub, eReader
* reads directly from tar, zip, gzip, bzip2 archives (you can have
several books in one archive)
* supports a structured view of your e-book collection
* automatically determines encodings
* automatically generates a table of contents
* keeps the last open book and the last read positions for all open books
between runs
* automatic hyphenation (patterns for several languages are included)
* searching and downloading books from www.feedbooks.com and www.litres.ru
* partial CSS support for epub files
%files
%defattr(-,root,root,-)
%{tde_bindir}/tde-ebook-reader
%{tde_tdeappdir}/tde-ebook-reader.desktop
%{tde_datadir}/apps/tde-ebook-reader/
%{tde_mandir}/man1/tde-ebook-reader.1*
##########
%package -n libzlcore-tqt
Requires: libzlcore-data-tqt
Summary: Summary: TQt3-based development library (shared library)
%description -n libzlcore-tqt
This is the core of Summary: , the library that tde-ebook-reader is based on.
%files -n libzlcore-tqt
%{tde_libdir}/libzlcore-tqt.so.*
##########
%package -n libzlcore-tqt-devel
Requires: libzlcore-tqt
Summary: TQt3-based development library (development files)
%description -n libzlcore-tqt-devel
This package contains development files for the Summary: core.
%files -n libzlcore-tqt-devel
%{tde_includedir}/zlibrary-tqt/core
%{tde_libdir}/libzlcore-tqt.la
%{tde_libdir}/libzlcore-tqt.so
##########
%package -n libzlcore-data-tqt
Summary: TQt3-based development library (support files)
%description -n libzlcore-data-tqt
This package contains the support files for the core of Summary: , the library
that the fbreader e-book reader is based on.
%files -n libzlcore-data-tqt
%{tde_datadir}/zlibrary-tqt/keynames.desktop-tqt.xml
%{tde_datadir}/zlibrary-tqt/languagePatterns.zip
%{tde_datadir}/zlibrary-tqt/unicode.xml.gz
%{tde_datadir}/zlibrary-tqt/default/
%{tde_datadir}/zlibrary-tqt/encodings/
%{tde_datadir}/zlibrary-tqt/resources/
##########
%package -n libzltext-tqt
Requires: libzlcore-tqt
Requires: libzltext-data-tqt
Summary: TQt3-based text model/viewer part (shared library)
%description -n libzltext-tqt
This package provides text model/viewer part of Summary: .
%files -n libzltext-tqt
%{tde_libdir}/libzltext-tqt.so.*
##########
%package -n libzltext-tqt-devel
Requires: libzltext-tqt
Summary: TQt3-based text model/viewer part (development files)
%description -n libzltext-tqt-devel
This package contains development files for the Summary: text model/viewer
library.
%files -n libzltext-tqt-devel
%{tde_includedir}/zlibrary-tqt/text
%{tde_libdir}/libzltext-tqt.la
%{tde_libdir}/libzltext-tqt.so
##########
%package -n libzltext-data-tqt
Summary: TQt3-based text model/viewer part (support files)
%description -n libzltext-data-tqt
This package contains the support files for the text model/viewer part
of Summary: .
%files -n libzltext-data-tqt
%{tde_datadir}/zlibrary-tqt/hyphenationPatterns.zip
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
# Warning: GCC visibility causes the KCM not to work at all !
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
..
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
%clean
%__rm -rf %{buildroot}
%changelog

@ -144,6 +144,7 @@ university etc.)
%{tde_datadir}/mimelnk/application/kmfnet.desktop
%{tde_datadir}/mimelnk/application/kmfpkg.desktop
%{tde_datadir}/mimelnk/application/kmfrs.desktop
%{tde_datadir}/pixmaps/kmyfirewall.xpm
%{tde_datadir}/services/kmf*.desktop
%{tde_datadir}/servicetypes/kmf*.desktop
%{tde_mandir}/man1/kmyfirewall.1*

@ -183,7 +183,7 @@ or can be run as standalone applications.
%{tde_datadir}/apps/guidance/
%{tde_tdeappdir}/*.desktop
%{tde_datadir}/icons/crystalsvg/*/*/*.png
%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitelib}/tde-guidance/SMBShareSelectDialog.py*
%{python_sitelib}/tde-guidance/SimpleCommandRunner.py*
%{python_sitelib}/tde-guidance/fuser.py*
@ -249,7 +249,7 @@ Guidance configuration tools.
%files backends
%defattr(-,root,root,-)
%dir %{python_sitelib}/tde-guidance
%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitelib}/tde-guidance/MicroHAL.py*
%if 0%{?rhel} == 7
%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc

@ -82,8 +82,12 @@ BuildRequires: brp-check-trinity
BuildRequires: wireless-tools-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}iw-devel
%else
BuildRequires: %{_lib}iw29-devel
%endif
%endif
%if 0%{?rhel} == 5 || 0%{?suse_version}
BuildRequires: wireless-tools
%endif

@ -75,7 +75,7 @@ BuildRequires: brp-check-trinity
%endif
# GTK2 stuff
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gtk+2.0-devel
%else
BuildRequires: gtk2-devel
@ -183,7 +183,7 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
%{tde_bindir}/notification-daemon-tde
%{tde_datadir}/autostart/kdbusnotification-autostart.desktop
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/notification-daemon-tde.mo
%changelog

@ -164,6 +164,7 @@ fi
%{tde_tdelibdir}/tdeio_appinfo.la
%{tde_tdelibdir}/tdeio_appinfo.so
%{tde_datadir}/services/appinfo.protocol
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/tdeio_appinfo.mo
%changelog

@ -199,6 +199,8 @@ export PATH="%{tde_bindir}:${PATH}"
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo
%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/baghira-usermanager.mo
%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/baghira-usermanager.mo
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/baghira-kmenuapplet.mo
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/baghira-switcher.mo
%{tde_mandir}/man1/bab.1*

@ -153,6 +153,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/apps/twin/fahrenheit/minmax.png
%{tde_datadir}/apps/twin/fahrenheit/sticky.png
%{tde_datadir}/apps/twin/fahrenheit/unsticky.png
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin-style-fahrenheit.mo
%changelog

@ -1,4 +1,4 @@
#!/bin/bash -x
#!/bin/bash
TDE_VERSION="${1:-${TDE_VERSION:-14.1.2}}"
ARCH=$(rpm -E %_target_cpu)

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

@ -12,9 +12,9 @@ RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION})
pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")"
pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")"
# Application packages: version does not match TDE version
if [[ "${pkg_release}" =~ ^0_ ]] || [[ "${pkg_release}" =~ _0_ ]]; then
# Preversion
# Preversion
if [ "${pkg_release:0:2}" = "0_" ] || [[ "${pkg_release}" =~ _0_ ]]; then
# Application packages: version does not match TDE version
if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
# Likely application package
eval VERSION="${pkg_release/0_/\~}"

@ -39,4 +39,4 @@ while read var val; do
done
;;
esac
done < "${SPECFILE}"
done < "${SPECFILE}" | sort -u

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

@ -95,7 +95,7 @@ BuildRequires: trinity-akode-devel
%endif
# ALSA support
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}asound-devel
%else
BuildRequires: alsa-lib-devel

@ -94,7 +94,7 @@ BuildRequires: SDL-devel
%endif
# ALSA supportl
%if 0%{?mdkver} >= 24090000
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}asound-devel
%else
BuildRequires: alsa-lib-devel

@ -85,24 +85,20 @@ BuildRequires: libacl-devel
%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: mesaglu-devel
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-Mesa-libGLU
%endif
# LIBART support
%define with_libart 1

@ -0,0 +1 @@
pamd.kcheckpass-trinity.pclos2018

@ -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

@ -0,0 +1 @@
pamd.kdm-trinity-np.pclos2018

@ -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

@ -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

@ -0,0 +1 @@
pamd.kscreensaver-trinity.pclos2018

@ -63,8 +63,11 @@ Source1: %{name}-rpmlintrc
# Pam configuration files for RHEL / Fedora
%if 0%{?suse_version} == 0
%if 0%{?mdkver}
Source2: pamd.tde.omv5000
%if 0%{?mdkver} >= 5000000
Source2: pamd.kdm-trinity.omv
Source3: pamd.kdm-trinity-np.omv
Source4: pamd.kcheckpass-trinity.omv
Source5: pamd.kscreensaver-trinity.omv
%else
Source2: pamd.kdm-trinity%{?dist}
Source3: pamd.kdm-trinity-np%{?dist}
@ -128,7 +131,11 @@ BuildRequires: brp-check-trinity
# Fedora Theme
%if 0%{?fedora}
Requires: f%{?fedora}-backgrounds-base
%if 0%{?fedora} >= 39
%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/f%{?fedora}-01-day.png
%else
%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/standard/%{?fedora}.png
%endif
Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
@ -192,7 +199,7 @@ Requires: mandriva-theme
%endif
# OpenMandriva
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
Requires: distro-release-theme
%define tde_bg /usr/share/wallpapers/default.png
%endif
@ -231,7 +238,7 @@ BuildRequires: fdupes
BuildRequires: htdig
# OPENSSL support
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}openssl-devel
%else
BuildRequires: openssl-devel
@ -241,7 +248,7 @@ BuildRequires: openssl-devel
BuildRequires: audiofile-devel
# ALSA supportl
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}asound-devel
%else
BuildRequires: alsa-lib-devel
@ -255,8 +262,12 @@ BuildRequires: libraw1394-devel
%endif
# VORBIS support
%if 0%{?mdkver} || 0%{?mgaversion}
%if 0%{?mdkver} || 0%{?mgaversion} || 0%{?pclinuxos}
%if 0%{?pclinuxos}
%define libvorbis_devel %{_lib}vorbis0-devel
%else
%define libvorbis_devel %{_lib}vorbis-devel
%endif
%else
%define libvorbis_devel libvorbis-devel
%endif
@ -268,9 +279,16 @@ BuildRequires: glib2-devel
# PCRE support
BuildRequires: pcre-devel
# PCRE2 support
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}pcre2-devel
%else
BuildRequires: pcre2-devel
%endif
# SASL support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}sasl-devel
%else
BuildRequires: %{_lib}sasl2-devel
@ -297,7 +315,7 @@ BuildRequires: libusb-devel
%endif
# ESOUND support
#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
#define with_esound 1
#BuildRequires: esound-devel
#endif
@ -307,14 +325,14 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel
@ -328,7 +346,7 @@ BuildRequires: openldap24-libs-devel
%endif
# SENSORS support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel}
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel}
BuildRequires: lm_sensors-devel
%endif
%if 0%{?suse_version}
@ -337,12 +355,16 @@ BuildRequires: libsensors4-devel
# TSAK support (requires libudev-devel)
# On RHEL5, udev is built statically, so TSAK cannot build.
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version}
%if 0%{?suse_version} >= 1310
BuildRequires: udev
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%if 0%{?pclinuxos}
BuildRequires: %{_lib}udev1-devel
%else
BuildRequires: %{_lib}udev-devel
%endif
%else
BuildRequires: libudev-devel
%endif
@ -359,13 +381,13 @@ BuildRequires: libacl-devel
# XRANDR support
# On RHEL5, xrandr library is too old.
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define with_xrandr 1
%endif
# XTEST support
# On RHEL4, xtest library is too old.
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xtest 1
%endif
@ -378,9 +400,9 @@ BuildRequires: hal-devel >= 0.5
# OPENEXR support
# Disabled on RHEL4
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_exr 1
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}openexr-devel
%else
BuildRequires: OpenEXR-devel
@ -394,7 +416,7 @@ BuildRequires: OpenEXR-devel
# RHEL 7: available in NUX
# RHEL 8: available in EPEL
# RHEL 9: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5
@ -416,7 +438,7 @@ BuildRequires: xscreensaver-data
BuildRequires: xscreensaver-data-extra
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xscrnsaver-devel
%else
@ -433,21 +455,20 @@ BuildRequires: xscreensaver-gl
# AVAHI support
# Disabled on RHEL4 and RHEL5
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version}
BuildRequires: libavahi-tqt-devel
%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: mesaglu-devel
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
@ -478,7 +499,7 @@ BuildRequires: libart_lgpl-devel
%if 0%{?rhel} == 4
BuildRequires: samba-common
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
%if 0%{?mdkver}
BuildRequires: %{_lib}smbclient-devel
%else
@ -487,7 +508,7 @@ BuildRequires: libsmbclient-devel
%endif
# IMAKE
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1220
BuildRequires: imake
%endif
@ -495,19 +516,19 @@ BuildRequires: imake
%if 0%{?suse_version} == 1140
BuildRequires: xorg-x11-libxkbfile-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1210
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}xkbfile-devel
%else
BuildRequires: libxkbfile-devel
%endif
%if 0%{?fedora} || 0%{?mdkver} || 0%{?rhel} >= 7
%if 0%{?fedora} || 0%{?mdkver} >= 5000000 || 0%{?rhel} >= 7
BuildRequires: xkeyboard-config-devel
%endif
%endif
# XDMCP support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xdmcp-devel
%else
@ -519,7 +540,7 @@ BuildRequires: libXdmcp-devel
%endif
# XTST support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%if 0%{?mgaversion} >= 4
%define xtst_devel %{_lib}xtst-devel
%else
@ -532,7 +553,7 @@ BuildRequires: libXdmcp-devel
%{?xtst_devel:BuildRequires: %{xtst_devel}}
# XDAMAGE support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}xdamage-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
@ -546,7 +567,7 @@ BuildRequires: usbutils
%if 0%{?suse_version} == 1140
BuildRequires: xorg-x11-libfontenc-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1220
BuildRequires: libfontenc-devel
%endif
@ -555,7 +576,7 @@ BuildRequires: libfontenc-devel
BuildRequires: xorg-x11-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: x11-font-util
BuildRequires: x11-proto-devel
%endif
@ -576,17 +597,17 @@ BuildRequires: font-util
BuildRequires: bdftopcf
%endif
%if 0%{?mdkver} < 24090000
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver} < 5000000
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: drakconf
%endif
%endif
# LIBCONFIG support
# Needed for "compton" stuff
%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
%define with_libconfig 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}config-devel
%else
BuildRequires: libconfig-devel
@ -594,12 +615,12 @@ BuildRequires: libconfig-devel
%endif
# KBDLEDSYNC support
%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
%define with_kbdledsync 1
%endif
# TDERANDR support
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
%define with_tderandrtray 1
%endif
@ -621,7 +642,7 @@ BuildRequires: libnsl-devel
%endif
# ATTR support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%define libattr_devel %{_lib}attr-devel
%else
%define libattr_devel libattr-devel
@ -1223,6 +1244,15 @@ plugdev group.
%{tde_tdeappdir}/tdehwdevicetray.desktop
%{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop
# tdesyndaemon
%{tde_bindir}/tdesyndaemon
%{tde_tdeappdir}/touchpad.desktop
%{tde_datadir}/apps/tdeconf_update/remote_folder_icon.upd
%{tde_datadir}/apps/tdeconf_update/remote_folder_icon_upd.sh
%{tde_datadir}/icons/crystalsvg/*/devices/input-touchpad.png
%{tde_datadir}/icons/crystalsvg/scalable/devices/input-touchpad.svg
%{tde_datadir}/services/kded/khotkeys.desktop
# The following features are not compiled under RHEL 5 and older
%if 0%{?with_tderandrtray}
%{tde_bindir}/tderandrtray
@ -1314,8 +1344,6 @@ TDE applications, particularly those in the TDE base module.
%{tde_tdelibdir}/kcminit_startup.so
%{tde_tdelibdir}/kcm_keyboard.la
%{tde_tdelibdir}/kcm_keyboard.so
%{tde_tdelibdir}/kcm_khotkeys_init.la
%{tde_tdelibdir}/kcm_khotkeys_init.so
%{tde_tdelibdir}/kcm_khotkeys.la
%{tde_tdelibdir}/kcm_khotkeys.so
%{tde_tdelibdir}/kded_khotkeys.la
@ -1894,8 +1922,6 @@ group.
%{tde_tdedocdir}/HTML/en/tdeioslave/
%{tde_mandir}/man1/ktrash.1*
%{tde_mandir}/man1/tdeio_media_mounthelper.1*
%{tde_mandir}/man1/tdeio_system_documenthelper.1*
%if 0%{?with_exr}
%{tde_tdelibdir}/exrthumbnail.la
%{tde_tdelibdir}/exrthumbnail.so
@ -2038,7 +2064,7 @@ Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: eject
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
Requires: xdg-utils
%endif
@ -2094,7 +2120,7 @@ Requires: pam
Requires: logrotate
# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 4
Requires: xinitrc
%endif
%if 0%{?suse_version} == 1140
@ -2112,7 +2138,7 @@ Requires: xorg-x11-xinit
Provides: service(graphical-login)
%endif
# Required for Mandriva's installer
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
Provides: dm
Provides: %{tdm}
%endif
@ -2183,15 +2209,15 @@ already. Most users won't need this.
%if 0%{?suse_version} >= 1210
/usr/lib/X11/displaymanagers/
%endif
%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} >= 7
%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?pclinuxos} || 0%{?rhel} >= 7
/usr/lib/systemd/system/tdm.service
%endif
%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} || 0%{?suse_version}
%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%{_datadir}/xsessions/tde.desktop
%endif
# https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%{_sysconfdir}/X11/wmsession.d/45TDE
%{_datadir}/X11/dm.d/45TDE.conf
%endif
@ -2229,7 +2255,7 @@ if [ ! -L "%{tdm_datadir}/pics/users" ] && [ -d "%{tdm_datadir}/pics/users" ] ;
fi
%post -n trinity-tdm
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%make_session
%endif
@ -2276,7 +2302,7 @@ if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then
fi
%postun -n trinity-tdm
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%make_session
%endif
@ -2683,7 +2709,7 @@ ever launching another application.
%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
%if 0%{?mdkver} < 24090000
%if 0%{?mdkver} < 5000000
%ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
%endif
@ -2705,7 +2731,7 @@ ever launching another application.
%{tde_mandir}/man1/kfmclient.1*
%{tde_mandir}/man1/konqueror.1*
%if 0%{?mdkver} < 24090000
%if 0%{?mdkver} < 5000000
%post -n trinity-konqueror
if [ $1 -eq 1 ]; then
@ -2905,8 +2931,8 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess
%endif
%postun -n trinity-ksmserver
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver} < 24090000
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%if 0%{?mdkver} < 5000000
fndSession
%endif
%endif
@ -3407,7 +3433,7 @@ fi
%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320
-DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \
%endif
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver}
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver} || 0%{?pclinuxos}
-DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \
%endif
..
@ -3434,7 +3460,7 @@ fi
# Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
# Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions'
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
NAME=TDE
@ -3457,28 +3483,21 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k"
%if 0%{?mgaversion} >= 6
FNDSESSION_EXEC="/usr/sbin/chksession -l"
%endif
EOF
%endif
EOF
%endif
# PAM configuration files (except openSUSE)
%if 0%{?suse_version} == 0
%if 0%{?mdkver}
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
%else
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
%endif
%endif
# TDM configuration
%__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver}
%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver} || 0%{?pclinuxos}
-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else
-e "s/^#*MinShowUID=.*/MinShowUID=500/"
@ -3493,7 +3512,7 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then
%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
fi
%if 0%{?mdkver} < 24090000
%if 0%{?mdkver} < 5000000
# Makes 'media_safelyremove.desktop' an alternative.
# This allows the use of 'tdeio-umountwrapper' package.
%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"

@ -22,7 +22,7 @@ require {
allow fprintd_t init_t:dbus send_msg;
allow unconfined_service_t unconfined_t:process transition;
allow unconfined_t self:capability2 mac_admin;
allow xdm_t etc_t:file { create rename unlink write };
allow xdm_t etc_t:file { create entrypoint rename unlink write };
allow xdm_t tmp_t:fifo_file { getattr open read setattr unlink };
allow xdm_t tmp_t:file { map open unlink };
allow xdm_t tmp_t:lnk_file unlink;

@ -107,7 +107,7 @@ Requires: evolution28-pango
BuildRequires: evolution28-atk-devel
Requires: evolution28-atk
%else
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gtk+2.0-devel
%else
BuildRequires: gtk2-devel
@ -164,16 +164,15 @@ BuildRequires: gdk-pixbuf-devel
%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: mesaglu-devel
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
@ -698,7 +697,7 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{python_sitearch}/pcop.la
%{python_sitearch}/pcop.so
%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/pydcop.py*
%if 0%{?rhel} == 7
%{python_sitearch}/__pycache__/pydcop.*.pyc
@ -1088,7 +1087,7 @@ exit 2
exit 3
%endif
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
touch config.h.in
%endif
@ -1240,6 +1239,13 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop"
%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
# Move dcoppython to %python_sitearch
if [ ! -d "%{?buildroot}%{python_sitearch}" ] && [ -d "%{?buildroot}%{python_sitelib}" ]; then
%__mkdir_p "%{?buildroot}%{python_sitearch}"
%__mv -f "%{?buildroot}%{python_sitelib}/"{pcop.la,pcop.so,pydcop.py} "%{?buildroot}%{python_sitearch}"
rmdir "%{?buildroot}%{python_sitelib}"
fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -u kjscmd Development

@ -196,30 +196,26 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver} >= 24090000
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: mesaglu-devel
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-Mesa-libGLU
%endif
# DRM support
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%else
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}drm-devel
%else
BuildRequires: libdrm-devel
@ -227,7 +223,7 @@ BuildRequires: libdrm-devel
%endif
# OPENEXR support
%if 0%{?mdkver} >= 24090000
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}openexr-devel
%else
BuildRequires: OpenEXR-devel

@ -112,14 +112,14 @@ BuildRequires: libxslt-devel
%endif
# ALSA support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}asound-devel
%else
BuildRequires: alsa-lib-devel
%endif
# IDN support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}idn-devel
%else
BuildRequires: libidn-devel
@ -129,7 +129,7 @@ BuildRequires: libidn-devel
BuildRequires: cups-devel
# TIFF support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}tiff-devel
%else
BuildRequires: libtiff-devel
@ -143,7 +143,7 @@ BuildRequires: openssl-devel
%endif
# ACL support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}acl-devel
%else
BuildRequires: libacl-devel
@ -164,13 +164,13 @@ BuildRequires: aspell-devel
# GAMIN support
# Not on openSUSE.
%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# PCRE support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version}
%define with_pcre 1
%if 0%{?mgaversion} >= 9
BuildRequires: %{_lib}pcre-devel
@ -179,8 +179,18 @@ BuildRequires: pcre-devel
%endif
%endif
# PCRE2 support
%if 0%{?rhel} >=8 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version}
%define with_pcre2 1
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}pcre2-devel
%else
BuildRequires: pcre2-devel
%endif
%endif
# INOTIFY support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version}
%define with_inotify 1
%endif
@ -192,7 +202,7 @@ BuildRequires: bzip2-devel
%endif
# UTEMPTER support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}utempter-devel
%endif
%if 0%{?rhel} >=5 || 0%{?fedora}
@ -206,18 +216,18 @@ BuildRequires: utempter-devel
%endif
# HSPELL support
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%define with_hspell 1
BuildRequires: hspell-devel
%endif
# JASPER support
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version}
%define with_jasper 1
%if 0%{?suse_version}
BuildRequires: libjasper-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}jasper-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
@ -226,10 +236,10 @@ BuildRequires: jasper-devel
%endif
# AVAHI support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version}
%define with_avahi 1
BuildRequires: libavahi-tqt-devel >= 1:0.6.30
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}avahi-client-devel
Requires: %{_lib}avahi-client3
%endif
@ -240,7 +250,7 @@ Requires: avahi
%endif
# OPENEXR support
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version}
%define with_openexr 1
%if 0%{?mdkver}
BuildRequires: %{_lib}openexr-devel
@ -255,7 +265,7 @@ BuildRequires: libpthread-stubs
# LIBTOOL
BuildRequires: libtool
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}ltdl-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
@ -263,7 +273,7 @@ BuildRequires: libtool-ltdl-devel
%endif
# X11 support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: x11-proto-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
@ -274,7 +284,7 @@ BuildRequires: xorg-x11-devel
%endif
# ICEAUTH
%if 0%{?fedora} >= 34 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1220
%if 0%{?fedora} >= 34 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1220
Requires: iceauth
BuildRequires: iceauth
%endif
@ -290,9 +300,9 @@ BuildRequires: xorg-x11
%endif
# XZ support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
%define with_lzma 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}lzma-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
@ -311,8 +321,8 @@ Requires: ca-certificates
%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
%endif
%endif
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver}
%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} || 0%{?pclinuxos}
%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver} || 0%{?pclinuxos}
Requires: rootcerts
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
%else
@ -335,12 +345,12 @@ Requires: %{cacert}
# XRANDR support
# On RHEL5, xrandr library is too old.
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define with_xrandr 1
%endif
# XCOMPOSITE support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%if 0%{?mgaversion} >= 4
%define xcomposite_devel %{_lib}xcomposite-devel
%else
@ -356,7 +366,7 @@ Requires: %{cacert}
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%define xt_devel libXt-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%define xt_devel %{_lib}xt-devel
%endif
%{?xt_devel:BuildRequires: %{xt_devel}}
@ -364,7 +374,7 @@ Requires: %{cacert}
### New features in TDE R14
# LIBMAGIC support
%if 0%{?mdkver}
%if 0%{?mdkver} || 0%{?pclinuxos}
BuildRequires: %{_lib}magic-devel
%else
%if 0%{?rhel} != 5
@ -373,9 +383,9 @@ BuildRequires: file-devel
%endif
# NETWORKMANAGER support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
%define with_nm 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%if 0%{?mgaversion} && 0%{?mgaversion} <= 7
BuildRequires: %{_lib}nm-util-devel
%endif
@ -393,10 +403,14 @@ BuildRequires: NetworkManager-devel
%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?pclinuxos}
BuildRequires: %{_lib}udev1-devel
%else
BuildRequires: %{_lib}udev-devel
%endif
%else
BuildRequires: libudev-devel
%endif
@ -409,12 +423,10 @@ BuildRequires: libudev-devel
# UDISKS support
%if 0%{?rhel} == 6
%if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310
%define with_udisks 1
BuildRequires: udisks-devel
Requires: udisks
%endif
%endif
# UDISKS2 support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
@ -427,11 +439,11 @@ Requires: udisks
%define udisks2 udisks2
%define udisks2_devel libudisks2-0-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mgaversion} || 0%{?pclinuxos}
%define udisks2 udisks2
%define udisks2_devel udisks2-devel
%endif
%if 0%{?mdkver}
%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
%define udisks2 udisks
%define udisks2_devel %{_lib}udisks-devel
%endif
@ -504,6 +516,12 @@ BuildRequires: %{libattr_devel}
# INTLTOOL support
BuildRequires: intltool
# WEBP support
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}webp-devel
%else
BuildRequires: libwebp-devel
%endif
%description
Libraries for the Trinity Desktop Environment:
@ -743,6 +761,7 @@ fi
%{?!with_avahi:-DWITH_AVAHI=OFF} \
%{?!with_elficon:-DWITH_ELFICON=OFF} \
%{?!with_pcre:-DWITH_PCRE=OFF} \
%{?!with_pcre2:-DWITH_PCRE2=OFF} \
%{?!with_inotify:-DWITH_INOTIFY=OFF} \
%{?!with_gamin:-DWITH_GAMIN=OFF} \
%{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \

@ -117,7 +117,11 @@ BuildRequires: cdparanoia
# VORBIS support
%if 0%{?mdkver} || 0%{?mgaversion}
%if 0%{?pclinuxos}
%define libvorbis_devel %{_lib}vorbis0-devel
%else
%define libvorbis_devel %{_lib}vorbis-devel
%endif
%else
%define libvorbis_devel libvorbis-devel
%endif
@ -131,7 +135,7 @@ BuildRequires: libtheora-devel
%endif
# ALSA support
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}asound-devel
%else
BuildRequires: alsa-lib-devel
@ -167,7 +171,7 @@ BuildRequires: flac-devel
# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gstreamer-devel
BuildRequires: %{_lib}gst-plugins-base1.0-devel
%else
@ -210,7 +214,7 @@ BuildRequires: libXxf86vm-devel
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel

@ -150,7 +150,7 @@ BuildRequires: glib2-devel
# SASL support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}sasl-devel
%else
BuildRequires: %{_lib}sasl2-devel

@ -121,7 +121,7 @@ BuildRequires: libdb-4_8-devel
# kbabel, F-7+: flex >= 2.5.33-9
BuildRequires: flex
%if 0%{?mdkver}
%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
BuildRequires: flex-devel
%endif
# umbrello

@ -137,7 +137,7 @@ BuildRequires: neon-devel
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel
@ -153,7 +153,7 @@ BuildRequires: openldap24-libs-devel
# LIBACL support
%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
# ACL support
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}acl-devel
%else
BuildRequires: libacl-devel

@ -73,8 +73,12 @@ BuildRequires: trinity-filesystem >= %{tde_version}
# FLAC support
%define _with_flac --with-flac
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
BuildRequires: %{_lib}flac12-devel
%else
BuildRequires: %{_lib}flac-devel
%endif
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: flac-devel
%endif
@ -91,7 +95,7 @@ BuildRequires: jack-audio-connection-kit-devel
%endif
# SAMPLERATE support
%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version}
%define _with_libsamplerate --with-libsamplerate
%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: %{_lib}samplerate-devel
@ -130,7 +134,7 @@ BuildRequires: libmad-devel
%if 0%{?suse_version}
BuildRequires: alsa-devel
%else
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}asound-devel
%else
BuildRequires: alsa-lib-devel
@ -139,7 +143,11 @@ BuildRequires: alsa-lib-devel
# VORBIS support
%if 0%{?mdkver} || 0%{?mgaversion}
%if 0%{?pclinuxos}
%define libvorbis_devel %{_lib}vorbis0-devel
%else
%define libvorbis_devel %{_lib}vorbis-devel
%endif
%else
%define libvorbis_devel libvorbis-devel
%endif

@ -77,14 +77,18 @@ BuildRequires: gsl-devel
# VORBIS support
%if 0%{?mdkver} || 0%{?mgaversion}
%if 0%{?pclinuxos}
%define libvorbis_devel %{_lib}vorbis0-devel
%else
%define libvorbis_devel %{_lib}vorbis-devel
%endif
%else
%define libvorbis_devel libvorbis-devel
%endif
BuildRequires: %{libvorbis_devel}
# ALSA support
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
%define alsa_devel %{_lib}asound-devel
%else
%define alsa_devel alsa-lib-devel

@ -60,7 +60,7 @@ BuildRequires: libtool
BuildRequires: fdupes
# GTK2 support
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gtk+2.0-devel
%else
%if 0%{?rhel} == 4

@ -73,7 +73,7 @@ BuildRequires: libtool
%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
# GTK2 support
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gtk+2.0-devel
%else
%if 0%{?rhel} == 4

@ -83,16 +83,15 @@ BuildRequires: %{python}
BuildRequires: %{python}-devel
# MESA support
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: mesaglu-devel
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
@ -146,7 +145,7 @@ same way in both languages (with syntax differences, of course)
%defattr(-,root,root,-)
%doc NEWS README
%dir %{python_sitearch}/PyTQt
%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/PyTQt/__init__.py*
%if 0%{?rhel} == 7
%{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc
@ -236,7 +235,7 @@ packages based on them, like PyTDE.
%files -n pytqt-devel
%defattr(-,root,root,-)
%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/PyTQt/pytqtconfig.py*
%if 0%{?rhel} == 7
%{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc

@ -113,7 +113,7 @@ specificity towards C++ and Python.
%files -n sip4-tqt
%defattr(-,root,root,-)
%{python_sitearch}/sip_tqt.so
%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/sip_tqt_config.py*
%{python_sitearch}/sip_tqt_distutils.py*
%if 0%{?rhel} == 7

@ -128,7 +128,7 @@ BuildRequires: cups-devel
# LIBAUDIO support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_nas 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mdkver} >= 5000000
%define libaudio_devel %{_lib}audio-devel nas-devel
%else
%define libaudio_devel nas-devel
@ -260,20 +260,15 @@ BuildRequires: xorg-x11-proto-devel
%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?pclinuxos}
BuildRequires: MesaGLU-devel
%else
%if 0%{?mdkver}
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: mesaglu-devel
%endif
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel

@ -75,7 +75,7 @@ BuildRequires: pkgconfig
# PTHREAD support
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mgaversion} >= 7 || 0%{?mdkver}
%if 0%{?mgaversion} >= 7 || 0%{?mdkversion}
BuildRequires: %{_lib}npth-devel
%else
BuildRequires: pth-devel
@ -92,16 +92,15 @@ BuildRequires: libpth-devel
%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: mesaglu-devel
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel

@ -7,6 +7,7 @@ ARCH="$3"
[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2"
[ -z "${ARCH}" ] && ARCH="x86_64"
[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
FILE="${HOME}/tde/docker/${IMAGE}.tar.gz"
@ -20,11 +21,11 @@ else
echo "Building new Docker image '${IMAGE}'."
${DOCKER} build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}"
echo "Saving image to '${FILE}'"
${DOCKER} image save "${IMAGE}" | pigz >"${FILE}"
${DOCKER} image save "${IMAGE}" | ${GZIP} >"${FILE}"
fi
# Strip 'localhost/' prefix from image tag
if ! docker images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then
docker image tag "localhost/${IMAGE}" "${IMAGE}"
#docker image remove "localhost/${IMAGE}"
if ! ${DOCKER} images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then
${DOCKER} image tag "localhost/${IMAGE}" "${IMAGE}"
#${DOCKER} image remove "localhost/${IMAGE}"
fi

@ -8,11 +8,14 @@ ARG ARCH=x86_64
# Add RPMFUSION repository
# Install Trinity build dependencies
COPY packages /packages
RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
&& yum -y install epel-release \
&& rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm \
RUN set -x \
&& cd /etc/yum.repos.d \
&& rm -fv *.repo \
&& curl http://repo/repo/{centos7,epel7,rpmfusion7}.repo >repos.repo \
&& sed -i "repos.repo" -e "s|https://|http://|" \
&& yum -y clean all \
&& yum -y update \
&& rm -fv {CentOS,epel}-*.repo \
&& yum -y install $(</packages)
# Add YUM repository for locally built packages
@ -48,3 +51,14 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin
RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm
#RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \
# && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \
# && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/%forgeautosetup/ s|.*|%autosetup -p1 -n libunibreak-libunibreak_6_1|" -e "s|%forgesource|libunibreak-libunibreak_6_1.tar.gz|" \
# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec --define "forgemeta %nil" \
# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm
RUN set -x \
&& rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/39/Everything/source/tree/Packages/l/libunibreak-4.0-13.fc39.src.rpm --define "ldconfig_scriptlets %post -p /sbin/ldconfig" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{4,devel}*.rpm

@ -133,6 +133,7 @@ libutempter-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwebp-devel
libwmf-devel
libwpd-devel
libXaw-devel
@ -167,6 +168,7 @@ opensp-devel
pam-devel
pciutils-devel
pcre-devel
pcre2-devel
pcsc-lite-devel
pcsc-perl
perl

@ -91,6 +91,7 @@ libconfig-devel
libcurl-devel
libdb-devel
libdb-cxx-devel
libdrm-devel
libdvdread-devel
libfontenc-devel
libgpod-devel
@ -130,6 +131,7 @@ libutempter-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwebp-devel
libwmf-devel
libwpd-devel
libXaw-devel
@ -148,6 +150,7 @@ libudisks2-devel
libusb-devel
lirc-devel
lm_sensors-devel
mesa-libGL-devel
mysql-devel
neon-devel
netpbm-progs

@ -99,3 +99,8 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin
RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm

@ -128,6 +128,7 @@ libuuid-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwebp-devel
libwmf-devel
libwpd-devel
libXaw-devel

@ -135,6 +135,7 @@ libtool
libtool-ltdl-devel
libudev-devel
libudisks2-devel
libunibreak-devel
libusb-compat-0.1-devel
libusb1-devel
libutempter-devel
@ -143,6 +144,7 @@ libv4l-devel
libvisual-devel
libvncserver-devel
libvorbis-devel
libwebp-devel
libwmf-devel
libwpd-devel
libXaw-devel

@ -135,6 +135,7 @@ libtool
libtool-ltdl-devel
libudev-devel
libudisks2-devel
libunibreak-devel
libusb-compat-0.1-devel
libusb1-devel
libutempter-devel

@ -133,6 +133,7 @@ libtool
libtool-ltdl-devel
libudev-devel
libudisks2-devel
libunibreak-devel
libusb-compat-0.1-devel
libusb1-devel
libutempter-devel

@ -5,6 +5,7 @@ VERSION="${1:-9}" # E.g: '9'
IMAGE="${NAME}:${VERSION}"
INSTALLROOT="/dev/shm/${IMAGE}"
ARCH="x86_64"
[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip
sudo rm -rf "${INSTALLROOT}"
sudo mkdir -p "${INSTALLROOT}"
@ -29,6 +30,6 @@ sudo rm -rf "${INSTALLROOT}"
docker rmi -f "${IMAGE}"
docker import "${FILE}" "${IMAGE}"
pigz "${FILE}"
${GZIP} "${FILE}"
mkdir -p "${HOME}/tde/docker"
mv -fv "${FILE}.gz" "${HOME}/tde/docker"

@ -139,6 +139,7 @@ libpx-devel
libqalculate-devel
libraw1394-devel
librsvg
librsvg2-devel
libsane1-devel
libsmbclient-devel
libsm-devel
@ -150,6 +151,7 @@ libtiff-devel
libtwolame-devel
libudev-devel
libungif-devel
libunibreak-devel
libusb1.0-devel
libutempter
libutempter0
@ -157,6 +159,7 @@ libutempter-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwebp-devel
libwmf-devel
libwpd-devel
libx11-devel

@ -102,15 +102,18 @@ lib64pcre-devel
lib64pkcs11-helper-devel
lib64poppler-devel
lib64pulseaudio-devel
lib64rsvg2-devel
lib64sane1-devel
lib64t1lib-devel
lib64tiff-devel
lib64twolame-devel
lib64udev-devel
lib64unibreak-devel
lib64usb1.0-devel
lib64utempter0
lib64utempter-devel
lib64v4l-devel
lib64webp-devel
lib64xaw-devel
lib64xdg-basedir-devel
lib64xi-devel

@ -26,7 +26,9 @@ USER trinity
COPY rpmmacros /home/trinity/.rpmmacros
RUN set -x \
&& rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \
&& rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdesktop-1.9.0-6.mga9.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/rdesktop.spec -e "s|%{_rpmconfigdir}/%{_real_vendor}|/usr/share/libtool/config|" \
&& rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
RUN set -x \
@ -63,3 +65,7 @@ RUN set -x \
&& sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \
&& rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
RUN set -x \
&& rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/wireless-tools-30-0.pre9.14.mga9.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib64iw{30,-devel}-30*.rpm

@ -60,6 +60,7 @@ java-1.8.0-openjdk
java-1.8.0-openjdk-devel
java-devel
kde-dev-scripts
ladspa-devel
less
lib64acl-devel
lib64alsa-oss-devel
@ -101,6 +102,7 @@ lib64gpg-error-devel
lib64gphoto-devel
lib64gpod-devel
lib64graphicsmagick-devel
lib64gsf-1-devel
lib64gstreamer-devel
lib64gst-plugins-base1.0-devel
lib64gtk+2.0-devel
@ -166,6 +168,7 @@ lib64tirpc-devel
lib64twolame-devel
lib64udev-devel
lib64udisks-devel
lib64unibreak-devel
lib64usb-compat0.1-devel
lib64usb1.0-devel
lib64utempter0
@ -183,10 +186,13 @@ lib64xkbfile-devel
lib64xscrnsaver-devel
lib64xslt-devel
lib64xtst-devel
lib64xv-devel
lib64xxf86dga-devel
lib64xxf86vm-devel
lib64wrap-devel
librsvg
libwebp-devel
libxt-devel
lm_sensors-devel
mysql-devel
nas-devel
@ -217,7 +223,9 @@ perl(Tk)
perl(XML::Parser)
pilot-link-devel
pinentry-gtk2
pkgconfig(ao)
pkgconfig(audiofile)
pkgconfig(libgssglue)
pkgconfig(libpng16)
postgresql
postgresql-devel

@ -26,7 +26,9 @@ USER trinity
COPY rpmmacros /home/trinity/.rpmmacros
RUN set -x \
&& rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \
&& rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdesktop-1.9.0-6.mga9.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/rdesktop.spec -e "s|%{_rpmconfigdir}/%{_real_vendor}|/usr/share/libtool/config|" \
&& rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec --define "mkrel %nil" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
RUN set -x \
@ -34,9 +36,9 @@ RUN set -x \
&& rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm
#RUN set -x \
# && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --define "mkrel %nil" --nodeps \
# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm
RUN set -x \
&& rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.34.2-1.mga10.src.rpm --define "mkrel %nil" --nodeps \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm
RUN set -x \
&& rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \
@ -63,3 +65,9 @@ RUN set -x \
&& sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \
&& rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "mkrel %nil" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
RUN set -x \
&& rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/wireless-tools-30-0.pre9.14.mga9.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s/%patch/%patch -P /" \
&& rpmbuild -bb ${HOME}/rpmbuild/SPECS/wireless-tools.spec --define "mkrel %nil" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib64iw{30,-devel}-30*.rpm

@ -166,6 +166,7 @@ lib64tirpc-devel
lib64twolame-devel
lib64udev-devel
lib64udisks-devel
lib64unibreak-devel
lib64usb-compat0.1-devel
lib64usb1.0-devel
lib64utempter0
@ -187,6 +188,9 @@ lib64xxf86dga-devel
lib64xxf86vm-devel
lib64wrap-devel
librsvg
libwebp-devel
libxt-devel
libxv-devel
lm_sensors-devel
mysql-devel
nas-devel
@ -217,7 +221,9 @@ perl(Tk)
perl(XML::Parser)
pilot-link-devel
pinentry-gtk2
pkgconfig(ao)
pkgconfig(audiofile)
pkgconfig(libgssglue)
pkgconfig(libpng16)
postgresql
postgresql-devel

@ -17,6 +17,8 @@ fi
IMAGE="${NAME}:latest"
INSTALLROOT="/dev/shm/${IMAGE}"
[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip
for dir in dev proc sys; do
if [ -d "${INSTALLROOT}/${dir}" ]; then
umount "${INSTALLROOT}/${dir}"
@ -81,6 +83,6 @@ rm -rf "${INSTALLROOT}"
docker rmi -f "${IMAGE}"
docker import "${FILE}" "${IMAGE}"
pigz "${FILE}"
${GZIP} "${FILE}"
mkdir -p "/home/${SUDO_USER}/tde/docker"
mv -fv "${FILE}.gz" "/home/${SUDO_USER}/tde/docker"

@ -137,9 +137,11 @@ libtwolame-devel
libudev1
libudisks2-0-devel
libuuid-devel
libunibreak-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwebp-devel
libwmf-devel
libwpd-devel
libXaw-devel

@ -26,14 +26,14 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
# Install heimdal development files
RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \
RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-4.1.src.rpm \
&& wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \
&& sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \
&& setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
&& LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
&& sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install
# Add lilypond (i686 only)
RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.3-1.5.src.rpm \
RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.2.src.rpm \
&& sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \
&& setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \
&& sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm"

@ -26,10 +26,10 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
# Install heimdal development files
RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \
RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-4.1.src.rpm \
&& wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \
&& sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \
&& export ac_cv_sys_large_files=no \
&& export ac_cv_sys_file_offset_bits=no \
&& rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
&& LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
&& sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install

@ -137,10 +137,12 @@ libtool
libtwolame-devel
libudev-devel
libudisks2-0-devel
libunibreak-devel
libuuid-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwebp-devel
libwmf-devel
libwpd-devel
libXaw-devel

@ -4,6 +4,7 @@ NAME="pclinuxos"
VERSION="${1:-2024}" # E.g: '2020'
IMAGE="${NAME}:${VERSION}"
INSTALLROOT="/dev/shm/${IMAGE}"
[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip
grep -qw "${INSTALLROOT}/dev" /proc/mounts && sudo umount "${INSTALLROOT}/dev"
sudo rm -rf "${INSTALLROOT}"
@ -50,4 +51,4 @@ sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}"
docker run -ti --rm "${IMAGE}" ls -l
sudo rm -rf "${INSTALLROOT}"
docker image save "${IMAGE}" | pigz -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz"
docker image save "${IMAGE}" | ${GZIP} -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz"

@ -56,7 +56,7 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM
&& 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 \
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/heimdal-7.8.0-2.mga9.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%autopatch|%patch1|" -e "/Conflicts: krb5-devel/ s|^|#|" \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \
&& echo sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm
&& LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm

@ -33,6 +33,7 @@ fribidi-devel
gamin-devel
gcc-c++
gettext-devel
ghostscript
glib2-devel
gnokii-devel
gnutls-devel
@ -70,18 +71,23 @@ lib64iw29-devel
lib64jack-devel
lib64nm-devel
lib64mpcdec-devel
lib64nas-devel
lib64npth-devel
lib64OpenSP5-devel
lib64pcsclite-devel
lib64pkcs11-helper-devel
lib64polkit1-devel
lib64poppler-devel
lib64readline-devel
lib64rsvg2-devel
lib64sane1-devel
lib64sndfile-devel
lib64ssh-devel
lib64udev1-devel
lib64unwind-devel
lib64usb1.0-devel
lib64usb-compat0.1-devel
lib64webp-devel
lib64wv2-devel
lib64xaw-devel
lib64xine1.2-devel
@ -159,6 +165,7 @@ mysql-devel
nas-devel
neon-devel
net-snmp-devel
netpbm
ocaml
OpenEXR-devel
openldap-devel

@ -1,7 +1,10 @@
%dist .pclos
%dist .pclos2024
%_smp_mflags -j8
%jobs 8
%pclinuxos 2022
%pclinuxos 2024
%configure %configure2_5x
%python python3
%__python /usr/bin/python3
%_vpath_builddir .
%python_sitearch %python3_sitearch
%python_sitelib %python3_sitelib

@ -116,10 +116,14 @@ Libraries needed to develop for htdig.
%defattr(-,root,root)
%doc ChangeLog
%doc htdoc/*
%if 0%{?mdkver} < 5000000
%{_libdir}/htdig/*.a
%endif
%{_libdir}/htdig/*.la
%{_libdir}/htdig/*[a-z].so
%if 0%{?mdkver} < 5000000
%{_libdir}/htdig_db/*.a
%endif
%{_libdir}/htdig_db/*.la
%{_libdir}/htdig_db/*[a-z].so
%{_includedir}/*

@ -17,7 +17,7 @@
Name: pinentry-tqt
Version: 1.3.0
Version: 1.3.1
Release: 1%{?dist}
Summary: PIN or passphrase entry dialogs
Group: System/Libraries

@ -49,7 +49,7 @@ Source0: trinity-3.5.13-fedora.repo
Source1: trinity-3.5.13-rhel.repo
Source2: RPM-GPG-KEY-trinity
%if 0%{?fedora} >= 32 || 0%{?mgaversion} >= 7 || 0%{?pclinuxos} || 0%{?rhel} >= 8 || 0%{?suse_version}
%if 0%{?fedora} >= 32 || 0%{?mdkver} >= 5000000 || 0%{?mgaversion} >= 7 || 0%{?pclinuxos} || 0%{?rhel} >= 8 || 0%{?suse_version}
Requires: pinentry-tqt
%endif
Requires: trinity-tdeaccessibility >= %{version}
@ -206,6 +206,7 @@ Requires: trinity-smartcardauth
Requires: trinity-soundkonverter
Requires: trinity-tastymenu
Requires: trinity-tdebluez
Requires: trinity-tde-ebook-reader
Requires: trinity-tde-guidance
Requires: trinity-tde-style-baghira
Requires: trinity-tde-style-domino
@ -240,6 +241,7 @@ Requires: trinity-twin-style-crystal
Requires: trinity-twin-style-dekorator
Requires: trinity-twin-style-fahrenheit
Requires: trinity-twin-style-machbunt
Requires: trinity-twin-style-mallory
Requires: trinity-twin-style-suse2
Requires: trinity-wlassistant
Requires: trinity-yakuake

@ -140,20 +140,15 @@ BuildRequires: libxslt-devel
%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?pclinuxos}
BuildRequires: MesaGLU-devel
%else
%if 0%{?mdkver}
BuildRequires: %{_lib}glu-devel
%else
BuildRequires: mesaglu-devel
%endif
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel

@ -78,7 +78,7 @@ BuildRequires: libtool-ltdl-devel
# SASL support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}sasl-devel
%else
BuildRequires: %{_lib}sasl2-devel
@ -90,7 +90,7 @@ BuildRequires: cyrus-sasl-devel
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?mdkver}
%if 0%{?mdkver} >= 5000000
BuildRequires: lib64ldap-devel
%else
BuildRequires: openldap-devel
@ -115,7 +115,11 @@ BuildRequires: libheimdal-devel
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?pclinuxos}
BuildRequires: %{_lib}udev1-devel
%else
BuildRequires: %{_lib}udev-devel
%endif
%else
BuildRequires: libudev-devel
%endif

@ -93,7 +93,7 @@ from tdeio, tdejs, tdehtml and tdeprint.
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{python_sitearch}/*.so
%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/dcopexport.py*
%{python_sitearch}/dcopext.py*
%{python_sitearch}/pytdeconfig.py*

Loading…
Cancel
Save