From 8ab4d3920b6da379f4d14ff3b78d088a45df7cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 8 May 2023 13:52:09 +0200 Subject: RPM: update build scripts for Fedora 38 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/Makefile | 9 +++------ redhat/applications/multimedia/k3b/k3b.spec | 11 +++++++++-- redhat/build/get_latest_tarball_version.sh | 2 ++ redhat/core/tdebase/pamd.kcheckpass-trinity.fc38 | 5 +++++ redhat/core/tdebase/pamd.kdm-trinity-np.fc38 | 16 +++++++++++++++ redhat/core/tdebase/pamd.kdm-trinity.fc38 | 23 ++++++++++++++++++++++ redhat/core/tdebase/pamd.kscreensaver-trinity.fc38 | 5 +++++ redhat/core/tdebase/tdm.fc38.te | 11 +++++++++++ redhat/core/tdebase/tdm.service.el9 | 1 - redhat/core/tdebase/tdm.service.fc34 | 12 ----------- redhat/core/tdebase/tdm.service.fc35 | 12 ----------- redhat/core/tdebase/tdm.service.fc36 | 12 ----------- redhat/core/tdebase/tdm.service.fc37 | 12 ----------- redhat/core/tdebase/tdm.service.mga8 | 12 ----------- redhat/docker/f38/packages | 1 + 15 files changed, 75 insertions(+), 69 deletions(-) create mode 100644 redhat/core/tdebase/pamd.kcheckpass-trinity.fc38 create mode 100644 redhat/core/tdebase/pamd.kdm-trinity-np.fc38 create mode 100644 redhat/core/tdebase/pamd.kdm-trinity.fc38 create mode 100644 redhat/core/tdebase/pamd.kscreensaver-trinity.fc38 create mode 100644 redhat/core/tdebase/tdm.fc38.te delete mode 120000 redhat/core/tdebase/tdm.service.el9 delete mode 100644 redhat/core/tdebase/tdm.service.fc34 delete mode 100644 redhat/core/tdebase/tdm.service.fc35 delete mode 100644 redhat/core/tdebase/tdm.service.fc36 delete mode 100644 redhat/core/tdebase/tdm.service.fc37 delete mode 100644 redhat/core/tdebase/tdm.service.mga8 (limited to 'redhat') diff --git a/redhat/Makefile b/redhat/Makefile index b6712c9cc..84a08053a 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -149,7 +149,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .oss endif htdig: -ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga6 .mga7 .mga8 )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .mga6 .mga7 .mga8 )) $(call buildpkg,extras/htdig) endif @@ -163,9 +163,6 @@ ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .oss151 .oss152 .oss153 .os $(call buildpkg,3rdparty/lcms) endif -libbeagle: - $(call buildpkg,3rdparty/libbeagle) - mp4v2: ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .osstw )) $(call buildpkg,3rdparty/mp4v2) @@ -189,7 +186,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151)) endif wv2: -ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37)) +ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38)) $(call buildpkg,3rdparty/wv2) endif @@ -380,7 +377,7 @@ endif klcddimmer: tdebase $(call buildpkg,applications/settings/klcddimmer) -kmplayer: tdebase +kmplayer: tdebase koffice $(call buildpkg,applications/multimedia/kmplayer) kmyfirewall: tdebase diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec index ed7d62590..f5a2cb013 100644 --- a/redhat/applications/multimedia/k3b/k3b.spec +++ b/redhat/applications/multimedia/k3b/k3b.spec @@ -80,7 +80,6 @@ BuildRequires: brp-check-trinity BuildRequires: alsa-lib-devel BuildRequires: audiofile-devel BuildRequires: gettext -BuildRequires: libmpcdec-devel BuildRequires: libvorbis-devel BuildRequires: taglib-devel BuildRequires: zlib-devel @@ -227,6 +226,12 @@ BuildRequires: ffmpeg-devel %endif %endif +# MUSEPACK +%if 0%{?fedora} != 38 +%define with_musepack 1 +BuildRequires: libmpcdec-devel +%endif + %description K3b provides a comfortable user interface to perform most CD/DVD @@ -260,8 +265,10 @@ start. %{tde_tdelibdir}/libk3blibsndfiledecoder.la %{tde_tdelibdir}/libk3blibsndfiledecoder.so %endif +%if 0%{?with_musepack} %{tde_tdelibdir}/libk3bmpcdecoder.la %{tde_tdelibdir}/libk3bmpcdecoder.so +%endif %{tde_tdelibdir}/libk3boggvorbisdecoder.la %{tde_tdelibdir}/libk3boggvorbisdecoder.so %{tde_tdelibdir}/libk3boggvorbisencoder.la @@ -453,7 +460,7 @@ fi -DWITH_ALL_OPTIONS="ON" \ -DWITH_MUSICBRAINZ="OFF" \ -DWITH_FFMPEG_ALL_CODECS="ON" \ - -DWITH_MUSEPACK="ON" \ + -DWITH_MUSEPACK="%{!?with_musepack:OFF}%{?with_musepack:ON}" \ -DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \ -DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \ %if 0%{?rhel} == 5 diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh index 36090ef86..bf6db3b9e 100755 --- a/redhat/build/get_latest_tarball_version.sh +++ b/redhat/build/get_latest_tarball_version.sh @@ -12,7 +12,9 @@ TARBALL=$(get_latest_tarball_filename.sh "${PKGNAME}" ${TDE_VERSION}) VERSION=${TARBALL##*/} VERSION=${VERSION#trinity-} VERSION=${VERSION#${PKGNAME}-} +VERSION=${VERSION#${PKGNAME}_} VERSION=${VERSION#*-} VERSION=${VERSION%.tar.gz} VERSION=${VERSION%.tar.bz2} +VERSION=${VERSION%.orig} echo "$VERSION" diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc38 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc38 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc38 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc38 b/redhat/core/tdebase/pamd.kdm-trinity.fc38 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc38 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/core/tdebase/tdm.fc38.te b/redhat/core/tdebase/tdm.fc38.te new file mode 100644 index 000000000..afe6de52a --- /dev/null +++ b/redhat/core/tdebase/tdm.fc38.te @@ -0,0 +1,11 @@ + +module tdm 1.0; + +require { + type fprintd_t; + type init_t; + class dbus send_msg; +} + +#============= fprintd_t ============== +allow fprintd_t init_t:dbus send_msg; diff --git a/redhat/core/tdebase/tdm.service.el9 b/redhat/core/tdebase/tdm.service.el9 deleted file mode 120000 index 87f56ea08..000000000 --- a/redhat/core/tdebase/tdm.service.el9 +++ /dev/null @@ -1 +0,0 @@ -tdm.service.el7 \ No newline at end of file diff --git a/redhat/core/tdebase/tdm.service.fc34 b/redhat/core/tdebase/tdm.service.fc34 deleted file mode 100644 index 9ef7e07ff..000000000 --- a/redhat/core/tdebase/tdm.service.fc34 +++ /dev/null @@ -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 diff --git a/redhat/core/tdebase/tdm.service.fc35 b/redhat/core/tdebase/tdm.service.fc35 deleted file mode 100644 index 9ef7e07ff..000000000 --- a/redhat/core/tdebase/tdm.service.fc35 +++ /dev/null @@ -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 diff --git a/redhat/core/tdebase/tdm.service.fc36 b/redhat/core/tdebase/tdm.service.fc36 deleted file mode 100644 index 9ef7e07ff..000000000 --- a/redhat/core/tdebase/tdm.service.fc36 +++ /dev/null @@ -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 diff --git a/redhat/core/tdebase/tdm.service.fc37 b/redhat/core/tdebase/tdm.service.fc37 deleted file mode 100644 index 9ef7e07ff..000000000 --- a/redhat/core/tdebase/tdm.service.fc37 +++ /dev/null @@ -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 diff --git a/redhat/core/tdebase/tdm.service.mga8 b/redhat/core/tdebase/tdm.service.mga8 deleted file mode 100644 index eda2906e2..000000000 --- a/redhat/core/tdebase/tdm.service.mga8 +++ /dev/null @@ -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 diff --git a/redhat/docker/f38/packages b/redhat/docker/f38/packages index 1a1beca2a..828222df7 100644 --- a/redhat/docker/f38/packages +++ b/redhat/docker/f38/packages @@ -118,6 +118,7 @@ libofx-devel libogg-devel libotr-devel libpaper-devel +libpqxx-devel libqalculate-devel libraw1394-devel librsvg2 -- cgit v1.2.1