RPM: update build scripts for Fedora 33 / CentOS 8

pull/92/head
François Andriot 4 years ago
parent 91820d56fc
commit 24c06ffc5b

@ -27,7 +27,7 @@ all: dependencies main libraries applications i18n meta
dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt
main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev main: 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 python-trinity libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
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 klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice 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 potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio 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 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 klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice 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 potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio 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 wlassistant yakuake
i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kmpose koverartist kpacman png2qrgb extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kmpose koverartist kpacman png2qrgb
@ -185,7 +185,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151))
endif endif
wv2: wv2:
ifneq (,$(filter $(DIST), .el6 .el7 .el8 .fc30 .fc31 .fc32 )) ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 ))
$(call buildpkg,3rdparty/wv2) $(call buildpkg,3rdparty/wv2)
endif endif
@ -262,12 +262,14 @@ fusion-icon: tdebase
$(call buildpkg,applications/fusion-icon) $(call buildpkg,applications/fusion-icon)
gtk3-tqt-engine: tdebase gtk3-tqt-engine: tdebase
ifeq (,$(filter $(DIST),.el6)) ifeq (,$(filter $(DIST),.el5 .el6))
$(call buildpkg,applications/gtk3-tqt-engine) $(call buildpkg,applications/gtk3-tqt-engine)
endif endif
gtk-qt-engine: tdebase gtk-qt-engine: tdebase
ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/gtk-qt-engine) $(call buildpkg,applications/gtk-qt-engine)
endif
gwenview: tdebase gwenview: tdebase
$(call buildpkg,applications/gwenview) $(call buildpkg,applications/gwenview)
@ -344,7 +346,7 @@ keep: tdebase rdiff-backup
kerberostray: tdebase kerberostray: tdebase
$(call buildpkg,applications/kerberostray) $(call buildpkg,applications/kerberostray)
keximdb: tdebase keximdb: tdebase koffice
$(call buildpkg,applications/keximdb) $(call buildpkg,applications/keximdb)
kftpgrabber: tdebase kftpgrabber: tdebase
@ -487,6 +489,9 @@ piklab: tdebase
potracegui: tdebase potracegui: tdebase
$(call buildpkg,applications/potracegui) $(call buildpkg,applications/potracegui)
qalculate-tde:
$(call buildpkg,applications/qalculate-tde)
qt4-tqt-theme-engine: tdebase qt4-tqt-theme-engine: tdebase
ifeq (,$(filter $(DIST),.el5 .el6 .el8 .osstw)) ifeq (,$(filter $(DIST),.el5 .el6 .el8 .osstw))
$(call buildpkg,applications/qt4-tqt-theme-engine) $(call buildpkg,applications/qt4-tqt-theme-engine)
@ -531,7 +536,7 @@ tdeio-umountwrapper: tdebase
$(call buildpkg,applications/tdeio-umountwrapper) $(call buildpkg,applications/tdeio-umountwrapper)
tdenetworkmanager: tdebase tdenetworkmanager: tdebase
ifeq (,$(filter $(DIST),.el6)) ifeq (,$(filter $(DIST),.el5 .el6))
$(call buildpkg,applications/tdenetworkmanager) $(call buildpkg,applications/tdenetworkmanager)
endif endif
@ -539,7 +544,9 @@ tdepacman: tdebase
$(call buildpkg,applications/tdepacman) $(call buildpkg,applications/tdepacman)
tdepowersave: tdebase tdepowersave: tdebase
ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/tdepowersave) $(call buildpkg,applications/tdepowersave)
endif
tderadio: tdebase tderadio: tdebase
$(call buildpkg,applications/tderadio) $(call buildpkg,applications/tderadio)

@ -60,6 +60,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: trinity-tdepim-devel >= %{tde_version} BuildRequires: trinity-tdepim-devel >= %{tde_version}
BuildRequires: trinity-kontact-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gpgme-devel BuildRequires: gpgme-devel

@ -351,7 +351,11 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-rpath \ --enable-rpath \
--disable-gcc-hidden-visibility \ --disable-gcc-hidden-visibility \
\ \
%if 0%{?rhel} == 5
--with-included-sqlite3
%else
--without-included-sqlite3 --without-included-sqlite3
%endif
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make

@ -131,7 +131,7 @@ BuildRequires: libudev-devel
# HAL support # HAL support
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
%define with_hal 1 %define with_hal 0
BuildRequires: hal-devel BuildRequires: hal-devel
%endif %endif
@ -451,6 +451,9 @@ fi
-DWITH_MUSEPACK="ON" \ -DWITH_MUSEPACK="ON" \
-DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \ -DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \
-DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \ -DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \
%if 0%{?rhel} == 5
-DWITH_HAL="ON" \
%endif
.. ..
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make

@ -109,7 +109,7 @@ BuildRequires: libudev-devel
%endif %endif
# LIBCOM_ERR support # LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
BuildRequires: libcom_err-devel BuildRequires: libcom_err-devel
%endif %endif
%if 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?mdkversion} || 0%{?mgaversion}

@ -106,7 +106,7 @@ BuildRequires: libudev-devel
%endif %endif
# LIBCOM_ERR support # LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
BuildRequires: libcom_err-devel BuildRequires: libcom_err-devel
%endif %endif
%if 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?mdkversion} || 0%{?mgaversion}

@ -153,13 +153,14 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
%find_lang %{tde_pkg}_plugin %find_lang %{tde_pkg}_plugin
cat "%{tde_pkg}_plugin.lang" >>"%{tde_pkg}.lang"
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files -f %{tde_pkg}.lang -f %{tde_pkg}_plugin.lang %files -f %{tde_pkg}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING %doc AUTHORS COPYING
%{tde_bindir}/kdiff3 %{tde_bindir}/kdiff3

@ -106,7 +106,7 @@ BuildRequires: libudev-devel
%endif %endif
# LIBCOM_ERR support # LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
BuildRequires: libcom_err-devel BuildRequires: libcom_err-devel
%endif %endif
%if 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?mdkversion} || 0%{?mgaversion}

@ -96,8 +96,10 @@ BuildRequires: flex
%endif %endif
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
BuildRequires: flex BuildRequires: flex
%if 0%{?rhel} != 5
BuildRequires: flex-devel BuildRequires: flex-devel
%endif %endif
%endif
# PILOT support # PILOT support
BuildRequires: pilot-link-devel >= 0.12 BuildRequires: pilot-link-devel >= 0.12

