diff options
33 files changed, 659 insertions, 17 deletions
diff --git a/redhat/Makefile b/redhat/Makefile index 2c60577e4..4e41d2d91 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -134,7 +134,7 @@ tdeutils: tdebase tdevelop: tdebase tdesdk $(call buildpkg,core/tdevelop) -tdewebdev: tdebase tdesdk +tdewebdev: tdebase tdesdk tdeutils $(call buildpkg,core/tdewebdev) ### 3rd party libraries and tools @@ -144,7 +144,7 @@ ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw endif htdig: -ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .fc40 .fc41 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv5000 )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .fc40 .fc41 .fc42 .fc43 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv5000 .osstw )) $(call buildpkg,extras/htdig) endif @@ -176,7 +176,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151)) endif wv2: -ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39 .fc40 .fc41 .omv2490 .omv5000)) +ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39 .fc40 .fc41 .fc42 .omv2490 .omv5000 .osstw)) $(call buildpkg,3rdparty/wv2) endif @@ -258,7 +258,7 @@ ifeq (,$(filter $(DIST),.el5 .el6)) endif gtk-qt-engine: tdebase -ifeq (,$(filter $(DIST),.el5)) +ifeq (,$(filter $(DIST),.el5 .fc42 .fc43)) $(call buildpkg,applications/themes/gtk-qt-engine) endif @@ -562,7 +562,7 @@ ifeq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,applications/settings/tdenetworkmanager) endif -tdepacman: tdebase +tdepacman: tdebase tdegames $(call buildpkg,applications/games/tdepacman) tdepowersave: tdebase diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index 3952bfe36..2929abbf7 100644 --- a/redhat/applications/multimedia/amarok/amarok.spec +++ b/redhat/applications/multimedia/amarok/amarok.spec @@ -207,7 +207,7 @@ BuildRequires: libmtp-devel %endif # Creative Nomad Jukebox -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 +%if ( 0%{?fedora} >= 19 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 %define with_njb 1 %if 0%{?mdkver} BuildRequires: %{_lib}njb-devel diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec index 713da52e1..b04bee7ec 100644 --- a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec +++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec @@ -143,6 +143,10 @@ export PATH="%{tde_bindir}:${PATH}" # Remove useless filess %__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a +%if 0%{?fedora} >= 43 +%__mv %{?buildroot}/usr/lib/ %{?buildroot}%{_libdir} +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec index c629f36c2..f4f538d23 100644 --- a/redhat/applications/office/koffice/koffice.spec +++ b/redhat/applications/office/koffice/koffice.spec @@ -312,7 +312,7 @@ BuildRequires: wv2-devel BuildRequires: %{_lib}wv2-devel %endif %endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} || (0%{?fedora} && 0%{?fedora} <= 42) || 0%{?suse_version} %define with_wv2 1 BuildRequires: wv2-devel %endif diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec index 0fc10afac..6beebf289 100644 --- a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec @@ -267,6 +267,10 @@ fi %suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet %endif +%if 0%{?fedora} >= 43 +%__mv %{?buildroot}/opt/trinity/etc/ %{?buildroot}/etc/ +%endif + %clean %__rm -rf $RPM_BUILD_ROOT diff --git a/redhat/applications/system/tdebluez/tdebluez.spec b/redhat/applications/system/tdebluez/tdebluez.spec index 968775950..f33517e7f 100644 --- a/redhat/applications/system/tdebluez/tdebluez.spec +++ b/redhat/applications/system/tdebluez/tdebluez.spec @@ -250,6 +250,10 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +%if 0%{?fedora} >= 43 +%__mv %{?buildroot}/opt/trinity/etc/ %{?buildroot}/etc/ +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index ed541d2cb..2a125bfed 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -41,7 +41,7 @@ if [ -d "${PATCHDIR}" ]; then fi fi -if [ "${DIST}" = ".fc41" ] || [ "${DIST}" = ".mga9" ] || [ "${DIST}" = ".omv5000" ] || [ "${DIST}" = ".osstw" ] || [ "${DIST:0:6}" = ".pclos" ]; then +if [ "${DIST}" = ".fc41" ] || [ "${DIST}" = ".fc42" ] || [ "${DIST}" = ".fc43" ] || [ "${DIST}" = ".mga9" ] || [ "${DIST}" = ".omv5000" ] || [ "${DIST}" = ".osstw" ] || [ "${DIST:0:6}" = ".pclos" ]; then sed -i "${TARGETDIR}/"*".spec" \ -e "s|%patch|%patch -P |g" fi diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc42 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc42 new file mode 120000 index 000000000..bcd188214 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc42 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc43 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc43 new file mode 120000 index 000000000..bcd188214 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc43 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc42 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc42 new file mode 120000 index 000000000..9d4df92f4 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc42 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc43 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc43 new file mode 120000 index 000000000..9d4df92f4 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc43 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc42 b/redhat/core/tdebase/pamd.kdm-trinity.fc42 new file mode 120000 index 000000000..5022f14ef --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc42 @@ -0,0 +1 @@ +pamd.kdm-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc43 b/redhat/core/tdebase/pamd.kdm-trinity.fc43 new file mode 120000 index 000000000..5022f14ef --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc43 @@ -0,0 +1 @@ +pamd.kdm-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc42 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc42 new file mode 120000 index 000000000..a7b20accd --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc42 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc43 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc43 new file mode 120000 index 000000000..a7b20accd --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc43 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.fc39
\ No newline at end of file diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index 0759676fd..ffb1728dc 100644 --- a/redhat/core/tdebase/tdebase.spec +++ b/redhat/core/tdebase/tdebase.spec @@ -130,7 +130,11 @@ BuildRequires: brp-check-trinity # Fedora Theme %if 0%{?fedora} +%if 0%{?fedora} >= 42 +Requires: f41-backgrounds-base +%else Requires: f%{?fedora}-backgrounds-base +%endif %if 0%{?fedora} >= 39 %define tde_bg /usr/share/backgrounds/f%{?fedora}/default/f%{?fedora}-01-day.png %else diff --git a/redhat/core/tdebase/tdm.fc42.te b/redhat/core/tdebase/tdm.fc42.te new file mode 120000 index 000000000..6d3f39b54 --- /dev/null +++ b/redhat/core/tdebase/tdm.fc42.te @@ -0,0 +1 @@ +tdm.fc39.te
\ No newline at end of file diff --git a/redhat/core/tdebase/tdm.fc43.te b/redhat/core/tdebase/tdm.fc43.te new file mode 120000 index 000000000..6d3f39b54 --- /dev/null +++ b/redhat/core/tdebase/tdm.fc43.te @@ -0,0 +1 @@ +tdm.fc39.te
\ No newline at end of file diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index 937692612..475722be0 100644 --- a/redhat/core/tdebindings/tdebindings.spec +++ b/redhat/core/tdebindings/tdebindings.spec @@ -249,10 +249,13 @@ BuildRequires: java-devel >= 1.4.2 %if 0%{?suse_version} >= 1320 BuildRequires: java-1_8_0-openjdk-devel %endif -%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 42 +BuildRequires: java-21-openjdk-devel +%endif +%if ( 0%{?fedora} >= 21 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8 BuildRequires: java-1.8.0-openjdk-devel %endif -%if 0%{?fedora} == 17 || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7 +%if 0%{?fedora} == 17 || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7 BuildRequires: java-1.7.0-openjdk-devel %endif %if 0%{?rhel} == 5 || 0%{?rhel} == 6 diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec index 18cd144b9..077803e7b 100644 --- a/redhat/core/tdelibs/tdelibs.spec +++ b/redhat/core/tdelibs/tdelibs.spec @@ -822,6 +822,9 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit" %__rm -f "%{?buildroot}%{tde_bindir}/filesharelist" %__rm -f "%{?buildroot}%{tde_bindir}/fileshareset" +%if 0%{?fedora} >= 43 +%__mv %{?buildroot}/opt/trinity/etc/xdg/ %{?buildroot}/etc/ +%endif %clean %__rm -rf "%{?buildroot}" diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec index e6f3d557c..8cad7c88f 100644 --- a/redhat/core/tdemultimedia/tdemultimedia.spec +++ b/redhat/core/tdemultimedia/tdemultimedia.spec @@ -1207,6 +1207,10 @@ export PATH="%{tde_bindir}:${PATH}" # Links duplicate files %fdupes "%{?buildroot}%{tde_datadir}" +%if 0%{?fedora} >= 43 +%__mv %{?buildroot}/opt/trinity/etc/ %{?buildroot}/etc/ +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec index a210fea30..74d54fe95 100644 --- a/redhat/core/tdenetwork/tdenetwork.spec +++ b/redhat/core/tdenetwork/tdenetwork.spec @@ -1253,6 +1253,10 @@ done # Links duplicate files %fdupes "%{?buildroot}%{tde_datadir}" +%if 0%{?fedora} >= 43 +%__mv %{?buildroot}/usr/etc/ppp/ %{?buildroot}/etc/ +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index 903569507..22d1115aa 100644 --- a/redhat/dependencies/arts/arts.spec +++ b/redhat/dependencies/arts/arts.spec @@ -148,7 +148,7 @@ BuildRequires: %{mad_devel} %endif Requires: libtqt4 >= %{tde_epoch}:4.2.0 -Requires: audiofile +#Requires: audiofile %if "%{?tde_prefix}" == "/usr" Obsoletes: arts < %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec index 0abbacfa2..7732df93a 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec @@ -173,6 +173,7 @@ fi \ -DBIN_INSTALL_DIR=%{_bindir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/docker/f42/Dockerfile.x86_64 b/redhat/docker/f42/Dockerfile.x86_64 new file mode 100644 index 000000000..d1d846ac5 --- /dev/null +++ b/redhat/docker/f42/Dockerfile.x86_64 @@ -0,0 +1,37 @@ +FROM fedora:42 + +ARG TDE_VERSION=14.1.3 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ + && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \ + && sed -i /etc/yum.repos.d/fedora{,-updates}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|42|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-42.noarch.rpm \ + && dnf -y --enableplugin=ovl update \ + && dnf -y --enableplugin=ovl install --skip-broken $(</packages) + +# Add YUM repository for locally built packages +COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* diff --git a/redhat/docker/f42/packages b/redhat/docker/f42/packages new file mode 100644 index 000000000..872963678 --- /dev/null +++ b/redhat/docker/f42/packages @@ -0,0 +1,238 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +boost-python3-devel +byacc +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +dnf-plugin-ovl +docbook2X +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +geoip-devel +gettext-devel +giflib-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +harfbuzz-devel +heimdal-devel +hspell-devel +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-devel +java-openjdk +lame-devel +lcms-devel +less +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdb-devel +libdvdread-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libifp-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz5-devel +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libunibreak-devel +libusb-compat-0.1-devel +libusb1-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvncserver-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mesa-libGL-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +ocaml-facile-devel +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(PAR::Packer) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +polkit-devel +poppler-devel +postgresql +postgresql-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python3 +python3-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texlive-newunicodechar +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +xbase-devel +xine-lib-devel +xkeyboard-config-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f42/rpmbuild.repo b/redhat/docker/f42/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f42/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f42/rpmmacros b/redhat/docker/f42/rpmmacros new file mode 100644 index 000000000..1635e67d3 --- /dev/null +++ b/redhat/docker/f42/rpmmacros @@ -0,0 +1,10 @@ +%dist .fc42 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%source_date_epoch_from_changelog 0 +%python python3 diff --git a/redhat/docker/rawhide/Dockerfile.x86_64 b/redhat/docker/rawhide/Dockerfile.x86_64 new file mode 100644 index 000000000..95f1d7d37 --- /dev/null +++ b/redhat/docker/rawhide/Dockerfile.x86_64 @@ -0,0 +1,46 @@ +FROM fedora:rawhide + +ARG TDE_VERSION=14.1.3 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN set -x \ + && 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-rawhide.noarch.rpm \ + && dnf -y --enableplugin=ovl update \ + && dnf -y --enableplugin=ovl install --skip-broken $(</packages) + +# Add YUM repository for locally built packages +COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN set -x \ + && sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN set -x \ + && chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN set -x \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN set -x \ + && rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +#RUN set -x \ +# && rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ +# && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \ +# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2* diff --git a/redhat/docker/rawhide/packages b/redhat/docker/rawhide/packages new file mode 100644 index 000000000..872963678 --- /dev/null +++ b/redhat/docker/rawhide/packages @@ -0,0 +1,238 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +boost-python3-devel +byacc +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +dnf-plugin-ovl +docbook2X +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +geoip-devel +gettext-devel +giflib-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +harfbuzz-devel +heimdal-devel +hspell-devel +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-devel +java-openjdk +lame-devel +lcms-devel +less +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdb-devel +libdvdread-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libifp-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz5-devel +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libunibreak-devel +libusb-compat-0.1-devel +libusb1-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvncserver-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mesa-libGL-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +ocaml-facile-devel +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(PAR::Packer) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +polkit-devel +poppler-devel +postgresql +postgresql-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python3 +python3-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texlive-newunicodechar +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +xbase-devel +xine-lib-devel +xkeyboard-config-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/rawhide/rpmbuild.repo b/redhat/docker/rawhide/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/rawhide/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/rawhide/rpmmacros b/redhat/docker/rawhide/rpmmacros new file mode 100644 index 000000000..0b82d6547 --- /dev/null +++ b/redhat/docker/rawhide/rpmmacros @@ -0,0 +1,10 @@ +%dist .fc43 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%source_date_epoch_from_changelog 0 +%python python3 diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo index 05e45748c..dc258b058 100644 --- a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo +++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo @@ -1,23 +1,23 @@ [trinity-3.5.13] name=trinity-3.5.13 -#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch -mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/fc$releasever/trinity-3.5.13/RPMS/$basearch +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/fc$releasever/trinity-3.5.13-$basearch.list enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-noarch] name=trinity-3.5.13-noarch -#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch -mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/fc$releasever/trinity-3.5.13/RPMS/noarch +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/fc$releasever/trinity-3.5.13-noarch.list enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-source] name=trinity-3.5.13-source -#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS -mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/fc$releasever/trinity-3.5.13/SRPMS +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/fc$releasever/trinity-3.5.13-SRPMS.list enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity |