TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM: update build scripts for Fedora 38

Browse Source 
Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/257/head
François Andriot 2 years ago
parent 0edc1511e1
commit 8ab4d3920b
15 changed files with 75 additions and 69 deletions
Show Stats Download Patch File Download Diff File

9
redhat/Makefile
Unescape View File

@ -149,7 +149,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .oss
endif endif
htdig: htdig:
ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga6 .mga7 .mga8 )) ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .mga6 .mga7 .mga8 ))
$(call buildpkg,extras/htdig) $(call buildpkg,extras/htdig)
endif endif
@ -163,9 +163,6 @@ ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .oss151 .oss152 .oss153 .os
$(call buildpkg,3rdparty/lcms) $(call buildpkg,3rdparty/lcms)
endif endif
libbeagle:
$(call buildpkg,3rdparty/libbeagle)
mp4v2: mp4v2:
ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .osstw )) ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .osstw ))
$(call buildpkg,3rdparty/mp4v2) $(call buildpkg,3rdparty/mp4v2)
@ -189,7 +186,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151))
endif endif
wv2: wv2:
ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37)) ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38))
$(call buildpkg,3rdparty/wv2) $(call buildpkg,3rdparty/wv2)
endif endif
@ -380,7 +377,7 @@ endif
klcddimmer: tdebase klcddimmer: tdebase
$(call buildpkg,applications/settings/klcddimmer) $(call buildpkg,applications/settings/klcddimmer)
kmplayer: tdebase kmplayer: tdebase koffice
$(call buildpkg,applications/multimedia/kmplayer) $(call buildpkg,applications/multimedia/kmplayer)
kmyfirewall: tdebase kmyfirewall: tdebase

11
redhat/applications/multimedia/k3b/k3b.spec
Unescape View File

@ -80,7 +80,6 @@ BuildRequires: brp-check-trinity
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel BuildRequires: audiofile-devel
BuildRequires: gettext BuildRequires: gettext
BuildRequires: libmpcdec-devel
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
BuildRequires: taglib-devel BuildRequires: taglib-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -227,6 +226,12 @@ BuildRequires: ffmpeg-devel
%endif %endif
%endif %endif
# MUSEPACK
%if 0%{?fedora} != 38
%define with_musepack 1
BuildRequires: libmpcdec-devel
%endif
%description %description
K3b provides a comfortable user interface to perform most CD/DVD K3b provides a comfortable user interface to perform most CD/DVD
@ -260,8 +265,10 @@ start.
%{tde_tdelibdir}/libk3blibsndfiledecoder.la %{tde_tdelibdir}/libk3blibsndfiledecoder.la
%{tde_tdelibdir}/libk3blibsndfiledecoder.so %{tde_tdelibdir}/libk3blibsndfiledecoder.so
%endif %endif
%if 0%{?with_musepack}
%{tde_tdelibdir}/libk3bmpcdecoder.la %{tde_tdelibdir}/libk3bmpcdecoder.la
%{tde_tdelibdir}/libk3bmpcdecoder.so %{tde_tdelibdir}/libk3bmpcdecoder.so
%endif
%{tde_tdelibdir}/libk3boggvorbisdecoder.la %{tde_tdelibdir}/libk3boggvorbisdecoder.la
%{tde_tdelibdir}/libk3boggvorbisdecoder.so %{tde_tdelibdir}/libk3boggvorbisdecoder.so
%{tde_tdelibdir}/libk3boggvorbisencoder.la %{tde_tdelibdir}/libk3boggvorbisencoder.la
@ -453,7 +460,7 @@ fi
-DWITH_ALL_OPTIONS="ON" \ -DWITH_ALL_OPTIONS="ON" \
-DWITH_MUSICBRAINZ="OFF" \ -DWITH_MUSICBRAINZ="OFF" \
-DWITH_FFMPEG_ALL_CODECS="ON" \ -DWITH_FFMPEG_ALL_CODECS="ON" \
-DWITH_MUSEPACK="ON" \ -DWITH_MUSEPACK="%{!?with_musepack:OFF}%{?with_musepack:ON}" \
-DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \ -DWITH_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 %if 0%{?rhel} == 5

2
redhat/build/get_latest_tarball_version.sh
Unescape View File

@ -12,7 +12,9 @@ TARBALL=$(get_latest_tarball_filename.sh "${PKGNAME}" ${TDE_VERSION})
VERSION=${TARBALL##*/} VERSION=${TARBALL##*/}
VERSION=${VERSION#trinity-} VERSION=${VERSION#trinity-}
VERSION=${VERSION#${PKGNAME}-} VERSION=${VERSION#${PKGNAME}-}
VERSION=${VERSION#${PKGNAME}_}
VERSION=${VERSION#*-} VERSION=${VERSION#*-}
VERSION=${VERSION%.tar.gz} VERSION=${VERSION%.tar.gz}
VERSION=${VERSION%.tar.bz2} VERSION=${VERSION%.tar.bz2}
VERSION=${VERSION%.orig}
echo "$VERSION" echo "$VERSION"

5
redhat/core/tdebase/pamd.kcheckpass-trinity.fc38
Unescape View File

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

16
redhat/core/tdebase/pamd.kdm-trinity-np.fc38
Unescape View File

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

23
redhat/core/tdebase/pamd.kdm-trinity.fc38
Unescape View File

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

5
redhat/core/tdebase/pamd.kscreensaver-trinity.fc38
Unescape View File

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

11
redhat/core/tdebase/tdm.fc38.te
Unescape View File

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

1
redhat/core/tdebase/tdm.service.el9
Unescape View File

@ -1 +0,0 @@
tdm.service.el7

12
redhat/core/tdebase/tdm.service.fc34
Unescape View File

@ -1,12 +0,0 @@
[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

12
redhat/core/tdebase/tdm.service.fc35
Unescape View File

@ -1,12 +0,0 @@
[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

12
redhat/core/tdebase/tdm.service.fc36
Unescape View File

@ -1,12 +0,0 @@
[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

12
redhat/core/tdebase/tdm.service.fc37
Unescape View File

@ -1,12 +0,0 @@
[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

12
redhat/core/tdebase/tdm.service.mga8
Unescape View File

@ -1,12 +0,0 @@
[Unit]
Description=Trinity Display Manager
Documentation=man:tdm(1)
Conflicts=getty@tty1.service
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
[Service]
ExecStart=/opt/trinity/bin/tdm
Restart=always
[Install]
Alias=display-manager.service

1
redhat/docker/f38/packages
Unescape View File

@ -118,6 +118,7 @@ libofx-devel
libogg-devel libogg-devel
libotr-devel libotr-devel
libpaper-devel libpaper-devel
libpqxx-devel
libqalculate-devel libqalculate-devel
libraw1394-devel libraw1394-devel
librsvg2 librsvg2

Write Preview
Loading…
Cancel
Save