@ -15,10 +15,6 @@
# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # Please submit bugfixes or comments via http://www.trinitydesktop.org/
# #
%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
%global debug_package %{nil}
%endif
# TDE variables # TDE variables
%define tde_epoch 2 %define tde_epoch 2
%if "%{?tde_version}" == "" %if "%{?tde_version}" == ""
@ -59,7 +55,6 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: scons-local-2.5.1.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
@ -80,19 +75,7 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity BuildRequires: brp-check-trinity
%endif %endif
#BuildRequires: scons BuildRequires: cmake
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%global python python
%endif
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
%description %description
@ -112,23 +95,49 @@ you with managing/ripping your preferred streams.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -a 1 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__rm -f kde.py
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export QTDIR=/usr
%__python ./scons.py configure prefix="%{_prefix}" if ! rpm -E %%cmake|grep -q "cd build"; then
%__python ./scons.py %{?_smp_mflags} %__mkdir_p build
cd build
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_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}" \
-DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
-DWITH_NVCONTROL=OFF \
\
-DBUILD_ALL=ON \
-DBUILD_DOC=ON \
-DBUILD_TRANSLATIONS=ON \
\
..
%__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
DESTDIR="%{?buildroot}" %__python ./scons.py install %__make install DESTDIR=%{buildroot} -C build
# Missing icon file will make this fail. # Missing icon file will make this fail.
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
@ -138,17 +147,21 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%suse_update_desktop_file kstreamripper Audio Recorder %suse_update_desktop_file kstreamripper Audio Recorder
%endif %endif
%find_lang %{tde_pkg}
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files %files -f %{tde_pkg}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/kstreamripper %{tde_bindir}/kstreamripper
%{tde_tdeappdir}/kstreamripper.desktop %{tde_tdeappdir}/kstreamripper.desktop
%{tde_datadir}/apps/kstreamripper/ %{tde_datadir}/apps/kstreamripper/
%{tde_datadir}/icons/hicolor/*/apps/kstreamripper.png
%{tde_tdedocdir}/HTML/en/kstreamripper/ %{tde_tdedocdir}/HTML/en/kstreamripper/
%{tde_mandir}/man*/kstreamripper.*
%changelog %changelog

@ -94,6 +94,14 @@ Requires: avahi
%endif %endif
%endif %endif
# GEOIP
%if 0%{?suse_version}
%if 0%{?suse_version} < 1550
BuildRequires: libGeoIP-devel
%endif
%else
BuildRequires: geoip-devel
%endif
%description %description
KTorrent is a BitTorrent program for Trinity. Its features include speed capping KTorrent is a BitTorrent program for Trinity. Its features include speed capping

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Summary: Mathemagics is a RPN Calculator. Summary: Mathemagics is a RPN Calculator.
Version: 1.1 Version: 1.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: Applications/Utilities Group: Applications/Utilities
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/

@ -68,7 +68,7 @@ BuildRequires: libtool
BuildRequires: libqalculate-devel >= 0.9.6 BuildRequires: libqalculate-devel >= 0.9.6
%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 %if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?rhel}
BuildRequires: cln-devel BuildRequires: cln-devel
%endif %endif
%if 0%{?pclinuxos} >= 2018 %if 0%{?pclinuxos} >= 2018
@ -109,9 +109,6 @@ This package contains the TDE user interface of qalculate.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Fix build on r14.0.x
%__sed -i *"/Makefile.am" -e "s|\$(LIB_TQT)|-ltqt-mt|"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common" %__make -f "admin/Makefile.common"
@ -139,10 +136,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-rpath \ --enable-rpath \
--disable-gcc-hidden-visibility --disable-gcc-hidden-visibility
%if 0%{?mgaversion} >= 6
%__sed -i "src/Makefile" -e "s|-Wl,--no-undefined||"
%endif
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make

@ -170,6 +170,11 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build %__make install DESTDIR=%{buildroot} -C build
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdedocker.desktop Utility DesktopUtility
%endif
%find_lang %{tde_pkg} %find_lang %{tde_pkg}

@ -43,7 +43,7 @@
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Summary: A pacman game for the Trinity Desktop Summary: A pacman game for the Trinity Desktop
Version: 0.3.2 Version: 0.3.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities

@ -90,7 +90,7 @@ BuildRequires: libudev-devel
%define with_xscreensaver 1 %define with_xscreensaver 1
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-screensaver #BuildRequires: gnome-screensaver
%endif %endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4 %if 0%{?mgaversion} >= 4

@ -313,6 +313,9 @@ fi
-DWITH_LIBKCAL=ON \ -DWITH_LIBKCAL=ON \
-DWITH_LIBBTPARSE=OFF \ -DWITH_LIBBTPARSE=OFF \
-DWITH_SAX_LOADER=ON \ -DWITH_SAX_LOADER=ON \
%if 0%{?rhel} == 5
-DBUILD_WEBCAM_SUPPORT=OFF \
%endif
.. ..
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make

@ -181,28 +181,20 @@ export PATH="%{tde_bindir}:${PATH}"
%suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network %suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network
%endif %endif
%find_lang %{tde_pkg}
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files %files -f %{tde_pkg}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ChangeLog VERSION %doc ChangeLog VERSION
%{tde_bindir}/wlassistant %{tde_bindir}/wlassistant
%{tde_tdeappdir}/wlassistant.desktop %{tde_tdeappdir}/wlassistant.desktop
%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png %{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png %{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
%changelog %changelog

@ -13,7 +13,7 @@ EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)"
RET="" RET=""
for dir in "${TARBALLS_DIR}" "${EXTRA_DIR}" "${DIST_PACKAGING_DIR}"; do for dir in "${TARBALLS_DIR}" "${EXTRA_DIR}" "${DIST_PACKAGING_DIR}"; do
for v in "${PKGNAME}-${TDE_VERSION}*.tar.*" "trinity-${PKGNAME}-${TDE_VERSION}*.tar.*" "${PKGNAME}[-_][0-9]*.tar.*"; do for v in "${PKGNAME}-${TDE_VERSION}*.tar.*" "trinity-${PKGNAME}-${TDE_VERSION}*.tar.*" "${PKGNAME}[-_][0-9]*.tar.*"; do
RET=$(find "${dir}" -follow -type f -name ${v} | sort -V | tail -n 1) RET=$(find "${dir}" -follow -type f -name ${v} | sort | tail -n 1)
[ -r "${RET}" ] && break [ -r "${RET}" ] && break
done done
[ -r "${RET}" ] && echo "${RET}" && break [ -r "${RET}" ] && echo "${RET}" && break

@ -87,7 +87,7 @@ if [ -n "${DEVEL}" ]; then
# Some other packags NOT having development package # Some other packags NOT having development package
case "${PKGNAME}" in case "${PKGNAME}" in
"autoconf"|"automake"|"cmake"|"cscope"|"gnuchess"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;; "autoconf"|"automake"|"brp-check-trinity"|"cmake"|"cscope"|"gnuchess"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;;
"tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;; "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;;
esac esac

@ -1,6 +1,6 @@
FROM centos32:5 FROM centos32:5
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=i686 ARG ARCH=i686
# Add local repositories # Add local repositories

@ -1,33 +1,85 @@
FROM centos:5 FROM centos:5
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add local repositories # Add local repositories
RUN rm -f /etc/yum.repos.d/*.repo COPY packages /packages
ADD centos-5.repo /etc/yum.repos.d/centos-5.repo RUN rpm -Uvh http://repo/repo/archives/centos/5/os/x86_64/CentOS/{curl-7.15.5-17.el5_9,libidn-0.6.5-1.1}.x86_64.rpm \
ADD epel-5.repo /etc/yum.repos.d/epel-5.repo && echo "multilib_policy=best" >>/etc/yum.conf \
ADD repoforge-5.repo /etc/yum.repos.d/repoforge-5.repo && cd /etc/yum.repos.d \
&& rm -f *.repo \
# Install Trinity build dependencies && curl http://repo/repo/{centos5,epel5,repoforge5}.repo >repos.repo \
ADD packages.trinity /etc/yum.repos.d/packages && rpm -e --nodeps --justdb libselinux \
RUN echo "multilib_policy=best" >>"/etc/yum.conf" && yum -y update \
RUN yum install -y setarch && yum -y install $(</packages) || :
RUN setarch ${ARCH} yum update -y
RUN setarch ${ARCH} yum install -y $(</etc/yum.repos.d/packages) || :
# Avoid conflict with gnome-screensaver # Avoid conflict with gnome-screensaver
RUN setarch ${ARCH} yum remove -y gnome-screensaver RUN setarch ${ARCH} yum -y remove gnome-screensaver \
RUN setarch ${ARCH} yum install -y --disablerepo="*" --enablerepo="centos-5-extras" xscreensaver && setarch ${ARCH} yum -y install --disablerepo="*" --enablerepo="centos-extras" xscreensaver
# Add YUM repository for locally built packages # Updated build tools (not provided in centos5)
ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo # Distro-specific patches
RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" RUN rpm -Uvh http://repo/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,x86_64/m4-1.4.13-5.el5.x86_64}.rpm \
&& rpm -Uvh http://repo/trinity/archives/el5/trinity-14.0.4/RPMS/x86_64/trinity-poppler{,-devel}-0.12.4-1.el5.x86_64.rpm \
&& 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|"
# Add non-root user to build packages # Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity RUN useradd -m -s /bin/bash -u 1000 trinity \
RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
ADD rpmmacros /home/trinity/.rpmmacros
# Distro-specific patches USER trinity
RUN 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|" COPY rpmmacros /home/trinity/.rpmmacros
RUN mkdir -p ${HOME}/rpmbuild/{BUILD,BUILDROOT,SOURCES,SPECS,RPMS/noarch,RPMS/${ARCH},SRPMS}
# Build development packages
RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/file-5.04-30.el6.src.rpm \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/file.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/file{,-libs,-devel}-5*.rpm
RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/binutils-2.20.51.0.2-5.48.el6.src.rpm \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/binutils.spec --nodeps \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm
RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/pcsc-perl.spec -e "s|%license|%doc|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/pcsc-perl.spec --define "__isa_bits 64" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/6/SRPMS/Packages/s/sword-1.7.3-2.el6.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/sword.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/gnuchess-5.07-14.1.el6.src.rpm \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/gnuchess.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-5*.rpm
RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" -e "/perl(AutoLoader)/ s|^|#|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
RUN rpm -i --nomd5 http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm
RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" -e "/^Summary:/ s|$|\nGroup: Development/Languages|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "s|desktop-file-install|desktop-file-install --vendor=''|" \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "_unpackaged_files_terminate_build 0" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
RPM rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1.0-5.el6.src.rpm \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm
RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/pilot-link-0.12.4-6.el6.src.rpm \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/pilot-link.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm
# sudo rm -f /usr/bin/gcc && sudo ln -sf /usr/bin/gcc44 /usr/bin/gcc
# sudo rm -f /usr/bin/g++ && sudo ln -sf /usr/bin/g++44 /usr/bin/g++
# sudo rm -f /usr/bin/c++ && sudo ln -sf /usr/bin/g++44 /usr/bin/c++

@ -1,30 +0,0 @@
[centos-5-base]
name=CentOS-5 - Base
baseurl=http://repo/repo/archives/centos/5/os/$basearch/
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
enabled=1
#released updates
[centos-5-updates]
name=CentOS-5 - Updates
baseurl=http://repo/repo/archives/centos/5/updates/$basearch/
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
enabled=1
#additional packages that may be useful
[centos-5-extras]
name=CentOS-5 - Extras
baseurl=http://repo/repo/archives/centos/5/extras/$basearch/
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
enabled=1
#additional packages that extend functionality of existing packages
[centos-5-centosplus]
name=CentOS-5 - Plus
baseurl=http://repo/repo/archives/centos/5/centosplus/$basearch/
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
enabled=1

@ -1,5 +0,0 @@
[epel]
name=epel
baseurl=http://repo/repo/archives/epel/5/$basearch/
enabled=1
gpgcheck=0

@ -4,9 +4,11 @@ aspell-devel
audiofile-devel audiofile-devel
autotrace autotrace
avahi-devel avahi-devel
bash
bind-devel bind-devel
binutils-devel binutils-devel
bison bison
bluez-libs-devel
boost-devel boost-devel
bzip2-devel bzip2-devel
ccache ccache
@ -17,6 +19,7 @@ chmlib-devel
chrpath chrpath
clamav clamav
clamav-devel clamav-devel
cln-devel
clucene-core-devel clucene-core-devel
cmake cmake
commoncpp2-devel commoncpp2-devel
@ -25,11 +28,14 @@ cpp
cppunit-devel cppunit-devel
createrepo createrepo
cryptsetup-luks-devel cryptsetup-luks-devel
ctags
cups-devel cups-devel
curl-devel curl-devel
db4-devel db4-devel
dbus-glib-devel dbus-glib-devel
dejagnu dejagnu
dirmngr
dosfstools
doxygen doxygen
emacs emacs
esound-devel esound-devel
@ -38,6 +44,7 @@ expect
fdupes fdupes
ffmpeg-devel ffmpeg-devel
fftw-devel fftw-devel
fipscheck
flac-devel flac-devel
fontpackages-devel fontpackages-devel
fribidi-devel fribidi-devel
@ -46,6 +53,9 @@ gcc
gcc-c++ gcc-c++
gcc-gfortran gcc-gfortran
gcc-java gcc-java
gcc44
gcc44-c++
GeoIP-devel
gettext-devel gettext-devel
glib-devel glib-devel
gmime-devel gmime-devel
@ -70,6 +80,7 @@ icu
ImageMagick-devel ImageMagick-devel
imake imake
imlib-devel imlib-devel
intltool
jack-audio-connection-kit-devel jack-audio-connection-kit-devel
jasper-devel jasper-devel
java-1.4.2-gcj-compat-devel java-1.4.2-gcj-compat-devel
@ -131,6 +142,7 @@ libXtst-devel
libXv-devel libXv-devel
libXxf86dga-devel libXxf86dga-devel
libXxf86vm-devel libXxf86vm-devel
libyaz-devel
libzrtpcpp-devel libzrtpcpp-devel
lm_sensors-devel lm_sensors-devel
meanwhile-devel meanwhile-devel
@ -143,24 +155,39 @@ net-snmp-devel
NetworkManager-glib-devel NetworkManager-glib-devel
ocaml ocaml
OpenEXR-devel OpenEXR-devel
openldap-devel
openldap24-libs-devel openldap24-libs-devel
openldap-devel
opensc opensc
openslp-devel openslp-devel
opensp-devel opensp-devel
openssh
openssh-clients
pam-devel pam-devel
pciutils-devel pciutils-devel
pcre-devel pcre-devel
pcsc-lite-devel pcsc-lite-devel
pcsc-lite-libs
perl perl
perl-devel
perl(Archive::Zip)
perl(ExtUtils::MakeMaker) perl(ExtUtils::MakeMaker)
perl(Getopt::ArgvFile)
perl(inc::Module::Install)
perl(IPC::Run3)
perl(Module::Pluggable)
perl(Module::Signature)
perl(prefork)
perl(Test::Pod)
perl(XML::Parser) perl(XML::Parser)
php-cli
pilot-link-devel pilot-link-devel
pinentry
pkcs11-helper-devel pkcs11-helper-devel
poppler-devel poppler-devel
postgresql-devel postgresql-devel
pth-devel pth-devel
python-docutils python-docutils
rdesktop
recode recode
redhat-rpm-config redhat-rpm-config
rpm-build rpm-build
@ -171,28 +198,35 @@ sane-backends-devel
scons scons
SDL-devel SDL-devel
setarch setarch
sharutils
sip-devel sip-devel
speex-devel speex-devel
sqlite-devel sqlite-devel
sudo
subversion-devel subversion-devel
sudo
t1lib-devel t1lib-devel
t1utils t1utils
taglib-devel taglib-devel
texinfo texinfo
texinfo-tex texinfo-tex
torsocks
transfig transfig
unixODBC-devel unixODBC-devel
usbutils usbutils
valgrind valgrind
vim-enhanced
wireless-tools-devel wireless-tools-devel
xine-lib-devel xine-lib-devel
xinetd
xmlto xmlto
xorg-x11-font-utils xorg-x11-font-utils
xorg-x11-server-utils xorg-x11-server-utils
xscreensaver xscreensaver
xscreensaver-extras
xscreensaver-gl-base xscreensaver-gl-base
xscreensaver-gl-extras xscreensaver-gl-extras
xscreensaver-extras
xulrunner-devel xulrunner-devel
xz-devel xz-devel
yum
yum-plugin-ovl
yum-utils

@ -1,6 +0,0 @@
bash
perl
setarch
vim-enhanced
yum
yum-plugin-ovl

@ -1,5 +0,0 @@
[dag]
name=dag
baseurl=http://repo/repo/repoforge/redhat/el5/en/$basearch/dag/
enabled=1
gpgcheck=0

@ -3,3 +3,4 @@
%_smp_mflags -j8 %_smp_mflags -j8
%jobs 8 %jobs 8
%_topdir /home/trinity/rpmbuild %_topdir /home/trinity/rpmbuild
%_gpg_name Trinity

@ -1,26 +1,23 @@
FROM centos32:6 FROM centos32:6
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=i686 ARG ARCH=i686
# Enable proxy # Enable proxy
RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf"
# Add EPEL repository # Add EPEL repository
# Add RPMFUSION repository # Add RPMFUSION repository
RUN rpm -Uvh \
https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \
https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm
# Install Trinity build dependencies # Install Trinity build dependencies
ADD packages /packages COPY packages /packages
RUN yum -y clean all \ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
&& setarch ${ARCH} yum -y update \ && yum -y clean all \
&& setarch ${ARCH} yum -y install $(</packages) && setarch i686 yum -y update \
&& setarch i686 yum -y install epel-release \
&& rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
&& setarch i686 yum -y install $(</packages)
# Add YUM repository for locally built packages # Add YUM repository for locally built packages
WORKDIR /etc/yum.repos.d WORKDIR /etc/yum.repos.d
ADD rpmbuild.repo rpmbuild.repo COPY rpmbuild.repo rpmbuild.repo
RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
# Fix utempter detection # Fix utempter detection
@ -34,12 +31,11 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
USER trinity USER trinity
ADD rpmmacros /home/trinity/.rpmmacros COPY rpmmacros /home/trinity/.rpmmacros
# Build supplementary development tools # Build supplementary development tools
RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm \ RUN sudo rpm -Uvh http://repo/trinity/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm
RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm

@ -1,6 +1,6 @@
FROM centos:6 FROM centos:6
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Enable proxy # Enable proxy

@ -49,6 +49,7 @@ gcc
gcc-c++ gcc-c++
gcc-gfortran gcc-gfortran
gcc-java gcc-java
geoip-devel
gettext-devel gettext-devel
glib-devel glib-devel
gmp-devel gmp-devel

@ -1,6 +1,6 @@
FROM centos:7 FROM centos:7
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Enable proxy # Enable proxy

@ -1,6 +1,6 @@
FROM centos:8 FROM centos:8
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Enable custom repository # Enable custom repository

@ -1,6 +1,6 @@
FROM fedora:25 FROM fedora:25
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add RPMFUSION repository # Add RPMFUSION repository

@ -1,6 +1,6 @@
FROM fedora32:26 FROM fedora32:26
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=i686 ARG ARCH=i686
# Add RPMFUSION repository # Add RPMFUSION repository

@ -1,6 +1,6 @@
FROM fedora:26 FROM fedora:26
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add RPMFUSION repository # Add RPMFUSION repository

@ -1,6 +1,6 @@
FROM fedora32:27 FROM fedora32:27
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=i686 ARG ARCH=i686
# Add RPMFUSION repository # Add RPMFUSION repository

@ -1,6 +1,6 @@
FROM fedora:27 FROM fedora:27
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add RPMFUSION repository # Add RPMFUSION repository

@ -1,6 +1,6 @@
FROM fedora32:28 FROM fedora32:28
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=i686 ARG ARCH=i686
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"

@ -1,6 +1,6 @@
FROM fedora:28 FROM fedora:28
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"

@ -1,6 +1,6 @@
FROM fedora32:29 FROM fedora32:29
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=i686 ARG ARCH=i686
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"

@ -1,6 +1,6 @@
FROM fedora:29 FROM fedora:29
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"

@ -1,6 +1,6 @@
FROM fedora32:30 FROM fedora32:30
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=i686 ARG ARCH=i686
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"

@ -1,6 +1,6 @@
FROM fedora:30 FROM fedora:30
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"

@ -1,6 +1,6 @@
FROM fedora:31 FROM fedora:31
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"

@ -47,6 +47,7 @@ fribidi-devel
gamin-devel gamin-devel
gcc gcc
gcc-c++ gcc-c++
geoip-devel
gettext-devel gettext-devel
glib-devel glib-devel
gmime-devel gmime-devel
@ -189,6 +190,7 @@ poppler-devel
postgresql postgresql
postgresql-devel postgresql-devel
postgresql-server-devel postgresql-server-devel
ppp
pulseaudio-libs-devel pulseaudio-libs-devel
python python
python3-devel python3-devel

@ -1,6 +1,6 @@
FROM fedora:32 FROM fedora:32
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"

@ -47,6 +47,7 @@ fribidi-devel
gamin-devel gamin-devel
gcc gcc
gcc-c++ gcc-c++
geoip-devel
gettext-devel gettext-devel
giflib-devel giflib-devel
glib-devel glib-devel
@ -189,6 +190,7 @@ poppler-devel
postgresql postgresql
postgresql-devel postgresql-devel
postgresql-server-devel postgresql-server-devel
ppp
pulseaudio-libs-devel pulseaudio-libs-devel
python python
python3-devel python3-devel

@ -0,0 +1,26 @@
FROM fedora:33
ARG TDE_VERSION=14.0.9
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" \
&& dnf -y install dnf-plugin-ovl findutils \
&& dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-33.noarch.rpm \
&& dnf -y --enableplugin=ovl update \
&& dnf -y --enableplugin=ovl install $(</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
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
COPY rpmmacros /home/trinity/.rpmmacros

@ -0,0 +1,233 @@
alsa-lib-devel
aspell
aspell-devel
audiofile-devel
autotrace
avahi-devel
bind-devel
binutils-devel
bison
boost-devel
boost-python3-devel
bzip2-devel
ccache
cdparanoia
cdparanoia-devel
chmlib-devel
chrpath
clamav
clamav-devel
clucene-core-devel
cmake
cpp
cppunit-devel
createrepo
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
gamin-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
hspell-devel
htdig
html2ps
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
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
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
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)
poppler-devel
postgresql
postgresql-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
wireless-tools-devel
xbase-devel
xine-lib-devel
xmedcon
xmedcon-devel
xmlto
xorg-x11-font-utils
xscreensaver
xscreensaver-extras
xz-devel

@ -0,0 +1,4 @@
%dist .fc33
%_smp_mflags -j8
%jobs 8
%__cmake_builddir %nil

@ -1,6 +1,6 @@
FROM mageia:5.1 FROM mageia:5.1
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Reset URPMI repositories to default # Reset URPMI repositories to default

@ -1,6 +1,6 @@
FROM mageia32:6 FROM mageia32:6
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=i686 ARG ARCH=i686
# Reset URPMI repositories to default # Reset URPMI repositories to default

@ -1,6 +1,6 @@
FROM mageia:6 FROM mageia:6
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Reset URPMI repositories to default # Reset URPMI repositories to default

@ -82,6 +82,7 @@ libffmpeg-devel
libflac-devel libflac-devel
libflac++-devel libflac++-devel
libfontenc-devel libfontenc-devel
libgeoip-devel
libgstreamer1.0-devel libgstreamer1.0-devel
libgstreamer-plugins-base1.0-devel libgstreamer-plugins-base1.0-devel
libinotifytools-devel libinotifytools-devel

@ -82,6 +82,7 @@ lib64ffmpeg-devel
lib64flac-devel lib64flac-devel
lib64flac++-devel lib64flac++-devel
lib64fontenc-devel lib64fontenc-devel
lib64geoip-devel
lib64gstreamer1.0-devel lib64gstreamer1.0-devel
lib64gstreamer-plugins-base1.0-devel lib64gstreamer-plugins-base1.0-devel
lib64inotifytools-devel lib64inotifytools-devel

@ -1,6 +1,6 @@
FROM mageia32:7 FROM mageia32:7
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=i686 ARG ARCH=i686
# Reset URPMI repositories to default # Reset URPMI repositories to default

@ -1,6 +1,6 @@
FROM mageia:7 FROM mageia:7
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Reset URPMI repositories to default # Reset URPMI repositories to default
@ -11,7 +11,7 @@ RUN urpmi.removemedia -a \
# Update distribution # Update distribution
# Install Trinity build dependencies # Install Trinity build dependencies
ADD packages.${ARCH} /packages COPY packages.${ARCH} /packages
RUN urpmi.update -a \ RUN urpmi.update -a \
&& urpmi --auto-select --auto \ && urpmi --auto-select --auto \
&& urpmi --auto $(</packages) && urpmi --auto $(</packages)
@ -29,7 +29,7 @@ RUN rm -rf /home/trinity \
# Configure user trinity # Configure user trinity
USER trinity USER trinity
ADD rpmmacros /home/trinity/.rpmmacros COPY rpmmacros /home/trinity/.rpmmacros
# Add rpmbuild repositories # Add rpmbuild repositories
RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \

@ -1,6 +1,6 @@
FROM opensuse:13.1 FROM opensuse:13.1
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add PACKMAN repository # Add PACKMAN repository

@ -1,6 +1,6 @@
FROM opensuse:13.2 FROM opensuse:13.2
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add PACKMAN repository # Add PACKMAN repository

@ -1,6 +1,6 @@
FROM opensuse/leap:15.0 FROM opensuse/leap:15.0
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add PACKMAN repository # Add PACKMAN repository

@ -1,6 +1,6 @@
FROM opensuse/leap:15.1 FROM opensuse/leap:15.1
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add PACKMAN repository # Add PACKMAN repository

@ -57,6 +57,7 @@ gtk-doc
htdig htdig
html2ps html2ps
hunspell-devel hunspell-devel
iceauth
ImageMagick-devel ImageMagick-devel
imlib2-devel imlib2-devel
intltool intltool
@ -81,6 +82,7 @@ libdvdread-devel
libexempi-devel libexempi-devel
libexiv2-devel libexiv2-devel
libgadu-devel libgadu-devel
libGeoIP-devel
libgpgme-devel libgpgme-devel
libgphoto2-devel libgphoto2-devel
libgpod-devel libgpod-devel
@ -192,6 +194,7 @@ wireless-tools
wv2-devel wv2-devel
xbase-devel xbase-devel
xcb-proto-devel xcb-proto-devel
xorg-x11
xscreensaver xscreensaver
xscreensaver-data xscreensaver-data
xscreensaver-data-extra xscreensaver-data-extra

@ -1,6 +1,6 @@
FROM opensuse/leap:15.2 FROM opensuse/leap:15.2
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add PACKMAN repository # Add PACKMAN repository

@ -83,6 +83,7 @@ libdvdread-devel
libexempi-devel libexempi-devel
libexiv2-devel libexiv2-devel
libgadu-devel libgadu-devel
libGeoIP-devel
libgpgme-devel libgpgme-devel
libgphoto2-devel libgphoto2-devel
libgpod-devel libgpod-devel

@ -1,6 +1,6 @@
FROM opensuse:42.1 FROM opensuse:42.1
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add PACKMAN repository # Add PACKMAN repository

@ -1,6 +1,6 @@
FROM opensuse:42.2 FROM opensuse:42.2
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add PACKMAN repository # Add PACKMAN repository

@ -1,6 +1,6 @@
FROM opensuse:42.3 FROM opensuse:42.3
ARG TDE_VERSION=14.0.7 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add PACKMAN repository # Add PACKMAN repository

@ -1,12 +1,14 @@
FROM opensuse32/tumbleweed:latest FROM opensuse32/tumbleweed:latest
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=i686 ARG ARCH=i686
# Add PACKMAN repository # Add PACKMAN repository
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman COPY packages /packages
ADD packages /packages RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
RUN setarch ${ARCH} zypper refresh \ && zypper ar -f -G -n gnome http://ftp.lysator.liu.se/pub/opensuse/repositories/GNOME:/Next/openSUSE_Factory gnome \
&& setarch ${ARCH} zypper refresh \
&& setarch ${ARCH} zypper -n refresh \
&& setarch ${ARCH} zypper -n dup \ && setarch ${ARCH} zypper -n dup \
&& setarch ${ARCH} zypper -n update \ && setarch ${ARCH} zypper -n update \
&& setarch ${ARCH} zypper -n install $(</packages) && setarch ${ARCH} zypper -n install $(</packages)

@ -1,6 +1,6 @@
FROM opensuse/tumbleweed:latest FROM opensuse/tumbleweed:latest
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add PACKMAN repository # Add PACKMAN repository

@ -9,6 +9,8 @@ binutils-devel
bison bison
bluez-devel bluez-devel
boost-devel boost-devel
brp-check-suse
brp-extract-appdata
ccache ccache
cdparanoia cdparanoia
cdparanoia-devel cdparanoia-devel
@ -58,6 +60,7 @@ gtk-doc
htdig htdig
html2ps html2ps
hunspell-devel hunspell-devel
iceauth
ImageMagick-devel ImageMagick-devel
imake imake
imlib2-devel imlib2-devel
@ -90,6 +93,7 @@ libical-devel
libidn-devel libidn-devel
libiw-devel libiw-devel
libjack-devel libjack-devel
libjasper-devel
liblcms2-devel liblcms2-devel
liblo-devel liblo-devel
liblrdf-devel liblrdf-devel
@ -146,7 +150,6 @@ libXv-devel
libXxf86dga-devel libXxf86dga-devel
libXxf86vm-devel libXxf86vm-devel
libyaz-devel libyaz-devel
lilo
lirc-devel lirc-devel
make make
makeinfo makeinfo
@ -173,8 +176,8 @@ pcsc-lite-devel
perl-PAR-Packer perl-PAR-Packer
perl-pcsc perl-pcsc
pkcs11-helper-devel pkcs11-helper-devel
postgresql postgresql10
postgresql-devel postgresql10-devel
python-devel python-devel
python-gtk-devel python-gtk-devel
python3-devel python3-devel
@ -215,7 +218,9 @@ vim
wireless-tools wireless-tools
wv2-devel wv2-devel
xcb-proto-devel xcb-proto-devel
xorg-x11
xscreensaver xscreensaver
xscreensaver-data xscreensaver-data
xscreensaver-data-extra xscreensaver-data-extra
xz
xz-devel xz-devel

@ -93,6 +93,7 @@ lib64notify4
lib64npth0 lib64npth0
lib64nspr4 lib64nspr4
lib64nss3 lib64nss3
lib64openssl1.0.0
lib64openssl1.1.0 lib64openssl1.1.0
lib64opts25 lib64opts25
lib64pam0 lib64pam0

@ -1,7 +1,7 @@
#!/bin/bash -ex #!/bin/bash -ex
NAME="pclinuxos" NAME="pclinuxos"
VERSION="${1:-2020}" # E.g: '26' VERSION="${1:-2020}" # E.g: '2020'
IMAGE="${NAME}:${VERSION}" IMAGE="${NAME}:${VERSION}"
INSTALLROOT="/dev/shm/${IMAGE}" INSTALLROOT="/dev/shm/${IMAGE}"
@ -17,7 +17,8 @@ curl "${MIRROR}/RPMS.x86_64/" | sed -n "/a href/ s|.*href=\"\(.*\)\.rpm\".*|\1.r
mkdir -p "/dev/shm/packages" mkdir -p "/dev/shm/packages"
while read pkg; do while read pkg; do
file="$(grep "^${pkg}[0-9]*-[0-9]" /dev/shm/pkg.list | sort | tail -n 1)" file="$(grep "^${pkg}-[0-9]" /dev/shm/pkg.list | sort | tail -n 1)"
[ -z "${file}" ] && file="$(grep "^${pkg}[0-9]*-[0-9]" /dev/shm/pkg.list | sort | tail -n 1)"
[ -z "${file}" ] && exit 1 [ -z "${file}" ] && exit 1
wget -nv -c "${MIRROR}/RPMS.x86_64/${file}" -O "/dev/shm/packages/${file}" || exit 2 wget -nv -c "${MIRROR}/RPMS.x86_64/${file}" -O "/dev/shm/packages/${file}" || exit 2
done < "pclinuxos.pkg" done < "pclinuxos.pkg"
@ -39,6 +40,7 @@ sudo rm -rf "${INSTALLROOT}/var/lib/rpm"
sudo chroot "${INSTALLROOT}" rpmdb --initdb sudo chroot "${INSTALLROOT}" rpmdb --initdb
sudo chroot "${INSTALLROOT}" rpm -Uvh "/dev/shm/packages/"*".rpm" sudo chroot "${INSTALLROOT}" rpm -Uvh "/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 update
sudo chroot "${INSTALLROOT}" apt-get -y upgrade sudo chroot "${INSTALLROOT}" apt-get -y upgrade
@ -46,7 +48,10 @@ sudo umount "${INSTALLROOT}/dev/shm"
sudo umount "${INSTALLROOT}/dev" sudo umount "${INSTALLROOT}/dev"
sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
#sudo rm -rf "${INSTALLROOT}" sudo rm -rf "${INSTALLROOT}"
docker rmi -f "${IMAGE}" docker rmi -f "${IMAGE}" || :
docker import "${IMAGE}.tar" "${IMAGE}" cat "${IMAGE}.tar" | docker import - "${IMAGE}"
rm -f "${IMAGE}.tar.gz"
pigz -9 "${IMAGE}.tar"
mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs"

@ -1,37 +1,40 @@
FROM pclinuxos:2020 FROM pclinuxos:2020
ARG TDE_VERSION=14.0.8 ARG TDE_VERSION=14.0.9
ARG ARCH=x86_64 ARG ARCH=x86_64
# Update distribution # Update distribution
RUN apt-get -y update && apt-get -y install glibc && apt-get -y dist-upgrade
# Install Trinity build dependencies # Install Trinity build dependencies
ADD packages.${ARCH} /packages COPY packages.${ARCH} /packages
RUN apt-get -y update && apt-get -y install $(</packages) RUN apt-get -y update \
&& apt-get -y install glibc \
&& apt-get -y dist-upgrade \
&& apt-get -y install $(</packages)
# Add rpmbuild repositories # Add rpmbuild repositories
ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list COPY rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list
RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
# Fix SUDO configuration # Fix SUDO configuration
#RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|"
# Fix utempter detection # Fix utempter detection
RUN chmod a+r /usr/libexec/utempter/utempter RUN chmod a+r /usr/libexec/utempter/utempter
# Fix missing '.la' files # Fix missing '.la' files
ADD genla.sh /usr/bin/genla.sh COPY genla.sh /usr/bin/genla.sh
RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \
&& genla.sh libjpeg \ && genla.sh libjpeg \
&& genla.sh liblcms \ && 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 && 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 # 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" RUN rm -rf /home/trinity \
&& useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
USER trinity USER trinity
ADD rpmmacros /home/trinity/.rpmmacros COPY rpmmacros /home/trinity/.rpmmacros
# Build supplementary development tools # Build supplementary development tools
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \

@ -23,7 +23,7 @@ esac
mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}" mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
${DOCKER} run -ti --rm --privileged \ ${DOCKER} run -ti --rm \
-h "${IMAGE}" \ -h "${IMAGE}" \
--name "${IMAGE//:/-}" \ --name "${IMAGE//:/-}" \
-v /dev/shm/${DOCKER}:/tmp:z \ -v /dev/shm/${DOCKER}:/tmp:z \

@ -176,9 +176,11 @@ Requires: trinity-kvirc
Requires: trinity-kvkbd Requires: trinity-kvkbd
Requires: trinity-kvpnc Requires: trinity-kvpnc
Requires: trinity-kxmleditor Requires: trinity-kxmleditor
Requires: trinity-mathemagics
Requires: trinity-mplayerthumbs Requires: trinity-mplayerthumbs
Requires: trinity-piklab Requires: trinity-piklab
Requires: trinity-potracegui Requires: trinity-potracegui
#Requires: trinity-qalculate-tde
Requires: trinity-smb4k Requires: trinity-smb4k
Requires: trinity-smartcardauth Requires: trinity-smartcardauth
Requires: trinity-soundkonverter Requires: trinity-soundkonverter
@ -197,12 +199,14 @@ Requires: trinity-tdeio-locate
Requires: trinity-tdeio-sword Requires: trinity-tdeio-sword
Requires: trinity-tdeio-umountwrapper Requires: trinity-tdeio-umountwrapper
Requires: trinity-tdepacman Requires: trinity-tdepacman
%if 0%{?rhel} != 5
Requires: trinity-tdepowersave Requires: trinity-tdepowersave
%endif
Requires: trinity-tderadio Requires: trinity-tderadio
Requires: trinity-tdesudo Requires: trinity-tdesudo
Requires: trinity-tdesvn Requires: trinity-tdesvn
Requires: trinity-tellico
Requires: trinity-tdmtheme Requires: trinity-tdmtheme
Requires: trinity-tellico
Requires: trinity-tork Requires: trinity-tork
Requires: trinity-twin-style-crystal Requires: trinity-twin-style-crystal
Requires: trinity-wlassistant Requires: trinity-wlassistant

@ -171,6 +171,11 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# openldap 2.4 includes (CentOS 5)
if [ -d "/usr/include/openldap24" ]; then
RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
fi
if ! rpm -E %%cmake|grep -q "cd build"; then if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

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

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

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -266,6 +266,14 @@ Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif %endif
# Fedora 33 Theme
%if 0%{?fedora} == 33
Requires: f33-backgrounds-base
%define tde_bg /usr/share/backgrounds/f33/default/standard/f33.png
Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
# RHEL 4 Theme # RHEL 4 Theme
%if 0%{?rhel} == 4 %if 0%{?rhel} == 4
Requires: desktop-backgrounds-basic Requires: desktop-backgrounds-basic
@ -435,6 +443,14 @@ Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif %endif
# OpenSuse 15.2 Theme
%if "%{?suse_version}" == "1520"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
# OpenSuse TW Theme # OpenSuse TW Theme
%if "%{?suse_version}" == "1550" %if "%{?suse_version}" == "1550"
Requires: wallpaper-branding Requires: wallpaper-branding
@ -2388,7 +2404,9 @@ fi
# openSUSE 15.0 alternatives # openSUSE 15.0 alternatives
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
update-alternatives --remove default-displaymanager /usr/lib/X11/displaymanagers/tdm || : if [ "$1" = "0" ]; then
update-alternatives --remove default-displaymanager /usr/lib/X11/displaymanagers/tdm || :
fi
%endif %endif
########## ##########
@ -3343,6 +3361,15 @@ Windows and Samba shares.
%if 0%{?suse_version} %if 0%{?suse_version}
%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|" %__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
%endif %endif
%if 0%{?suse_version} >= 1550
# /etc/X11 moved to /usr/etc/X11 on opensuse TW
%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \
-i "%{tdm}/README" \
-i "doc/adminguide/index.docbook" \
-i "doc/faq/notrelated.docbook" \
-e "s|/etc/X11/xdm|/usr/etc/X11/xdm|g" \
-e "s|/etc/X11/sessions|/usr/etc/X11/sessions|g"
%endif
# Reboot command location may vary on some distributions # Reboot command location may vary on some distributions
if [ -x "/usr/bin/reboot" ]; then if [ -x "/usr/bin/reboot" ]; then
@ -3617,7 +3644,7 @@ EOF
# Move faces icon to XDG directory '/usr/share/faces' # Move faces icon to XDG directory '/usr/share/faces'
if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
%__mkdir_p "%{?buildroot}%{_datadir}/faces" %__mkdir_p "%{?buildroot}%{_datadir}/faces"
%__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces" %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces" 2>/dev/null
rmdir "%{?buildroot}%{tdm_datadir}/pics/users" rmdir "%{?buildroot}%{tdm_datadir}/pics/users"
fi fi
%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users" %__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users"

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

@ -0,0 +1,12 @@
[Unit]
Description=The Trinity login manager
Conflicts=getty@tty1.service
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
[Service]
ExecStart=/opt/trinity/bin/tdm
Restart=always
IgnoreSIGPIPE=no
[Install]
Alias=display-manager.service

@ -131,7 +131,14 @@ BuildRequires: ocaml
%endif %endif
# KIG python scripting support # KIG python scripting support
%if 0%{?rhel} != 5
%define with_kig 1 %define with_kig 1
%endif
# V4L support
%if 0%{?rhel} != 5
%define with_v4l 1
%endif
Obsoletes: trinity-kdeedu < %{version}-%{release} Obsoletes: trinity-kdeedu < %{version}-%{release}
Provides: trinity-kdeedu = %{version}-%{release} Provides: trinity-kdeedu = %{version}-%{release}
@ -149,7 +156,9 @@ Requires: trinity-keduca = %{version}-%{release}
Requires: trinity-kgeography = %{version}-%{release} Requires: trinity-kgeography = %{version}-%{release}
Requires: trinity-kgeography-data = %{version}-%{release} Requires: trinity-kgeography-data = %{version}-%{release}
Requires: trinity-khangman = %{version}-%{release} Requires: trinity-khangman = %{version}-%{release}
%if 0%{?with_kig}
Requires: trinity-kig = %{version}-%{release} Requires: trinity-kig = %{version}-%{release}
%endif
Requires: trinity-kiten = %{version}-%{release} Requires: trinity-kiten = %{version}-%{release}
Requires: trinity-klatin = %{version}-%{release} Requires: trinity-klatin = %{version}-%{release}
Requires: trinity-klettres = %{version}-%{release} Requires: trinity-klettres = %{version}-%{release}
@ -177,7 +186,9 @@ Educational/Edutainment applications, including:
* keduca: Tests and Exams * keduca: Tests and Exams
* kgeography: Geography Trainer * kgeography: Geography Trainer
* khangman: Hangman Game * khangman: Hangman Game
%if 0%{?with_kig}
* kig: Interactive Geometry * kig: Interactive Geometry
%endif
* kiten: Japanese Reference/Study Tool * kiten: Japanese Reference/Study Tool
* klatin: Latin Reviser * klatin: Latin Reviser
* klettres: French alphabet tutor * klettres: French alphabet tutor
@ -473,6 +484,7 @@ This package is part of Trinity, as a component of the TDE education module.
########## ##########
%if 0%{?with_kig}
%package -n trinity-kig %package -n trinity-kig
Summary: Interactive geometry program for TDE Summary: Interactive geometry program for TDE
Group: System/GUI/Other Group: System/GUI/Other
@ -531,6 +543,7 @@ This package is part of Trinity, as a component of the TDE education module.
%config(noreplace) %{tde_confdir}/magic/cabri.magic.mgc %config(noreplace) %{tde_confdir}/magic/cabri.magic.mgc
%config(noreplace) %{tde_confdir}/magic/drgeo.magic.mgc %config(noreplace) %{tde_confdir}/magic/drgeo.magic.mgc
%{tde_mandir}/man1/kig* %{tde_mandir}/man1/kig*
%endif
########## ##########
@ -1072,12 +1085,14 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_bindir}/lx200classic %{tde_bindir}/lx200classic
%{tde_bindir}/lx200generic %{tde_bindir}/lx200generic
%{tde_bindir}/lx200gps %{tde_bindir}/lx200gps
%{tde_bindir}/meade_lpi
%{tde_bindir}/sbigccd %{tde_bindir}/sbigccd
%{tde_bindir}/skycommander %{tde_bindir}/skycommander
%{tde_bindir}/temma %{tde_bindir}/temma
%if 0%{?with_v4l}
%{tde_bindir}/meade_lpi
%{tde_bindir}/v4ldriver %{tde_bindir}/v4ldriver
%{tde_bindir}/v4lphilips %{tde_bindir}/v4lphilips
%endif
%{tde_mandir}/man1/celestrongps* %{tde_mandir}/man1/celestrongps*
%{tde_mandir}/man1/fliccd* %{tde_mandir}/man1/fliccd*
%{tde_mandir}/man1/indi* %{tde_mandir}/man1/indi*
@ -1158,7 +1173,10 @@ fi
-DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
\ \
-DWITH_ALL_OPTIONS=ON \ -DWITH_ALL_OPTIONS=ON \
%{?!with_kig:-DBUILD_KIG=OFF} \
-DWITH_OCAML_SOLVER=OFF \ -DWITH_OCAML_SOLVER=OFF \
%{?!with_kig:-DWITH_KIG_PYTHON_SCRIPTING=OFF} \
%{?!with_v4l:-DWITH_V4L=OFF} \
.. ..
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make

@ -259,6 +259,13 @@ BuildRequires: speex-devel
%define dont_relink 1 %define dont_relink 1
%endif %endif
# Build kopete motionaway plugin
%if 0%{?rhel} == 5
%define global build_kopete_motionaway 0
%else
%define global build_kopete_motionaway 1
%endif
Obsoletes: trinity-kdenetwork < %{version}-%{release} Obsoletes: trinity-kdenetwork < %{version}-%{release}
Provides: trinity-kdenetwork = %{version}-%{release} Provides: trinity-kdenetwork = %{version}-%{release}
Obsoletes: trinity-kdenetwork-libs < %{version}-%{release} Obsoletes: trinity-kdenetwork-libs < %{version}-%{release}
@ -695,8 +702,10 @@ Support for more IM protocols can be added through a plugin system.
# winpopup support for kopete # winpopup support for kopete
%{tde_bindir}/winpopup-install.sh %{tde_bindir}/winpopup-install.sh
%{tde_bindir}/winpopup-send.sh %{tde_bindir}/winpopup-send.sh
%if 0%{?build_kopete_motionaway}
# motionaway plugin for kopete # motionaway plugin for kopete
%{tde_datadir}/config.kcfg/motionawayconfig.kcfg %{tde_datadir}/config.kcfg/motionawayconfig.kcfg
%endif
# smpp plugin for kopete # smpp plugin for kopete
%{tde_datadir}/config.kcfg/smpppdcs.kcfg %{tde_datadir}/config.kcfg/smpppdcs.kcfg
# aim support is deprecated in TDE 14.1.0 # aim support is deprecated in TDE 14.1.0
@ -1104,6 +1113,7 @@ fi
-DBUILD_ALL=ON \ -DBUILD_ALL=ON \
-DBUILD_KOPETE_PLUGIN_ALL=ON \ -DBUILD_KOPETE_PLUGIN_ALL=ON \
-DBUILD_KOPETE_PROTOCOL_ALL=ON \ -DBUILD_KOPETE_PROTOCOL_ALL=ON \
%{!?build_kopete_motionaway:-DBUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY=OFF} \
%{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \ %{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \
%{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \ %{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \
.. ..

@ -99,7 +99,7 @@ BuildRequires: pcre-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
# DB5 support # DB5 support
%if 0%{?rhel} >= 8 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 33
BuildRequires: libdb-devel BuildRequires: libdb-devel
# DB4 support # DB4 support

@ -109,7 +109,7 @@ BuildRequires: gamin-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
# DB5 support # DB5 support
%if 0%{?rhel} >= 8 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 33
BuildRequires: libdb-devel BuildRequires: libdb-devel
%else %else

Loading…
Cancel
Save