diff options
| author | François Andriot <albator78@libertysurf.fr> | 2022-11-06 11:46:08 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2022-11-06 16:15:02 +0100 |
| commit | b504f7ef7837e88d471f3601da710a92d58108a0 (patch) | |
| tree | 2874f5894582ac03efd73e22d0a374cc97d33cac /redhat | |
| parent | 91c340e19d9a2c81194e7adb5900c8f69bbd7735 (diff) | |
| download | tde-packaging-b504f7ef7837e88d471f3601da710a92d58108a0.tar.gz tde-packaging-b504f7ef7837e88d471f3601da710a92d58108a0.zip | |
RPM: updates (cherry-pick from TDE R14.0.13)
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat')
110 files changed, 2381 insertions, 232 deletions
diff --git a/redhat/Makefile b/redhat/Makefile index 440ddb369..829dce327 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -23,12 +23,12 @@ buildpkg = \ echo -all: common dependencies main libraries applications i18n meta +all: common dependencies main libraries applications i18n meta external common: cmake dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt sip4-tqt tqca tqscintilla 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 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 klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose 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 polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-suse2 wlassistant yakuake +applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose 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 polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-machbunt twin-style-suse2 wlassistant yakuake i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n ### Trinity Common @@ -67,12 +67,14 @@ ifeq (,$(filter $(DIST), .el5 .el6 )) endif python-tqt: sip4-tqt tdelibs tqscintilla -ifeq (,$(filter $(DIST), .oss154 )) +ifeq (,$(filter $(DIST), .el9 .oss154 )) $(call buildpkg,dependencies/python-tqt) endif sip4-tqt: +ifeq (,$(filter $(DIST), .el9 )) $(call buildpkg,dependencies/sip4-tqt) +endif tqca: tqtinterface $(call buildpkg,dependencies/tqca) @@ -153,7 +155,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .oss endif htdig: -ifneq (,$(filter $(DIST), .el7 .el8 .mga6 .mga7 .mga8 )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga6 .mga7 .mga8 )) $(call buildpkg,extras/htdig) endif @@ -163,7 +165,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw )) endif lcms: -ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw )) $(call buildpkg,3rdparty/lcms) endif @@ -171,7 +173,7 @@ libbeagle: $(call buildpkg,3rdparty/libbeagle) mp4v2: -ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw )) +ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .osstw )) $(call buildpkg,3rdparty/mp4v2) endif @@ -193,7 +195,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151)) endif wv2: -ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 )) +ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37)) $(call buildpkg,3rdparty/wv2) endif @@ -224,12 +226,12 @@ mlt: tqtinterface $(call buildpkg,libraries/mlt) pytdeextensions: tqtinterface python-trinity -ifeq (,$(filter $(DIST), .oss154 )) +ifeq (,$(filter $(DIST), .el9 .oss154 )) $(call buildpkg,libraries/pytdeextensions) endif python-trinity: tqtinterface python-tqt -ifeq (,$(filter $(DIST), .oss154 )) +ifeq (,$(filter $(DIST), .el9 .oss154 )) $(call buildpkg,libraries/python-trinity) endif @@ -504,7 +506,9 @@ mathemagics: tdebase $(call buildpkg,applications/mathemagics) mplayerthumbs: tdebase +ifeq (,$(filter $(DIST),.el9)) $(call buildpkg,applications/mplayerthumbs) +endif piklab: tdebase $(call buildpkg,applications/piklab) @@ -521,12 +525,12 @@ qalculate-tde: $(call buildpkg,applications/qalculate-tde) qt4-tqt-theme-engine: tdebase -ifeq (,$(filter $(DIST),.el5 .el6 .el8 .oss153 .oss154 .osstw)) +ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .oss153 .oss154 .osstw)) $(call buildpkg,applications/qt4-tqt-theme-engine) endif rosegarden: tdebase -ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8)) +ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8 .el9)) $(call buildpkg,applications/rosegarden) endif @@ -546,10 +550,15 @@ tdedocker: tdebase $(call buildpkg,applications/tdedocker) tde-guidance: tdebase pytdeextensions -ifeq (,$(filter $(DIST), .oss154 )) +ifeq (,$(filter $(DIST), .el9 .oss154 )) $(call buildpkg,applications/tde-guidance) endif +tdeio-appinfo: tdebase +ifeq (,$(filter $(DIST), .el5 .el6 )) + $(call buildpkg,applications/tdeio-appinfo) +endif + tdeio-apt: tdebase $(call buildpkg,applications/tdeio-apt) @@ -609,7 +618,9 @@ tdesvn: tdebase $(call buildpkg,applications/tdesvn) tde-systemsettings: tdebase +ifeq (,$(filter $(DIST), .el9 .oss154 )) $(call buildpkg,applications/tde-systemsettings) +endif tdmtheme: tdebase $(call buildpkg,applications/tdmtheme) @@ -626,6 +637,9 @@ twin-style-crystal: tdebase twin-style-dekorator: tdebase $(call buildpkg,applications/twin-style-dekorator) +twin-style-machbunt: tdebase + $(call buildpkg,applications/twin-style-machbunt) + twin-style-suse2: tdebase $(call buildpkg,applications/twin-style-suse2) diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec index ecc87ddbb..e2f921280 100644 --- a/redhat/applications/abakus/abakus.spec +++ b/redhat/applications/abakus/abakus.spec @@ -75,7 +75,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -168,6 +168,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/*/apps/abakus.png %{tde_tdedocdir}/HTML/en/abakus/ %{tde_tdeappdir}/abakus.desktop +%{tde_mandir}/man1/abakus.1* %changelog diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec index eee0076ca..5ee4de02c 100644 --- a/redhat/applications/amarok/amarok.spec +++ b/redhat/applications/amarok/amarok.spec @@ -99,7 +99,12 @@ BuildRequires: libtool BuildRequires: libtool-ltdl-devel %endif +%if 0%{?fedora} >= 37 +BuildRequires: libusb1-devel +BuildRequires: libusb-compat-0.1-devel +%else BuildRequires: libusb-devel +%endif BuildRequires: mysql-devel BuildRequires: SDL-devel BuildRequires: taglib-devel @@ -126,7 +131,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -167,7 +172,7 @@ BuildRequires: karma-sharp %endif # GPOD (ipod) support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_gpod 1 BuildRequires: libgpod-devel >= 0.4.2 %endif @@ -264,11 +269,11 @@ BuildRequires: rubypick %endif # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 8 %define python python3 %define __python %__python3 %else -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} @@ -466,7 +471,7 @@ fi "amarok/src/scripts/webcontrol/Playlist.py" \ "amarok/src/scripts/webcontrol/RequestHandler.py" \ "amarok/src/scripts/webcontrol/WebControl.py" \ - -e "s|/usr/bin/env python|/usr/bin/env python2|" + -e "s|/usr/bin/env python|/usr/bin/env %{python}|" %endif diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/filelight/filelight.spec index f3a4a5897..cd454fbdf 100644 --- a/redhat/applications/filelight/filelight.spec +++ b/redhat/applications/filelight/filelight.spec @@ -70,7 +70,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh deleted file mode 120000 index 373c65ab3..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh +++ /dev/null @@ -1 +0,0 @@ -../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec index 843cd5440..7d9db849a 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec @@ -56,9 +56,6 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: gtk-qt-engine.rc.sh -Source2: gtkrc-2.0-kde4 -Source3: gtkrc-2.0-kde-kde4 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -154,29 +151,20 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang gtkqtengine - -# Adds TDE's specific GTKRC -%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh" -%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4" -%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4" +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} -%files -f gtkqtengine.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING TODO %{tde_tdelibdir}/kcm_kcmgtk.la %{tde_tdelibdir}/kcm_kcmgtk.so -%{tde_appdir}/kcmgtk.desktop -%dir %{tde_datadir}/apps/kgtk -%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh -%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4 -%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4 -%{tde_tdedocdir}/HTML/en/kcmgtk/ +%{tde_tdeappdir}/kcmgtk.desktop +%{tde_tdedocdir}/HTML/en/kcontrol/gtk/ # The following files are outside TDE's directory %dir %{_libdir}/gtk-2.0 diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 deleted file mode 120000 index 62aa57f04..000000000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 +++ /dev/null @@ -1 +0,0 @@ -../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 deleted file mode 120000 index 2d0ca2867..000000000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 +++ /dev/null @@ -1 +0,0 @@ -../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file diff --git a/redhat/applications/k3b/k3b.spec b/redhat/applications/k3b/k3b.spec index 2edb92088..a1688b402 100644 --- a/redhat/applications/k3b/k3b.spec +++ b/redhat/applications/k3b/k3b.spec @@ -90,7 +90,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -271,7 +271,7 @@ start. %{tde_tdelibdir}/libk3bwavedecoder.la %{tde_tdelibdir}/libk3bwavedecoder.so %lang(en) %{tde_tdedocdir}/HTML/en/k3b/ - +%{tde_mandir}/man1/k3b.1* ########## diff --git a/redhat/applications/k9copy/k9copy.spec b/redhat/applications/k9copy/k9copy.spec index 656727906..0a9801a8d 100644 --- a/redhat/applications/k9copy/k9copy.spec +++ b/redhat/applications/k9copy/k9copy.spec @@ -150,6 +150,7 @@ fi --bindir=%{tde_bindir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ + --mandir=%{tde_mandir} \ \ --disable-dependency-tracking \ --disable-debug \ @@ -185,6 +186,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop %lang(en) %{tde_tdedocdir}/HTML/en/k9copy/ %{tde_datadir}/icons/hicolor/*/apps/k9copy.png +%{tde_mandir}/man1/k9copy.1* %changelog diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/kbfx/kbfx.spec index 3e5c06b1b..44df9443c 100644 --- a/redhat/applications/kbfx/kbfx.spec +++ b/redhat/applications/kbfx/kbfx.spec @@ -82,7 +82,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec index cff4f8b69..ecc87aad6 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec @@ -89,7 +89,7 @@ BuildRequires: gtk+2.0-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/kile/kile.spec b/redhat/applications/kile/kile.spec index 31b8d0947..b424e7ae5 100644 --- a/redhat/applications/kile/kile.spec +++ b/redhat/applications/kile/kile.spec @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -149,45 +149,42 @@ Kile can support large projects consisting of several smaller files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +# Warning: GCC visibility causes the KCM not to work at all ! +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + .. %__make %{?_smp_mflags} + %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh - -# Unwanted files ... -%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml -%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -221,6 +218,7 @@ export PATH="%{tde_bindir}:${PATH}" %lang(pt) %{tde_tdedocdir}/HTML/pt/kile/ %lang(sv) %{tde_tdedocdir}/HTML/sv/kile/ +%{tde_mandir}/man1/kile.1* %changelog diff --git a/redhat/applications/klamav/klamav.spec b/redhat/applications/klamav/klamav.spec index 41882f16e..af6b1725d 100644 --- a/redhat/applications/klamav/klamav.spec +++ b/redhat/applications/klamav/klamav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg klamav %define tde_prefix /opt/trinity diff --git a/redhat/applications/koffice-i18n/koffice-i18n.spec b/redhat/applications/koffice-i18n/koffice-i18n.spec index f71f0fe38..8e1c91577 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n.spec @@ -74,7 +74,7 @@ BuildRequires: desktop-file-utils BuildRequires: findutils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -573,45 +573,66 @@ Provides: %{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" - %build +unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +( +for l in . %{TDE_LANGS}; do + if [ $l != '.' ]; then + pushd "%{tde_pkg}-${l}" + else + pushd ${l} + fi + + if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build + fi + + %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DBUILD_ALL=ON \ + \ + .. + + %__make %{?_smp_mflags} + + popd +done +) 2>&1 | tee /tmp/rpmbuild.$$ -export kde_htmldir="%{tde_tdedocdir}/HTML" +if grep -qw TDE_Error /tmp/rpmbuild.$$; then + echo "Error while building. See '/tmp/rpmbuild.$$'" + exit 1 +fi -for l in %{TDE_LANGS}; do - for f in koffice-i18n-${l}/; do - if [ -d "${f}" ]; then - pushd ${f} - %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|" - %__make -f "admin/Makefile.common" - %configure \ - --prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} - %__make %{?_smp_mflags} - popd - fi - done -done +wait +rm -f /tmp/rpmbuild.$$ %install -%__rm -rf %{?buildroot} export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} for l in %{TDE_LANGS}; do - for f in koffice-i18n-${l}/; do - if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then - %__make install DESTDIR="%{?buildroot}" -C "${f}" - fi - done + %__make DESTDIR=%{buildroot} -C build install-${l} done -# remove zero-length file -find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec index 43b5365eb..42851dd74 100644 --- a/redhat/applications/koffice/koffice.spec +++ b/redhat/applications/koffice/koffice.spec @@ -113,11 +113,12 @@ BuildRequires: libexif-devel BuildRequires: readline-devel # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define with_python 0 +%global __python %__python3 %else %define with_python 1 -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} @@ -394,6 +395,10 @@ Requires: perl %{tde_tdelibdir}/krossruby.* %endif %endif +%{tde_mandir}/man1/koconverter.1* +%{tde_mandir}/man1/koscript.1* +%{tde_mandir}/man1/koshell.1* +%{tde_mandir}/man1/kthesaurus.1* ########## @@ -430,6 +435,7 @@ License: LGPLv2+ %{tde_libdir}/libkrossapi.so.* %{tde_libdir}/libkrossmain.so.* %endif +%{tde_mandir}/man1/kspread.1* ########## @@ -475,6 +481,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/templates/TextDocument.desktop %{tde_datadir}/templates/.source/TextDocument.kwt %{tde_tdeappdir}/*kword.desktop +%{tde_mandir}/man1/kword.1* ########## @@ -537,6 +544,8 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/templates/Presentation.desktop %{tde_datadir}/templates/.source/Presentation.kpt %{tde_tdeappdir}/*kpresenter.desktop +%{tde_mandir}/man1/kprconverter.pl.1* +%{tde_mandir}/man1/kpresenter.1* ########## @@ -561,6 +570,7 @@ Obsoletes: kivio < %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/config.kcfg/kivio.kcfg %{tde_datadir}/services/kivio*.desktop %{tde_tdeappdir}/*kivio.desktop +%{tde_mandir}/man1/kivio.1* ########## @@ -587,6 +597,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/templates/Illustration.desktop %{tde_datadir}/templates/.source/Illustration.karbon %{tde_tdeappdir}/*karbon.desktop +%{tde_mandir}/man1/karbon.1* ########## @@ -616,6 +627,8 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/services/kugar*.desktop %{tde_tdeappdir}/*kugar.desktop %{tde_tdeappdir}/*kudesigner.desktop +%{tde_mandir}/man1/kudesigner.1* +%{tde_mandir}/man1/kugar.1* ########## @@ -721,6 +734,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_datadir}/apps/kchart/ %{tde_datadir}/services/kchart*.desktop %{tde_tdeappdir}/*kchart.desktop +%{tde_mandir}/man1/kchart.1* ########## @@ -761,6 +775,7 @@ Requires: dejavu %{tde_datadir}/apps/kformula/ %{tde_datadir}/services/kformula*.desktop %{tde_tdeappdir}/*kformula.desktop +%{tde_mandir}/man1/kformula.1* ########## diff --git a/redhat/applications/kompose/kompose.spec b/redhat/applications/kompose/kompose.spec index bdda7fcd9..6650188b2 100644 --- a/redhat/applications/kompose/kompose.spec +++ b/redhat/applications/kompose/kompose.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.9 +%define tde_version 14.1.0 %endif %define tde_pkg kompose %define tde_prefix /opt/trinity diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec index 80e0b7e39..3b3a11a75 100644 --- a/redhat/applications/konversation/konversation.spec +++ b/redhat/applications/konversation/konversation.spec @@ -74,6 +74,23 @@ BuildRequires: libidn-devel # OPENSSL support BuildRequires: openssl-devel +# PYTHON support +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 +%define with_python 0 +%global __python %__python3 +%else +%define with_python 1 +%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 +%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 +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -110,7 +127,7 @@ BuildRequires: libXi6-devel # RHEL 6: available in EPEL # RHEL 7: available in NUX # RHEL 8: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -182,7 +199,7 @@ and experienced users alike will appreciate its many features: %if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 %__sed -i "konversation/scripts/media" \ "konversation/scripts/weather" \ - -e "s|/usr/bin/env python|/usr/bin/env python2|" + -e "s|/usr/bin/env python|/usr/bin/env %{python}|" %endif diff --git a/redhat/applications/krecipes/krecipes.spec b/redhat/applications/krecipes/krecipes.spec index c2b24ef16..5609d2f65 100644 --- a/redhat/applications/krecipes/krecipes.spec +++ b/redhat/applications/krecipes/krecipes.spec @@ -130,6 +130,7 @@ export PATH="%{tde_bindir}:${PATH}" --includedir=%{tde_tdeincludedir} \ --docdir=%{tde_tdedocdir} \ --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ \ --disable-dependency-tracking \ --disable-debug \ @@ -185,6 +186,6 @@ export PATH="%{tde_bindir}:${PATH}" %lang(et) %{tde_tdedocdir}/HTML/et/ %lang(pt) %{tde_tdedocdir}/HTML/pt/ %lang(sv) %{tde_tdedocdir}/HTML/sv/ - +%{tde_mandir}/man1/krecipes.1* %changelog diff --git a/redhat/applications/ktorrent/ktorrent.spec b/redhat/applications/ktorrent/ktorrent.spec index ce6aaea3e..4cb54d155 100644 --- a/redhat/applications/ktorrent/ktorrent.spec +++ b/redhat/applications/ktorrent/ktorrent.spec @@ -214,6 +214,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/ktzeroconfplugin.la %{tde_tdelibdir}/ktzeroconfplugin.so %endif +%{tde_mandir}/man1/ktorrent.1* %changelog diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec index 13fc08a17..6073e3747 100644 --- a/redhat/applications/kxmleditor/kxmleditor.spec +++ b/redhat/applications/kxmleditor/kxmleditor.spec @@ -76,8 +76,6 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Requires: mplayer - %description KXML Editor is a simple program, that displays and edits the contents of an diff --git a/redhat/applications/piklab/piklab.spec b/redhat/applications/piklab/piklab.spec index ff8d574d2..ddc1c3123 100644 --- a/redhat/applications/piklab/piklab.spec +++ b/redhat/applications/piklab/piklab.spec @@ -84,7 +84,12 @@ BuildRequires: readline-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else -BuildRequires: libusb-devel +%if 0%{?fedora} >= 37 +BuildRequires: libusb1-devel +BuildRequires: libusb-compat-0.1-devel +%else +BuildRequires: libusb-devel +%endif %endif diff --git a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec index 4bf776156..c71ddce8e 100644 --- a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec +++ b/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.11 +%define tde_version 14.1.0 %endif %define tde_pkg polkit-agent-tde %define tde_prefix /opt/trinity diff --git a/redhat/applications/rosegarden/rosegarden.spec b/redhat/applications/rosegarden/rosegarden.spec index 94c5bfee1..c4debe030 100644 --- a/redhat/applications/rosegarden/rosegarden.spec +++ b/redhat/applications/rosegarden/rosegarden.spec @@ -115,7 +115,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -233,6 +233,10 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/rosegarden-lilypondview %{tde_bindir}/rosegarden-project-package %{tde_bindir}/rosegardensequencer +%{tde_mandir}/man1/rosegarden-audiofile-importer.1* +%{tde_mandir}/man1/rosegarden-lilypondview.1* +%{tde_mandir}/man1/rosegarden-project-package.1* +%{tde_mandir}/man1/rosegarden.1* %files data -f %{tde_pkg}.lang %defattr(-,root,root,-) diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec index 191e9949e..bab439d53 100644 --- a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec +++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.10 +%define tde_version 14.1.0 %endif %define tde_pkg tdesshaskpass %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec index 368233282..08edda0f9 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec @@ -85,7 +85,7 @@ BuildRequires: libacl-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio-appinfo/tdeio-appinfo.spec new file mode 100644 index 000000000..66c56bf9c --- /dev/null +++ b/redhat/applications/tdeio-appinfo/tdeio-appinfo.spec @@ -0,0 +1,160 @@ +# +# spec file for package tdeio-appinfo (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.0 +%endif +%define tde_pkg tdeio-appinfo +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDEIO slave for the appinfo protocol +Group: Productivity/Networking/Ftp/Clients +URL: http://lukeplant.me.uk/kio-appinfo/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +Adds support for the "appinfo:" protocol +to Konqueror and other TDE applications. +. +This enables you to perform appinfo: searches in TDE. + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{?buildroot} + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING README.md +%{tde_tdelibdir}/tdeio_appinfo.la +%{tde_tdelibdir}/tdeio_appinfo.so +%{tde_datadir}/services/appinfo.protocol + + +%changelog diff --git a/redhat/applications/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio-locate/tdeio-locate.spec index cdbfafeef..b00e4a7ef 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate.spec @@ -84,7 +84,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -155,19 +155,20 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang %{tde_pkg} +%find_lang tdeio_locate + %clean %__rm -rf %{buildroot} -%files -f %{tde_pkg}.lang +%files -f tdeio_locate.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING TODO %{tde_tdelibdir}/tdeio_locate.la %{tde_tdelibdir}/tdeio_locate.so -%{tde_tdedocdir}/HTML/en/tdeio-locate/ +%{tde_tdedocdir}/HTML/en/tdeioslave/locate/ %{tde_datadir}/services/locate.protocol %{tde_datadir}/services/locater.protocol %{tde_datadir}/services/rlocate.protocol diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec index b8e37c2c5..e1b15a209 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec @@ -136,7 +136,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/tdepowersave/tdepowersave.spec index 461b1c98e..bec9a33c3 100644 --- a/redhat/applications/tdepowersave/tdepowersave.spec +++ b/redhat/applications/tdepowersave/tdepowersave.spec @@ -117,7 +117,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -232,7 +232,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING TODO %{tde_bindir}/tdepowersave %{tde_libdir}/libtdeinit_tdepowersave.la %{tde_libdir}/libtdeinit_tdepowersave.so diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/tderadio/tderadio.spec index 47ef2c7ca..d7d3b7315 100644 --- a/redhat/applications/tderadio/tderadio.spec +++ b/redhat/applications/tderadio/tderadio.spec @@ -65,7 +65,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -147,45 +147,36 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__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" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-visibility causes applications fails to start ! -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --program-prefix="" \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \ - --enable-v4l2 \ - --enable-lame \ - --enable-ogg \ - --enable-alsa \ - --enable-oss - -%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 -%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||" -%endif + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} @@ -193,7 +184,7 @@ export PATH="%{tde_bindir}:${PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -202,6 +193,10 @@ export PATH="%{tde_bindir}:${PATH}" %suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner %endif +# Remove devel files +%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.la +%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.so + %clean %__rm -rf %{buildroot} @@ -211,6 +206,8 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %{tde_bindir}/convert-presets %{tde_bindir}/tderadio +%{tde_libdir}/libtderadio.so.0 +%{tde_libdir}/libtderadio.so.0.0.0 %dir %{tde_libdir}/tderadio %dir %{tde_libdir}/tderadio/plugins %{tde_libdir}/tderadio/plugins/*.la @@ -221,10 +218,14 @@ export PATH="%{tde_bindir}:${PATH}" %dir %{tde_datadir}/icons/hicolor/256x256/actions %{tde_datadir}/icons/hicolor/*/*/tderadio*.png %{tde_datadir}/icons/locolor/*/*/tderadio*.png +%{tde_datadir}/pixmaps/tderadio.xpm %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo %lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %{tde_tdedocdir}/HTML/en/tderadio/ +%{tde_mandir}/man1/convert-presets.1* +%{tde_mandir}/man1/tderadio.1* + %changelog diff --git a/redhat/applications/tdesvn/tdesvn.spec b/redhat/applications/tdesvn/tdesvn.spec index 7ee60eec3..6b41cc888 100644 --- a/redhat/applications/tdesvn/tdesvn.spec +++ b/redhat/applications/tdesvn/tdesvn.spec @@ -91,7 +91,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec index 76e327043..7002a965b 100644 --- a/redhat/applications/tellico/tellico.spec +++ b/redhat/applications/tellico/tellico.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} >= 23 +%if 0%{?fedora} >= 23 || 0%{?rhel} >= 9 %define _hardened_ldflags %nil %endif @@ -13,7 +13,7 @@ # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) +# license that confolrms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://www.trinitydesktop.org/ @@ -139,7 +139,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -154,11 +154,11 @@ BuildRequires: libacl-devel BuildRequires: libattr-devel # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define python python3 %define __python %__python3 %else -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} @@ -197,6 +197,7 @@ It also makes it easy for other softwares to use the Tellico data. %{tde_bindir}/tellico %{tde_datadir}/applications %config(noreplace) %{tde_confdir}/tellicorc +%{tde_mandir}/man1/tellico.1* ########## @@ -297,7 +298,7 @@ fi "src/fetch/scripts/ministerio_de_cultura.py" \ "src/fetch/scripts/fr.allocine.py" \ "src/translators/griffith2tellico.py" \ - -e "s|/usr/bin/env python|/usr/bin/env python2|" + -e "s|/usr/bin/env python|/usr/bin/env %{python}|" %endif diff --git a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec index 47950e707..058735c56 100644 --- a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec +++ b/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.10 +%define tde_version 14.1.0 %endif %define tde_pkg twin-style-dekorator %define tde_prefix /opt/trinity diff --git a/redhat/applications/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/twin-style-machbunt/twin-style-machbunt.spec new file mode 100644 index 000000000..62b8efb2c --- /dev/null +++ b/redhat/applications/twin-style-machbunt/twin-style-machbunt.spec @@ -0,0 +1,153 @@ +# +# spec file for package twin-style-machbunt (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.0 +%endif +%define tde_pkg twin-style-machbunt +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE window decoration from SUSE 9.1/9.2 +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: trinity-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2. + +An example color scheme is provided too. + + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +# Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_tdelibdir}/twin3_MachBunt.la +%{tde_tdelibdir}/twin3_MachBunt.so +%{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc +%{tde_datadir}/apps/twin/MachBunt.desktop + + +%changelog diff --git a/redhat/applications/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/twin-style-suse2/twin-style-suse2.spec index c53e0e878..b1cdae23c 100644 --- a/redhat/applications/twin-style-suse2/twin-style-suse2.spec +++ b/redhat/applications/twin-style-suse2/twin-style-suse2.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.10 +%define tde_version 14.1.0 %endif %define tde_pkg twin-style-suse2 %define tde_prefix /opt/trinity diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/wlassistant/wlassistant.spec index 823f48b66..85fefd29f 100644 --- a/redhat/applications/wlassistant/wlassistant.spec +++ b/redhat/applications/wlassistant/wlassistant.spec @@ -96,17 +96,17 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define python python3 %define __python %__python3 %else -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 %global python python2 %global __python %__python2 %global python_sitearch %{python2_sitearch} diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 11993d820..ac821c4af 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -64,6 +64,7 @@ case "${PKGNAME}" in "tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";; "tqt3") PKGRUNTIME="${lib}tqt3-mt";; "tqtinterface") PKGRUNTIME="${lib}tqt4";; + "trinity-desktop") PKGRUNTIME="${PKGNAME}-all";; "yaz") PKGRUNTIME="${lib}yaz";; # Language package: install only French language package "k3b-i18n"|"koffice-i18n"|"tde-i18n") diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index 1b0463e4c..529aa49ed 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -14,7 +14,11 @@ while read var val; do case "${var}" in Version:*) VERSION="${val}";; Source*:|Source:|Patch[0-9]*:) - FILE="${SPECDIR}/${val##*/}" + if [ "${val:0:7}" = "http://" ] || [ "${val:0:8}" = "https://" ]; then + FILE="${SPECDIR}/${val##*/}" + else + FILE="${SPECDIR}/${val}" + fi if [ "${DIST}" = "any" ] && [ "${var//%\{?dist\}/}" = "${var}" ]; then FILES="${FILE//%\{?dist\}/.}"* else diff --git a/redhat/common/cmake/cmake.spec b/redhat/common/cmake/cmake.spec index cd6825db3..c2eb0b4e1 100644 --- a/redhat/common/cmake/cmake.spec +++ b/redhat/common/cmake/cmake.spec @@ -105,6 +105,7 @@ fi %{cmake_datadir}/Modules/TDEL10n.cmake %{cmake_datadir}/Modules/TDEMacros.cmake %{cmake_datadir}/Modules/TDESetupPaths.cmake +%{cmake_datadir}/Modules/TDEVersion.cmake %{cmake_datadir}/Modules/tde_automoc.cmake %{cmake_datadir}/Modules/tde_l10n_merge.pl %{cmake_datadir}/Modules/tde_uic.cmake diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index 8480ddc7e..6ef5f4d70 100644 --- a/redhat/dependencies/arts/arts.spec +++ b/redhat/dependencies/arts/arts.spec @@ -32,6 +32,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_sbindir %{tde_prefix}/sbin %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde @@ -162,6 +163,9 @@ playing a wave file with some effects. %{tde_bindir}/artswrapper # The '.la' files are needed for runtime, not devel ! %{tde_libdir}/lib*.la +%{tde_mandir}/man1/artsc-config-trinity.1* +%{tde_mandir}/man1/artscat-trinity.1* +%{tde_mandir}/man1/artsdsp-trinity.1* ########## @@ -257,8 +261,9 @@ fi \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DBIN_INSTALL_DIR="%{tde_bindir}" \ - -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DMAN_INSTALL_DIR="%{tde_mandir}" \ -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ \ -DWITH_ALSA=ON \ diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index 403ddbf5a..9d723122b 100644 --- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec +++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.11 +%define tde_version 14.1.0 %endif %define tde_pkg polkit-tqt diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index a6033ebea..806685e8a 100644 --- a/redhat/docker/el5/Dockerfile.x86_64 +++ b/redhat/docker/el5/Dockerfile.x86_64 @@ -20,8 +20,8 @@ RUN setarch ${ARCH} yum -y remove gnome-screensaver \ # Updated build tools (not provided in centos5) # Distro-specific patches -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 \ +RUN rpm -Uvh http://xh61v/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://xh61v/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|" diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages index 9c05dc013..78e50226a 100644 --- a/redhat/docker/el6/packages +++ b/redhat/docker/el6/packages @@ -118,6 +118,7 @@ libraw1394-devel libsamplerate-devel libsmbclient-devel libsndfile-devel +libssh-devel libssh2-devel libtheora-devel libtiff-devel diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index cae7bab86..a856eb671 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -38,11 +38,11 @@ COPY rpmmacros /home/trinity/.rpmmacros RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \ +RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/y/yaz-5.31.1-4.fc36.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/r/rdesktop-1.9.0-7.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index 46c7034d9..a1d43dc74 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -118,6 +118,7 @@ libsamplerate-devel libsecret-devel libsmbclient-devel libsndfile-devel +libssh-devel libssh2-devel libtheora-devel libtiff-devel diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 090d63f9d..7fdb8bdb9 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -40,19 +40,19 @@ COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/g/gnuchess-6.2.5-10.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm --nocheck \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index deb431bbe..4ba3e2fca 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -61,7 +61,9 @@ gtk3-devel gtk-doc guile-devel heimdal-devel +help2man hspell-devel +html2ps icu ImageMagick-devel imake @@ -93,6 +95,7 @@ libgsf-devel libgssglue-devel libical-devel libidn-devel +libjpeg-turbo-utils libksba-devel libmad-devel libmemcached-devel @@ -114,6 +117,7 @@ libsamplerate-devel libsecret-devel libsmbclient-devel libsndfile-devel +libssh-devel libtheora-devel libtiff-devel libtirpc-devel @@ -210,6 +214,7 @@ systemd-devel taglib-devel tcl texinfo +texlive-dvips torsocks transfig unixODBC-devel diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 new file mode 100644 index 000000000..a2915804a --- /dev/null +++ b/redhat/docker/el9/Dockerfile.x86_64 @@ -0,0 +1,100 @@ +FROM rockylinux:9 + +ARG TDE_VERSION=14.1.0 +ARG ARCH=x86_64 + +# Enable proxy +# Install OVL plugin for DNF +# Update distribution packages +# Add EPEL repository +# Add RPMFUSION repository +# Enable supplementary repositories +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && curl -o /usr/lib/python3.9/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \ + && dnf -y update \ + && dnf -y install epel-release \ + && dnf -y install https://download1.rpmfusion.org/free/el/updates/9/x86_64/r/rpmfusion-free-release-9-1.noarch.rpm \ + && dnf -y install dnf-plugins-core \ + && dnf config-manager --enable devel \ + && dnf config-manager --enable plus \ + && dnf -y --enableplugin=ovl install $(</packages) + +# Add YUM repository for locally built packages +WORKDIR /etc/yum.repos.d +COPY rpmbuild.repo rpmbuild.repo +RUN sed -i "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" + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Build supplementary development tools + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm + +RUN sudo rpm -Uvh \ + http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \ + http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/b/bdftopcf-1.1-4.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/bdftopcf-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/paper-2.3-4.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/paper-2*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/psutils-2.07-2.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-2*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-4.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/h/html2ps-1.0-0.42.b7.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/html2ps-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libxml++-2.42.1-3.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libofx-0.10.3-2.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP-GeoLite-data-2*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-1.6.12-11.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP{,-devel}-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages new file mode 100644 index 000000000..67cd3c9c9 --- /dev/null +++ b/redhat/docker/el9/packages @@ -0,0 +1,218 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bind-devel +binutils-devel +bison +bluez-libs-devel +boost-devel +boost-python3-devel +byacc +bzip2-devel +cdparanoia +cdparanoia-devel +chrpath +clamav +clamav-devel +cln-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +docbook2X +doxygen +emacs +esound-devel +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-devel +fontforge +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +gcc-gfortran +gettext-devel +giflib-devel +glibmm24-devel +gmp-devel +gnulib-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk-doc +help2man +hiredis +hspell-devel +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +kernel +lame-devel +libacl-devel +libao-devel +libarchive-devel +libassuan-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-devel +libdb-cxx-devel +libdvdread-devel +libfontenc-devel +libgsf-devel +libical-devel +libidn-devel +libjpeg-turbo-utils +libksba-devel +libmad-devel +libmemcached-devel +libmng-devel +libmpcdec-devel +libmtp-devel +libnsl2-devel +libogg-devel +libotr-devel +libpaper-devel +libpcap-devel +libqalculate-devel +libraw1394-devel +librsvg2-tools +librsync-devel +libsamplerate-devel +libsecret-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-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 +libudisks2-devel +libusb-devel +lirc-devel +lm_sensors-devel +mesa-libGL-devel +meson +mysql-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +OpenEXR-devel +openldap-devel +opensc +opensp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +perl +perl-devel +perl-generators +perl(ExtUtils::MakeMaker) +perl(inc::Module::Install) +perl(IPC::Run3) +perl(PAR::Dist) +perl(Module::Signature) +perl(Test::Pod) +perl(Test::Pod::Coverage) +perl(XML::Parser) +pigz +pkcs11-helper-devel +polkit-devel +poppler-devel +postgresql +postgresql-devel +ppp +pulseaudio-libs-devel +python3 +python3-devel +python3-pyxattr +rdesktop +rdiff-backup +readline-devel +recode +redhat-rpm-config +redis +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +systemd-devel +taglib-devel +tcl +texinfo +texlive-collection-basic +torsocks +transfig +unixODBC-devel +usbutils +valgrind +wget +xine-lib-devel +xmlto +xorg-x11-server-utils +xorg-x11-util-macros +xz-devel diff --git a/redhat/docker/el9/rpmbuild.repo b/redhat/docker/el9/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/el9/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/el9/rpmmacros b/redhat/docker/el9/rpmmacros new file mode 100644 index 000000000..a6c71dccc --- /dev/null +++ b/redhat/docker/el9/rpmmacros @@ -0,0 +1,6 @@ +%dist .el9 +%_smp_mflags -j8 +%jobs 8 +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil diff --git a/redhat/docker/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64 index 3b1aee7d6..18b2ad704 100644 --- a/redhat/docker/f34/Dockerfile.x86_64 +++ b/redhat/docker/f34/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:34 -ARG TDE_VERSION=14.0.10 +ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64 index b4a34b522..ff247e8ca 100644 --- a/redhat/docker/f35/Dockerfile.x86_64 +++ b/redhat/docker/f35/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:35 -ARG TDE_VERSION=14.0.10 +ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f36/Dockerfile.x86_64 b/redhat/docker/f36/Dockerfile.x86_64 index 80c5d583c..a17525d51 100644 --- a/redhat/docker/f36/Dockerfile.x86_64 +++ b/redhat/docker/f36/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:36 -ARG TDE_VERSION=14.0.12 +ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f36/rpmmacros b/redhat/docker/f36/rpmmacros index 22a794cc1..df3e572f4 100644 --- a/redhat/docker/f36/rpmmacros +++ b/redhat/docker/f36/rpmmacros @@ -1,6 +1,7 @@ %dist .fc36 %_smp_mflags -j8 %jobs 8 +%__brp_remove_la_files %nil %__cmake_builddir %nil %_debugsource_packages %nil %_debugsource_template %nil diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64 new file mode 100644 index 000000000..59f7d9fd4 --- /dev/null +++ b/redhat/docker/f37/Dockerfile.x86_64 @@ -0,0 +1,47 @@ +FROM fedora:37 + +ARG TDE_VERSION=14.1.0 +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{,-modular,-updates,-updates-modular}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|37|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-37.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 sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm + +RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-* + +RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/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/f37/packages b/redhat/docker/f37/packages new file mode 100644 index 000000000..474a39686 --- /dev/null +++ b/redhat/docker/f37/packages @@ -0,0 +1,240 @@ +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 +hspell-devel +htdig +html2ps +iceauth +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 +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 +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) +polkit-devel +poppler-devel +postgresql +postgresql-devel +postgresql-private-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 +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f37/rpmbuild.repo b/redhat/docker/f37/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f37/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/f37/rpmmacros b/redhat/docker/f37/rpmmacros new file mode 100644 index 000000000..3865a262b --- /dev/null +++ b/redhat/docker/f37/rpmmacros @@ -0,0 +1,9 @@ +%dist .fc37 +%_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 diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686 index e39ba47d2..f465d0914 100644 --- a/redhat/docker/mga8/Dockerfile.i686 +++ b/redhat/docker/mga8/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:8 -ARG TDE_VERSION=14.0.9 +ARG TDE_VERSION=14.1.0 ARG ARCH=i686 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/Dockerfile.x86_64 b/redhat/docker/mga8/Dockerfile.x86_64 index f2385a34f..6e978f9ee 100644 --- a/redhat/docker/mga8/Dockerfile.x86_64 +++ b/redhat/docker/mga8/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:8 -ARG TDE_VERSION=14.0.9 +ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/packages.i686 b/redhat/docker/mga8/packages.i686 index af6c6feb7..519c04181 100644 --- a/redhat/docker/mga8/packages.i686 +++ b/redhat/docker/mga8/packages.i686 @@ -55,6 +55,7 @@ gtk2-devel gtk+3.0-devel gtk-doc hspell-devel +html2ps hunspell-en iceauth ImageMagick-devel diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64 index ad8802b2c..8dc01d855 100644 --- a/redhat/docker/mga8/packages.x86_64 +++ b/redhat/docker/mga8/packages.x86_64 @@ -55,6 +55,7 @@ gtk2-devel gtk+3.0-devel gtk-doc hspell-devel +html2ps hunspell-en iceauth ImageMagick-devel diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64 index cf1d2e93d..fddd4f5eb 100644 --- a/redhat/docker/oss153/Dockerfile.x86_64 +++ b/redhat/docker/oss153/Dockerfile.x86_64 @@ -1,16 +1,18 @@ FROM opensuse/leap:15.3 -ARG TDE_VERSION=14.0.10 +ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 # Add PACKMAN repository # Install Trinity build dependencies COPY packages /packages -RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \ +RUN set -x \ + && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \ && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.3/ packman \ && zypper refresh \ - && zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64.rpm https://ftp.lysator.liu.se/pub/opensuse/distribution/leap/15.3/repo/oss/x86_64/libudisks2-0-devel-2.8.1-1.39.x86_64.rpm \ + && zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64 \ + && zypper -n install postgresql10{,-devel,-server}-10.17-8.35.1.x86_64 \ && zypper -n update \ && zypper -n install -l $(</packages) diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages index 78c263029..0f6f7c6f2 100644 --- a/redhat/docker/oss153/packages +++ b/redhat/docker/oss153/packages @@ -90,6 +90,7 @@ libgphoto2-devel libgpod-devel libgssglue-devel libical-devel +libICE-devel libidn-devel libiw-devel libjack-devel @@ -120,6 +121,7 @@ libraw1394-devel librsvg-devel libsamplerate-devel libSDL-devel +libSM-devel libsmbclient-devel libsndfile-devel libtag-devel @@ -136,7 +138,9 @@ libvorbis-devel libwmf-devel libwpd-devel libxine-devel +libXmu-devel libxslt-devel +libXt-devel libyaz-devel libzrtpcpp-devel lirc-devel @@ -164,7 +168,6 @@ perl-PAR-Packer perl-pcsc pkcs11-helper-devel pkgconfig(pygtk-2.0) -postgresql10 python-devel python3-devel python3-sip-devel @@ -200,3 +203,15 @@ xscreensaver xscreensaver-data xscreensaver-data-extra xz-devel + +font-util +imake +libXScrnSaver-devel +libXdmcp-devel +libfontenc-devel +libssh-devel +libxkbfile-devel +libXxf86vm-devel +libXxf86dga-devel +libXaw-devel +libXv-devel diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64 index b2bd08902..760db5067 100644 --- a/redhat/docker/oss154/Dockerfile.x86_64 +++ b/redhat/docker/oss154/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.4 -ARG TDE_VERSION=14.0.12 +ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 # Add PACKMAN repository @@ -12,8 +12,8 @@ RUN set -x \ && rm -fv /etc/zypp/repos.d/repo-sle-* \ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \ && zypper refresh \ - && zypper -n remove libjpeg62-devel \ && zypper -n update \ + && zypper -n install --oldpackage libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-data-2.4.46-150200.14.5.1.noarch \ && zypper -n install -l $(</packages) RUN ln -sfv python3 /usr/bin/python diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages index 68265c8db..cf75e1def 100644 --- a/redhat/docker/oss154/packages +++ b/redhat/docker/oss154/packages @@ -126,6 +126,7 @@ libSDL-devel libSM-devel libsmbclient-devel libsndfile-devel +libssh-devel libtag-devel libtheora-devel libtiff-devel diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index b286049c6..ec076eabd 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -33,6 +33,7 @@ RUN setarch ${ARCH} rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/s && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm # Add lilypond (i686 only) -#RUN rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-3.6.src.rpm \ -# && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ -# && setarch ${ARCH} rpmbuild -ba ~/rpmbuild/SPECS/lilypond.spec +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-3.9.src.rpm \ + && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ + && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-texgy-fonts,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 184e75ae2..231ed25aa 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -126,6 +126,7 @@ libSDL-devel libsensors4-devel libsmbclient-devel libsndfile-devel +libssh-devel libtag-devel libtheora-devel libtiff-devel diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index f3d5ac938..2aa9f8200 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -26,7 +26,7 @@ COPY genla.sh /usr/bin/genla.sh RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ && genla.sh libjpeg \ && 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 \ && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so # Add non-root user to build packages diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index 3135b2a39..e63e1594e 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -13,6 +13,7 @@ clamav clamav-devel cmake cups-devel +dbus-glib-devel desktop-file-utils djvulibre docbook-style-xsl @@ -75,6 +76,7 @@ lib64poppler-devel lib64readline-devel lib64sane1-devel lib64sndfile-devel +lib64ssh-devel lib64unwind-devel lib64usb1.0-devel lib64usb-compat0.1-devel @@ -161,6 +163,7 @@ openldap-devel opensc openslp-devel pam-devel +pcre-devel perl-devel perl-Image-Magick perl-PAR-Packer diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec index a2a42e6c6..dab280946 100644 --- a/redhat/extras/htdig/htdig.spec +++ b/redhat/extras/htdig/htdig.spec @@ -5,13 +5,19 @@ Summary: A web indexing and searching system for a small domain or intranet Name: htdig -Version: 3.2.0b7 +Version: 3.2.0b6_19 Release: 1%{?dist} License: GPL Group: Networking/WWW URL: http://www.htdig.org/ -Source0: htdig-3.2.0b7.tar.gz +Source0: htdig_3.2.0b6.orig.tar.gz + +Patch1: patches/htdig_3.2.0b6-13.diff +Patch2: patches/gcc-6 +Patch3: patches/sourceforge_logo +Patch4: patches/drop-bogus-assignment +Patch5: patches/gcc-11 BuildRequires: flex >= 2.5.4a-13 BuildRequires: libtool @@ -172,7 +178,12 @@ fi ########## %prep -%setup -q +%setup -q -n htdig-3.2.0b6 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 autoreconf -fiv diff --git a/redhat/extras/htdig/patches/drop-bogus-assignment b/redhat/extras/htdig/patches/drop-bogus-assignment new file mode 100644 index 000000000..2328280e3 --- /dev/null +++ b/redhat/extras/htdig/patches/drop-bogus-assignment @@ -0,0 +1,16 @@ +--- htdig-3.2.0b6.orig/htdig/Parsable.cc ++++ htdig-3.2.0b6/htdig/Parsable.cc +@@ -74,7 +74,6 @@ Parsable::addString(Retriever& retriever + retriever.got_word(w, wordindex++, slot); // slot for img_alt + w = HtWordToken(0); + } +- w = '\0'; + } + + //***************************************************************************** +@@ -92,5 +91,4 @@ Parsable::addKeywordString(Retriever& re + retriever.got_word(w, wordindex++, 9); + w = HtWordToken(0); + } +- w = '\0'; + } diff --git a/redhat/extras/htdig/patches/gcc-11 b/redhat/extras/htdig/patches/gcc-11 new file mode 100644 index 000000000..09c974cea --- /dev/null +++ b/redhat/extras/htdig/patches/gcc-11 @@ -0,0 +1,370 @@ +Index: b/htword/WordBitCompress.cc +=================================================================== +--- a/htword/WordBitCompress.cc ++++ b/htword/WordBitCompress.cc +@@ -29,7 +29,7 @@ + #include"WordBitCompress.h" + + // ******** HtVector_byte (implementation) +-#define GType byte ++#define GType byte_t + #define HtVectorGType HtVector_byte + #include "HtVectorGenericCode.h" + +@@ -424,13 +424,13 @@ + // ************************************************** + + void +-BitStream::put_zone(byte *vals,int n,const char *tag) ++BitStream::put_zone(byte_t *vals,int n,const char *tag) + { + add_tag(tag); + for(int i=0;i<(n+7)/8;i++){put_uint(vals[i],TMin(8,n-8*i),NULL);} + } + void +-BitStream::get_zone(byte *vals,int n,const char *tag) ++BitStream::get_zone(byte_t *vals,int n,const char *tag) + { + check_tag(tag); + for(int i=0;i<(n+7)/8;i++){vals[i]=get_uint(TMin(8,n-8*i));} +@@ -699,16 +699,16 @@ + if(all){printf("\n");} + + } +-byte * ++byte_t * + BitStream::get_data() + { +- byte *res=(byte *)malloc(buff.size()); ++ byte_t *res=(byte_t *)malloc(buff.size()); + CHECK_MEM(res); + for(int i=0;i<buff.size();i++){res[i]=buff[i];} + return(res); + } + void +-BitStream::set_data(const byte *nbuff,int nbits) ++BitStream::set_data(const byte_t *nbuff,int nbits) + { + if(buff.size()!=1 || bitpos!=0) + { +@@ -835,7 +835,7 @@ + + + int +-Compressor::put_fixedbitl(byte *vals,int n,const char *tag) ++Compressor::put_fixedbitl(byte_t *vals,int n,const char *tag) + { + int cpos=bitpos; + int i,j; +@@ -844,19 +844,19 @@ + put_uint_vl(n,NBITS_NVALS,"size"); + if(n==0){return 0;} + +- byte maxv=vals[0]; ++ byte_t maxv=vals[0]; + for(i=1;i<n;i++) + { +- byte v=vals[i]; ++ byte_t v=vals[i]; + if(v>maxv){maxv=v;} + } + int nbits=num_bits(maxv); +- if(n>=pow2(NBITS_NVALS)){errr("Compressor::put_fixedbitl(byte *) : overflow: nvals>2^16");} ++ if(n>=pow2(NBITS_NVALS)){errr("Compressor::put_fixedbitl(byte_t *) : overflow: nvals>2^16");} + put_uint(nbits,NBITS_NBITS_CHARVAL,"nbits"); + add_tag("data"); + for(i=0;i<n;i++) + { +- byte v=vals[i]; ++ byte_t v=vals[i]; + for(j=0;j<nbits;j++) {put(v&pow2(j));} + } + return(bitpos-cpos); +@@ -887,15 +887,15 @@ + } + } + int +-Compressor::get_fixedbitl(byte **pres,const char *tag/*="BADTAG!"*/) ++Compressor::get_fixedbitl(byte_t **pres,const char *tag/*="BADTAG!"*/) + { +- if(check_tag(tag)==NOTOK){errr("Compressor::get_fixedbitl(byte *): check_tag failed");} ++ if(check_tag(tag)==NOTOK){errr("Compressor::get_fixedbitl(byte_t *): check_tag failed");} + int n=get_uint_vl(NBITS_NVALS); + if(!n){*pres=NULL;return 0;} + int nbits=get_uint(NBITS_NBITS_CHARVAL); +- if(verbose)printf("get_fixedbitl(byte):n%3d nbits:%2d\n",n,nbits); ++ if(verbose)printf("get_fixedbitl(byte_t):n%3d nbits:%2d\n",n,nbits); + int i; +- byte *res=new byte[n]; ++ byte_t *res=new byte_t[n]; + CHECK_MEM(res); + for(i=0;i<n;i++) + { +Index: b/htword/WordBitCompress.h +=================================================================== +--- a/htword/WordBitCompress.h ++++ b/htword/WordBitCompress.h +@@ -28,9 +28,9 @@ + #include"HtVector_int.h" + #include"HtMaxMin.h" + +-typedef unsigned char byte; ++typedef unsigned char byte_t; + // ******** HtVector_byte (header) +-#define GType byte ++#define GType byte_t + #define HtVectorGType HtVector_byte + #include "HtVectorGeneric.h" + +@@ -123,12 +123,12 @@ + } + + // gets a bit from the bitstream +- inline byte get(const char *tag=(char*)NULL) ++ inline byte_t get(const char *tag=(char*)NULL) + { + // SPEED CRITICAL SECTION + if(check_tag(tag)==NOTOK){errr("BitStream::get() check_tag failed");} + if(bitpos>=(buff.size()<<3)){errr("BitStream::get reading past end of BitStream!");} +- byte res=buff[bitpos>>3] & pow2(bitpos & 0x07); ++ byte_t res=buff[bitpos>>3] & pow2(bitpos & 0x07); + // printf("get:res:%d bitpos:%5d/%d buff[%3d]=%x\n",res,bitpos,bitpos%8,bitpos/8,buff[bitpos/8]); + bitpos++; + return(res); +@@ -139,8 +139,8 @@ + unsigned int get_uint( int n,const char *tag=(char*)NULL); + + // get/put n bits of data stored in vals +- void put_zone(byte *vals,int n,const char *tag); +- void get_zone(byte *vals,int n,const char *tag); ++ void put_zone(byte_t *vals,int n,const char *tag); ++ void get_zone(byte_t *vals,int n,const char *tag); + + // + inline void add_tag(const char *tag) +@@ -167,9 +167,9 @@ + int buffsize(){return(buff.size());} + + // get a copy of the buffer +- byte *get_data(); ++ byte_t *get_data(); + // set the buffer from outside data (current buffer must be empty) +- void set_data(const byte *nbuff,int nbits); ++ void set_data(const byte_t *nbuff,int nbits); + + // use this for reading a BitStream after you have written in it + // (generally for debuging) +@@ -211,7 +211,7 @@ + #define NBITS_VAL 32 + // number of bits to code he number of bits used by an unsigned int value + #define NBITS_NBITS_VAL 5 +-// number of bits to code the number of bits used by a byte value ++// number of bits to code the number of bits used by a byte_t value + #define NBITS_NBITS_CHARVAL 4 + + class Compressor : public BitStream +@@ -240,8 +240,8 @@ + int get_vals(unsigned int **pres,const char *tag=(char*)"BADTAG!"); + + // compress/decompress an array of bytes (very simple) +- int put_fixedbitl(byte *vals,int n,const char *tag); +- int get_fixedbitl(byte **pres,const char *tag=(char*)"BADTAG!"); ++ int put_fixedbitl(byte_t *vals,int n,const char *tag); ++ int get_fixedbitl(byte_t **pres,const char *tag=(char*)"BADTAG!"); + + // compress/decompress an array of unsigned ints (very simple) + void get_fixedbitl(unsigned int *res,int n); +Index: b/htword/WordDBPage.cc +=================================================================== +--- a/htword/WordDBPage.cc ++++ b/htword/WordDBPage.cc +@@ -155,7 +155,7 @@ + Uncompress_main(pin); + break; + case CMPRTYPE_BADCOMPRESS:// this page did not compress correctly +- pin->get_zone((byte *)pg,pgsz*8,"INITIALBUFFER"); ++ pin->get_zone((byte_t *)pg,pgsz*8,"INITIALBUFFER"); + break; + default: + errr("WordDBPage::Uncompress: CMPRTYPE incoherent"); +@@ -181,7 +181,7 @@ + int *rnum_sizes=new int[nnums]; + CHECK_MEM(rnum_sizes); + // char differences between words +- byte *rworddiffs=NULL; ++ byte_t *rworddiffs=NULL; + int nrworddiffs; + + // *********** read header +@@ -288,7 +288,7 @@ + return OK; + } + void +-WordDBPage::Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte *rworddiffs,int nrworddiffs) ++WordDBPage::Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte_t *rworddiffs,int nrworddiffs) + { + int irwordiffs=0; + int nfields=WordKey::NFields(); +@@ -405,7 +405,7 @@ + + // display + void +-WordDBPage::Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte *rworddiffs,int nrworddiffs) ++WordDBPage::Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte_t *rworddiffs,int nrworddiffs) + { + int i,j; + if(verbose) +@@ -464,7 +464,7 @@ + res->put_uint(COMPRESS_VERSION,NBITS_COMPRESS_VERSION,"COMPRESS_VERSION"); + res->put_uint(CMPRTYPE_BADCOMPRESS,NBITS_CMPRTYPE,"CMPRTYPE"); + +- res->put_zone((byte *)pg,pgsz*8,"INITIALBUFFER"); ++ res->put_zone((byte_t *)pg,pgsz*8,"INITIALBUFFER"); + } + + if(verbose) +@@ -761,7 +761,7 @@ + printf("compare failed in some unknown place in header:\n"); + for(i=0;i<(int)(sizeof(PAGE)-sizeof(db_indx_t));i++) + { +- printf("%3d: %3x %3x\n",i,((byte *)pg)[i],((byte *)other.pg)[i]); ++ printf("%3d: %3x %3x\n",i,((byte_t *)pg)[i],((byte_t *)other.pg)[i]); + } + } + +@@ -998,7 +998,7 @@ + printf("%5d: ",nn); + for(j=0;j<20;j++) + { +- printf("%2x ",((byte *)pg)[nn++]); ++ printf("%2x ",((byte_t *)pg)[nn++]); + if(nn>=pgsz){break;} + } + printf("\n"); +Index: b/htword/WordDBPage.h +=================================================================== +--- a/htword/WordDBPage.h ++++ b/htword/WordDBPage.h +@@ -65,7 +65,7 @@ + } + } + WordDBRecord():WordRecord(){;} +- WordDBRecord(byte *dat,int len,int rectyp):WordRecord() ++ WordDBRecord(byte_t *dat,int len,int rectyp):WordRecord() + { + type=(rectyp ? DefaultType() : WORD_RECORD_STATS); + Unpack(String((char *)dat,len)); +@@ -118,7 +118,7 @@ + } + else{Unpack(String((char *)nkey->data,nkey->len));} + } +- WordDBKey(byte *data,int len):WordKey() ++ WordDBKey(byte_t *data,int len):WordKey() + { + key=NULL; + if(!data || !len){errr("WordDBKey::WordDBKey(data,len) !data || !len");} +@@ -207,7 +207,7 @@ + void *alloc_entry(int size) + { + size=WORD_ALIGN_TO(size,4); +- int inp_pos=((byte *)&(pg->inp[insert_indx]))-(byte *)pg; ++ int inp_pos=((byte_t *)&(pg->inp[insert_indx]))-(byte_t *)pg; + insert_pos-=size; + if(insert_pos<=inp_pos) + { +@@ -216,7 +216,7 @@ + errr("WordDBPage::alloc_entry: PAGE OVERFLOW"); + } + pg->inp[insert_indx++]=insert_pos; +- return((void *)((byte *)pg+insert_pos)); ++ return((void *)((byte_t *)pg+insert_pos)); + } + + +@@ -260,11 +260,11 @@ + ky.Pack(pkey); + keylen=pkey.length(); + } +- int size=keylen+((byte *)&(bti.data))-((byte *)&bti);// pos of data field in BINTERNAL ++ int size=keylen+((byte_t *)&(bti.data))-((byte_t *)&bti);// pos of data field in BINTERNAL + if(empty) + { + if(verbose){printf("WordDBPage::insert_btikey: empty : BINTERNAL:%d datapos:%d keylen:%d size:%d alligned to:%d\n",(int)sizeof(BINTERNAL), +- (int)(((byte *)&(bti.data))-((byte *)&bti)), ++ (int)(((byte_t *)&(bti.data))-((byte_t *)&bti)), + keylen,size,WORD_ALIGN_TO(size,4));} + } + +@@ -306,8 +306,8 @@ + int Uncompress_main(Compressor *pin); + void Uncompress_vals_chaged_flags(Compressor &in,unsigned int **pcflags,int *pn); + int Uncompress_header(Compressor &in); +- void Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte *rworddiffs,int nrworddiffs); +- void Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte *rworddiffs,int nrworddiffs); ++ void Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte_t *rworddiffs,int nrworddiffs); ++ void Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte_t *rworddiffs,int nrworddiffs); + + int TestCompress(int debuglevel); + int Compare(WordDBPage &other); +@@ -326,14 +326,14 @@ + out.put_uint(btikey(i)->type ,sizeof(btikey(i)->type )*8,label_str("seperatekey_bti_type" ,i)); + out.put_uint(btikey(i)->pgno ,sizeof(btikey(i)->pgno )*8,label_str("seperatekey_bti_pgno" ,i)); + out.put_uint(btikey(i)->nrecs,sizeof(btikey(i)->nrecs)*8,label_str("seperatekey_bti_nrecs",i)); +- if(len){out.put_zone((byte *)btikey(i)->data,8*len,label_str("seperatekey_btidata",i));} ++ if(len){out.put_zone((byte_t *)btikey(i)->data,8*len,label_str("seperatekey_btidata",i));} + } + else + { + int len=key(i)->len; + out.put_uint(len,NBITS_KEYLEN,label_str("seperatekey_len",i)); + if(verbose){printf("WordDBPage::compress_key: compress(typ5):%d\n",len);} +- out.put_zone((byte *)key(i)->data,8*len,label_str("seperatekey_data",i)); ++ out.put_zone((byte_t *)key(i)->data,8*len,label_str("seperatekey_data",i)); + } + } + void compress_data(Compressor &out,int i) +@@ -341,7 +341,7 @@ + int len=data(i)->len; + out.put_uint(len,NBITS_DATALEN,label_str("seperatedata_len",i)); + if(verbose){printf("WordDBPage::compress_data: compressdata(typ5):%d\n",len);} +- out.put_zone((byte *)data(i)->data,8*len,label_str("seperatedata_data",i)); ++ out.put_zone((byte_t *)data(i)->data,8*len,label_str("seperatedata_data",i)); + } + WordDBKey uncompress_key(Compressor &in,int i) + { +@@ -360,7 +360,7 @@ + if(len!=bti.len){errr("WordDBPage::uncompress_key: incoherence: len!=bti.len");} + if(len) + { +- byte *gotdata=new byte[len]; ++ byte_t *gotdata=new byte_t[len]; + CHECK_MEM(gotdata); + in.get_zone(gotdata,8*len,label_str("seperatekey_btidata",i)); + res=WordDBKey(gotdata,len); +@@ -370,7 +370,7 @@ + } + else + { +- byte *gotdata=new byte[len]; ++ byte_t *gotdata=new byte_t[len]; + CHECK_MEM(gotdata); + in.get_zone(gotdata,8*len,label_str("seperatekey_data",i)); + res=WordDBKey(gotdata,len); +@@ -384,7 +384,7 @@ + WordDBRecord res; + int len=in.get_uint(NBITS_DATALEN,label_str("seperatedata_len",i)); + if(verbose)printf("uncompressdata:len:%d\n",len); +- byte *gotdata=new byte[len]; ++ byte_t *gotdata=new byte_t[len]; + CHECK_MEM(gotdata); + in.get_zone(gotdata,8*len,label_str("seperatedata_data",i)); + res=WordDBRecord(gotdata,len,rectyp); +@@ -488,7 +488,7 @@ + { + init0(); + pgsz=npgsz; +- pg=(PAGE *)(new byte[pgsz]); ++ pg=(PAGE *)(new byte_t[pgsz]); + CHECK_MEM(pg); + insert_pos=pgsz; + insert_indx=0; diff --git a/redhat/extras/htdig/patches/gcc-6 b/redhat/extras/htdig/patches/gcc-6 new file mode 100644 index 000000000..5031ea0c7 --- /dev/null +++ b/redhat/extras/htdig/patches/gcc-6 @@ -0,0 +1,12 @@ +Description: Fix FTBFS with gcc-6. +--- htdig-3.2.0b6.orig/htfuzzy/Accents.cc ++++ htdig-3.2.0b6/htfuzzy/Accents.cc +@@ -43,7 +43,7 @@ extern int debug; + | table iso-latin1 "minusculisee" et "de-accentuee" | + `--------------------------------------------------*/ + +-static char MinusculeISOLAT1[256] = { ++static unsigned char MinusculeISOLAT1[256] = { + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, diff --git a/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff b/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff new file mode 100644 index 000000000..4562e03fe --- /dev/null +++ b/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff @@ -0,0 +1,176 @@ +Description: complete diff against upstream of version 3.2.0b6 + +--- htdig-3.2.0b6.orig/db/os_rw.c ++++ htdig-3.2.0b6/db/os_rw.c +@@ -5,6 +5,13 @@ + * Sleepycat Software. All rights reserved. + */ + ++#define _XOPEN_SOURCE 500 ++#include <sys/types.h> ++#include <unistd.h> ++#ifndef u_long ++typedef __u_long u_long; ++#endif ++ + #include "db_config.h" + + #ifndef lint +--- htdig-3.2.0b6.orig/htcommon/defaults.cc ++++ htdig-3.2.0b6/htcommon/defaults.cc +@@ -596,7 +596,7 @@ + <a href=\"htfuzzy.html\">htfuzzy</a> for more information on the \ + format of this file. \ + " }, \ +-{ "endings_root2word_db", "${common_dir}/root2word.db", \ ++{ "endings_root2word_db", "${database_dir}/root2word.db", \ + "string", "htfuzzy htsearch", "", "all", "File Layout", "endings_root2word_db: /var/htdig/r2w.db", " \ + This attributes specifies the database filename to be \ + used in the 'endings' fuzzy search algorithm. The \ +@@ -610,7 +610,7 @@ + This is because this database can be shared with \ + different search databases. \ + " }, \ +-{ "endings_word2root_db", "${common_dir}/word2root.db", \ ++{ "endings_word2root_db", "${database_dir}/word2root.db", \ + "string", "htfuzzy htsearch", "", "all", "File Layout", "endings_word2root_db: /var/htdig/w2r.bm", " \ + This attributes specifies the database filename to be \ + used in the 'endings' fuzzy search algorithm. The \ +@@ -2426,7 +2426,7 @@ + that this does not limit the number of documents that \ + are matched in any way. \ + " }, \ +-{ "synonym_db", "${common_dir}/synonyms.db", \ ++{ "synonym_db", "${database_dir}/synonyms.db", \ + "string", "htsearch htfuzzy", "", "3.0", "File Layout", "synonym_db: ${database_base}.syn.db", " \ + Points to the database that <a href=\"htfuzzy.html\"> \ + htfuzzy</a> creates when the <strong>synonyms</strong> \ +--- htdig-3.2.0b6.orig/htdig/Server.cc ++++ htdig-3.2.0b6/htdig/Server.cc +@@ -341,6 +341,8 @@ + { + String fullpatt = "^[^:]*://[^/]*("; + fullpatt << pattern << ')'; ++ if (pattern.length() == 0) ++ fullpatt = ""; + _disallow.set(fullpatt, config->Boolean("case_sensitive")); + } + } +--- htdig-3.2.0b6.orig/htsearch/Collection.h ++++ htdig-3.2.0b6/htsearch/Collection.h +@@ -36,9 +36,9 @@ + const char *docExcerpt); + ~Collection(); + +- void Collection::Open(); ++ void Open(); + +- void Collection::Close(); ++ void Close(); + + char *getWordFile() { return wordFile.get(); } + DocumentRef *getDocumentRef(int id); +--- htdig-3.2.0b6.orig/htsearch/Display.cc ++++ htdig-3.2.0b6/htsearch/Display.cc +@@ -54,6 +54,7 @@ + + #include <math.h> + #include <float.h> ++#include <values.h> + + #if !defined(DBL_MAX) + # if defined (MAXDOUBLE) +@@ -137,7 +138,7 @@ + // Must temporarily stash the message in a String, since + // displaySyntaxError will overwrite the static temp used in form. + +- String s(form("No such sort method: `%s'", (const char*)config->Find("sort"))); ++ String s("Invalid sort method."); + + displaySyntaxError(s); + return; +--- htdig-3.2.0b6.orig/htsearch/htsearch.cc ++++ htdig-3.2.0b6/htsearch/htsearch.cc +@@ -211,8 +211,7 @@ + } + if (access((char*)configFile, R_OK) < 0) + { +- reportError(form("Unable to read configuration file '%s'", +- configFile.get())); ++ reportError("Unable to read configuration file"); + } + config->Read(configFile); + +--- htdig-3.2.0b6.orig/htsearch/qtest.cc ++++ htdig-3.2.0b6/htsearch/qtest.cc +@@ -132,8 +132,7 @@ + + if (access((char*)configFile, R_OK) < 0) + { +- reportError(form("Unable to find configuration file '%s'", +- configFile.get())); ++ reportError("Unable to find configuration file"); + } + + config->Read(configFile); +--- htdig-3.2.0b6.orig/htword/WordDBPage.cc ++++ htdig-3.2.0b6/htword/WordDBPage.cc +@@ -82,7 +82,7 @@ + if(debuglevel>2)printf("TOTAL SIZE: %6d %8f\n",size,size/8.0); + // argh! compare failed somthing went wrong + // display the compress/decompress sequence and fail +- if(cmp || size>8*1024*1000000000) ++ if(cmp || size>8*1024) + { + if(size>8*1024) + { +--- htdig-3.2.0b6.orig/installdir/rundig ++++ htdig-3.2.0b6/installdir/rundig +@@ -7,17 +7,18 @@ + # + # This is a sample script to create a search database for ht://Dig. + # +-DBDIR=@DATABASE_DIR@ +-COMMONDIR=@COMMON_DIR@ +-BINDIR=@BIN_DIR@ +-conffile=@DEFAULT_CONFIG_FILE@ ++DBDIR=/var/lib/htdig ++COMMONDIR=/etc/htdig ++BINDIR=/usr/bin ++conffile=/etc/htdig/htdig.conf + + # To help debug problems, try running rundig -vvv + # This will add lots of debugging output to all of the programs +-stats= opts= alt= ++stats= opts= alt= nohtnotify= + while [ "$#" -gt 0 ] + do + case "$1" in ++ --no-htnotify) nohtnotify="true" ;; + -a) alt="$1" ;; + -s) stats="$1" ;; + -c) shift +@@ -65,7 +66,11 @@ + test -f db.words.db.work_weakcmpr && + mv -f db.words.db.work_weakcmpr db.words.db_weakcmpr) ;; + esac +-$BINDIR/htnotify $opts ++if [ "$nohtnotify" = "true" ]; then ++ echo "Skipping htnotify." ++else ++ $BINDIR/htnotify $opts ++fi + # If you want to use the soundex and (or) metaphone fuzzy matchings, + # Uncomment the following line + # $BINDIR/htfuzzy $opts soundex metaphone +--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc ++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc +@@ -142,7 +142,7 @@ + // Must temporarily stash the message in a String, since + // displaySyntaxError will overwrite the static temp used in form. + +- String s(form("No such sort method: `%s'", (const char *) config->Find("sort"))); ++ String s("Invalid search method."); + + displaySyntaxError(s); + //return; diff --git a/redhat/extras/htdig/patches/kfreebsd b/redhat/extras/htdig/patches/kfreebsd new file mode 100644 index 000000000..d30d68be7 --- /dev/null +++ b/redhat/extras/htdig/patches/kfreebsd @@ -0,0 +1,25 @@ +From: Steven Chamberlain <steven@pyro.eu.org> +Subject: only use ETIME if defined +Bug-Debian: http://bugs.debian.org/765284 +Forwarded: no + +ETIME relates to an optional POSIX STREAMS extension not implemented +on some platforms (such as GNU/kFreeBSD). + +Don't check for this return value on platforms that don't define it. + +--- htdig-3.2.0b6.orig/db/mut_pthread.c.orig 2002-02-02 18:18:05.000000000 +0000 ++++ htdig-3.2.0b6/db/mut_pthread.c 2014-10-14 12:40:53.771737556 +0100 +@@ -201,7 +201,11 @@ + * call, and Solaris delivers the signal to the wrong + * LWP. + */ +- if (ret != 0 && ret != ETIME && ret != ETIMEDOUT) ++ if (ret != 0 && ++#ifdef ETIME ++ ret != ETIME && ++#endif ++ ret != ETIMEDOUT) + return (ret); + } + diff --git a/redhat/extras/htdig/patches/series b/redhat/extras/htdig/patches/series new file mode 100644 index 000000000..da0d40c91 --- /dev/null +++ b/redhat/extras/htdig/patches/series @@ -0,0 +1,6 @@ +htdig_3.2.0b6-13.diff +kfreebsd +gcc-6 +sourceforge_logo +drop-bogus-assignment +gcc-11 diff --git a/redhat/extras/htdig/patches/sourceforge_logo b/redhat/extras/htdig/patches/sourceforge_logo new file mode 100644 index 000000000..dd3d1e719 --- /dev/null +++ b/redhat/extras/htdig/patches/sourceforge_logo @@ -0,0 +1,118 @@ +Description: don't remote-link SourceForge's logo + This let SourceForge track everyone who reads these docs. As the image is + not freely licensed, let's leave only a piece of text. +--- htdig-3.2.0b6.orig/htdoc/FAQ.html ++++ htdig-3.2.0b6/htdoc/FAQ.html +@@ -2585,6 +2585,6 @@ find /path/to/your/document/root -type f + Last modified: $Date: 2004/05/28 13:15:16 $ + <br> + <a href="http://sourceforge.net/"> +- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++ SourceForge</a> + </body> + </html> +--- htdig-3.2.0b6.orig/htdoc/author.html ++++ htdig-3.2.0b6/htdoc/author.html +@@ -34,6 +34,6 @@ + Last modified: $Date: 2004/05/28 13:15:18 $ + <br> + <a href="http://sourceforge.net/"> +- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++ SourceForge</a> + </body> + </html> +--- htdig-3.2.0b6.orig/htdoc/bugs.html ++++ htdig-3.2.0b6/htdoc/bugs.html +@@ -50,6 +50,6 @@ + Last modified: $Date: 2004/05/28 13:15:18 $ + <br> + <a href="http://sourceforge.net/"> +- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++ SourceForge</a> + </body> + </html> +--- htdig-3.2.0b6.orig/htdoc/isp.html ++++ htdig-3.2.0b6/htdoc/isp.html +@@ -81,7 +81,7 @@ + Last modified: $Date: 2004/05/28 13:15:19 $ + <br> + <a href="http://sourceforge.net/"> +- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++ SourceForge</a> + + </body> + </html> +--- htdig-3.2.0b6.orig/htdoc/mailing.html ++++ htdig-3.2.0b6/htdoc/mailing.html +@@ -55,6 +55,6 @@ + Last modified: $Date: 2004/05/28 13:15:19 $ + <br> + <a href="http://sourceforge.net/"> +- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++ SourceForge</a> + </body> + </html> +--- htdig-3.2.0b6.orig/htdoc/main.html ++++ htdig-3.2.0b6/htdoc/main.html +@@ -103,6 +103,6 @@ + Last modified: $Date: 2004/05/28 13:15:19 $ + <br> + <a href="http://sourceforge.net/"> +- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++ SourceForge</a> + </body> + </html> +--- htdig-3.2.0b6.orig/htdoc/rundig.html ++++ htdig-3.2.0b6/htdoc/rundig.html +@@ -184,7 +184,7 @@ + Last modified: $Date: 2004/06/12 13:39:13 $ + <br> + <a href="http://sourceforge.net/"> +- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++ SourceForge</a> + + </body> + </html> +--- htdig-3.2.0b6.orig/htdoc/running.html ++++ htdig-3.2.0b6/htdoc/running.html +@@ -131,7 +131,7 @@ + Last modified: $Date: 2004/05/28 13:15:19 $ + <br> + <a href="http://sourceforge.net/"> +- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++ SourceForge</a> + + </body> + </html> +--- htdig-3.2.0b6.orig/htdoc/uses.html ++++ htdig-3.2.0b6/htdoc/uses.html +@@ -646,7 +646,7 @@ + Last modified: $Date: 2004/05/28 13:15:19 $ + <br> + <a href="http://sourceforge.net/"> +- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++ SourceForge</a> + + </body> + </html> +--- htdig-3.2.0b6.orig/htdoc/where.html ++++ htdig-3.2.0b6/htdoc/where.html +@@ -121,6 +121,6 @@ + <br> + + <a href="http://sourceforge.net/"> +-<img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++SourceForge</a> + </body> + </html> +--- htdig-3.2.0b6.orig/test/htdocs/set1/bad_local.htm ++++ htdig-3.2.0b6/test/htdocs/set1/bad_local.htm +@@ -51,7 +51,7 @@ + Last modified: $Date: 2004/01/18 12:54:15 $ + <br> + <a href="http://sourceforge.net/"> +- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> ++ SourceForge</a> + + </body> + </html> diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index 06391b49f..9edde3e74 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -149,7 +149,10 @@ Requires: trinity-kkbswitch Requires: trinity-klamav %endif Requires: trinity-klcddimmer +%if 0%{?rhel} <= 8 +# No mplayer on RHEL9 Requires: trinity-kmplayer +%endif Requires: trinity-kmyfirewall Requires: trinity-kmymoney Requires: trinity-knemo @@ -165,7 +168,7 @@ Requires: trinity-konversation Requires: trinity-kooldock Requires: trinity-kopete-otr Requires: trinity-kpicosim -%if 0%{?sle_version} <= 150300 +%if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599 %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6 Requires: trinity-kpilot %endif @@ -189,7 +192,9 @@ Requires: trinity-kvkbd Requires: trinity-kvpnc Requires: trinity-kxmleditor Requires: trinity-mathemagics +%if 0%{?rhel} <= 8 Requires: trinity-mplayerthumbs +%endif Requires: trinity-piklab %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7 # On RHEL6, polkit is too old @@ -205,7 +210,7 @@ Requires: trinity-smb4k Requires: trinity-smartcardauth Requires: trinity-soundkonverter Requires: trinity-tastymenu -%if 0%{?sle_version} <= 150300 +%if 0%{?sle_version} <= 150300 && 0%{?rhel} <= 8 Requires: trinity-tde-guidance %endif Requires: trinity-tde-style-baghira @@ -213,8 +218,13 @@ Requires: trinity-tde-style-domino Requires: trinity-tde-style-ia-ora Requires: trinity-tde-style-lipstik Requires: trinity-tde-style-qtcurve +%if 0%{?sle_version} <= 150300 && 0%{?rhel} <= 8 Requires: trinity-tde-systemsettings +%endif Requires: trinity-tdedocker +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7 +Requires: trinity-tdeio-appinfo +%endif Requires: trinity-tdeio-apt Requires: trinity-tdeio-ftps Requires: trinity-tdeio-gopher @@ -234,6 +244,7 @@ Requires: trinity-tellico Requires: trinity-tork Requires: trinity-twin-style-crystal Requires: trinity-twin-style-dekorator +Requires: trinity-twin-style-machbunt Requires: trinity-twin-style-suse2 Requires: trinity-wlassistant Requires: trinity-yakuake diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec index 66d8f9eac..a7fbe66a1 100644 --- a/redhat/libraries/kipi-plugins/kipi-plugins.spec +++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec @@ -93,7 +93,7 @@ BuildRequires: libexiv2-devel %endif # GPOD (ipod) support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_gpod 1 BuildRequires: libgpod-devel >= 0.4.2 %endif diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec index 4cfa2120f..f20dcbf71 100644 --- a/redhat/libraries/libksquirrel/libksquirrel.spec +++ b/redhat/libraries/libksquirrel/libksquirrel.spec @@ -35,6 +35,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -324,6 +325,23 @@ This package contains the runtime libraries for KSquirrel. %{tde_datadir}/ksquirrel-libs/libkls_tiff.so.ui %{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui %{tde_datadir}/ksquirrel-libs/rgbmap +%{tde_mandir}/man1/ksquirrel-libs-camera2ppm.1 +%{tde_mandir}/man1/ksquirrel-libs-dcraw.1 +%{tde_mandir}/man1/ksquirrel-libs-dicom2png.1 +%{tde_mandir}/man1/ksquirrel-libs-fig2ppm.1 +%{tde_mandir}/man1/ksquirrel-libs-iff2ppm.1 +%{tde_mandir}/man1/ksquirrel-libs-leaf2ppm.1 +%{tde_mandir}/man1/ksquirrel-libs-ljpeg2ppm-s.1 +%{tde_mandir}/man1/ksquirrel-libs-ljpeg2ppm.1 +%{tde_mandir}/man1/ksquirrel-libs-mac2ppm.1 +%{tde_mandir}/man1/ksquirrel-libs-neo2ppm.1 +%{tde_mandir}/man1/ksquirrel-libs-pi12ppm.1 +%{tde_mandir}/man1/ksquirrel-libs-pi32ppm.1 +%{tde_mandir}/man1/ksquirrel-libs-svg2png.1 +%{tde_mandir}/man1/ksquirrel-libs-ttf2pnm.1 +%{tde_mandir}/man1/ksquirrel-libs-utah2ppm.1 +%{tde_mandir}/man1/ksquirrel-libs-xcf2pnm.1 +%{tde_mandir}/man1/ksquirrel-libs-xim2ppm.1 ########## diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec index 83fda2d77..ca731fc4d 100644 --- a/redhat/main/tdeaddons/tdeaddons.spec +++ b/redhat/main/tdeaddons/tdeaddons.spec @@ -30,6 +30,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -99,7 +100,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -138,8 +139,9 @@ BuildRequires: db4-devel #%endif # PYTHON2 support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define with_python 0 +%global __python %__python3 %else %define with_python 1 %if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7 @@ -198,6 +200,7 @@ America and Europe. %{tde_tdeappdir}/atlantikdesigner.desktop %{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png %{tde_tdedocdir}/HTML/en/atlantikdesigner/ +%{tde_mandir}/man1/atlantikdesigner.1* ########## @@ -355,6 +358,7 @@ provided for audio and image files. %{tde_datadir}/services/tdefile_txt.desktop %{tde_datadir}/services/renaudiodlg.desktop %{tde_datadir}/services/renimagedlg.desktop +%{tde_mandir}/man1/lnkforward.1* ########## @@ -582,6 +586,10 @@ graphical disk usage viewer and image conversions and transformations. %{tde_tdelibdir}/libadblock.la %{tde_tdelibdir}/libadblock.so %{tde_tdedocdir}/HTML/en/konq-plugins/ +%{tde_mandir}/man1/exif.py.1* +%{tde_mandir}/man1/fsview.1* +%{tde_mandir}/man1/jpegorient.1* +%{tde_mandir}/man1/orient.py.1* ########## @@ -607,6 +615,7 @@ signatures in external mail clients such as KMail. %{tde_datadir}/apps/ksig/ %{tde_datadir}/icons/hicolor/*/apps/ksig.png %{tde_tdedocdir}/HTML/en/ksig/ +%{tde_mandir}/man1/ksig.1* ########## @@ -664,6 +673,9 @@ of user interfaces, playlists and visualisation plugins. %{tde_tdelibdir}/noatunwavecapture.so %{tde_datadir}/apps/noatun/* %{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png +%{tde_mandir}/man1/noatunsynaescope.bin.1* +%{tde_mandir}/man1/noatuntippecanoe.bin.1* +%{tde_mandir}/man1/noatuntyler.bin.1* ########## diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec index 8f375e734..3722ca1bd 100644 --- a/redhat/main/tdeartwork/tdeartwork.spec +++ b/redhat/main/tdeartwork/tdeartwork.spec @@ -31,6 +31,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_sbindir %{tde_prefix}/sbin %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde @@ -104,7 +105,7 @@ BuildRequires: libart_lgpl-devel # RHEL 6: available in EPEL # RHEL 7: available in NUX # RHEL 8: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -164,7 +165,7 @@ BuildRequires: %{jack_devel} # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -384,12 +385,34 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop %{tde_datadir}/apps/kfiresaver/ %{tde_datadir}/apps/tdescreensaver/ +%{tde_mandir}/man1/kbanner.kss.1* +%{tde_mandir}/man1/kblob.kss.1* +%{tde_mandir}/man1/kclock.kss.1* +%{tde_mandir}/man1/keuphoria.kss.1 +%{tde_mandir}/man1/kfiresaver.kss.1 +%{tde_mandir}/man1/kflux.kss.1 +%{tde_mandir}/man1/kfountain.kss.1 +%{tde_mandir}/man1/kgravity.kss.1 +%{tde_mandir}/man1/klines.kss.1 +%{tde_mandir}/man1/klorenz.kss.1 +%{tde_mandir}/man1/kpendulum.kss.1 +%{tde_mandir}/man1/kpolygon.kss.1 +%{tde_mandir}/man1/krotation.kss.1 +%{tde_mandir}/man1/kscience.kss.1 +%{tde_mandir}/man1/kslideshow.kss.1 +%{tde_mandir}/man1/ksolarwinds.kss.1 +%{tde_mandir}/man1/kvm.kss.1 +%{tde_mandir}/man1/kwave.kss.1 +%{tde_mandir}/man1/tdeasciiquarium.kss.1 +%{tde_mandir}/man1/tdepartsaver.kss.1 %if 0%{?with_xscreensaver} %{tde_bindir}/kspace.kss %{tde_bindir}/kswarm.kss %{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop %{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop +%{tde_mandir}/man1/kspace.kss.1 +%{tde_mandir}/man1/kswarm.kss.1 %endif ########## @@ -515,6 +538,8 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop %{tde_datadir}/applnk/System/ScreenSavers/worm.desktop %endif +%{tde_mandir}/man1/kxsconfig.1 +%{tde_mandir}/man1/kxsrun.1 %endif @@ -740,7 +765,6 @@ fi -DWITH_ARTS=ON \ -DWITH_LIBART=ON \ -DWITH_OPENGL=ON \ - -DWITH_XSCREENSAVER=ON \ -DBUILD_ALL=ON \ .. diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el9 b/redhat/main/tdebase/pamd.kcheckpass-trinity.el9 new file mode 120000 index 000000000..dab729b22 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.el9 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc37 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc37 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc37 @@ -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/main/tdebase/pamd.kdm-trinity-np.el9 b/redhat/main/tdebase/pamd.kdm-trinity-np.el9 new file mode 120000 index 000000000..3415e7d55 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.el9 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc37 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc37 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc37 @@ -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/main/tdebase/pamd.kdm-trinity.el9 b/redhat/main/tdebase/pamd.kdm-trinity.el9 new file mode 120000 index 000000000..f85413ec6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.el9 @@ -0,0 +1 @@ +pamd.kdm-trinity.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc37 b/redhat/main/tdebase/pamd.kdm-trinity.fc37 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc37 @@ -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/main/tdebase/pamd.kscreensaver-trinity.el9 b/redhat/main/tdebase/pamd.kscreensaver-trinity.el9 new file mode 120000 index 000000000..a5fab9e3e --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.el9 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc37 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc37 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc37 @@ -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/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index 9427a628b..ce8582aaa 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -28,6 +28,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -164,6 +165,14 @@ Requires: redhat-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png %endif +# Rocky 9 Theme +%if 0%{?rocky} == 9 +Requires: rocky-backgrounds +Requires: rocky-logos +%define tde_bg /usr/share/backgrounds/rocky-default-9-abstract-1-day.png +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png +%endif + # Mageia Theme %if 0%{?mgaversion} Requires: mageia-theme-Default @@ -248,8 +257,13 @@ BuildRequires: pam-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else +%if 0%{?fedora} >= 37 +BuildRequires: libusb1-devel +BuildRequires: libusb-compat-0.1-devel +%else BuildRequires: libusb-devel %endif +%endif # ESOUND support %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} @@ -262,7 +276,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -332,7 +346,7 @@ BuildRequires: OpenEXR-devel # RHEL 6: available in EPEL # RHEL 7: available in NUX # RHEL 8: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -487,12 +501,15 @@ BuildRequires: x11-proto-devel BuildRequires: xorg-x11-proto-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?fedora} BuildRequires: xorg-x11-font-utils %endif %if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 BuildRequires: font-util +%endif + +%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 || 0%{?rhel} >= 9 BuildRequires: bdftopcf %endif @@ -543,6 +560,16 @@ BuildRequires: checkpolicy BuildRequires: selinux-policy-devel %endif +# LIBSSH support +%if 0%{?rhel} == 6 +%define with_libssh 0 +%else +%define with_libssh 1 +%endif +%if 0%{?with_libssh} +BuildRequires: libssh-devel +%endif + # tdebase is a metapackage that installs all sub-packages Requires: %{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} @@ -731,6 +758,7 @@ creates menu entries for them. %{tde_datadir}/applnk/System/kappfinder.desktop %{tde_datadir}/apps/kappfinder %{tde_datadir}/icons/hicolor/*/apps/kappfinder.png +%{tde_mandir}/man1/kappfinder.1* ########## @@ -789,6 +817,7 @@ Some random features: %{tde_datadir}/icons/hicolor/*/apps/kate2.svgz %{tde_datadir}/servicetypes/kateplugin.desktop %{tde_tdedocdir}/HTML/en/kate/ +%{tde_mandir}/man1/kate.1* ########## @@ -831,7 +860,7 @@ Kwrite is an advanced text editor for TDE. %{tde_datadir}/icons/hicolor/*/apps/kwrite.png %{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz %{tde_tdedocdir}/HTML/en/kwrite/ - +%{tde_mandir}/man1/kwrite.1* ########## @@ -1257,6 +1286,22 @@ TDE applications, particularly those in the TDE base module. %{tde_tdedocdir}/HTML/en/tdesu/ %{tde_tdedocdir}/HTML/en/knetattach/ %{tde_tdedocdir}/HTML/en/kxkb/ +%{tde_mandir}/man1/drkonqi.1* +%{tde_mandir}/man1/kblankscrn.kss.1* +%{tde_mandir}/man1/kcheckpass.1* +%{tde_mandir}/man1/kcminit.1* +%{tde_mandir}/man1/kdcop.1* +%{tde_mandir}/man1/kdialog.1* +%{tde_mandir}/man1/khotkeys.1* +%{tde_mandir}/man1/knetattach.1* +%{tde_mandir}/man1/krandom.kss.1* +%{tde_mandir}/man1/kreadconfig.1* +%{tde_mandir}/man1/kstart.1* +%{tde_mandir}/man1/ksystraycmd.1* +%{tde_mandir}/man1/kwriteconfig.1* +%{tde_mandir}/man1/kxkb.1* +%{tde_mandir}/man1/tdedebugdialog.1* +%{tde_mandir}/man1/tdesu.1* # SETUID binaries # Some setuid binaries need special care @@ -1698,8 +1743,10 @@ group. %{tde_tdelibdir}/tdeio_remote.so %{tde_tdelibdir}/tdeio_settings.la %{tde_tdelibdir}/tdeio_settings.so +%if 0%{?with_libssh} %{tde_tdelibdir}/tdeio_sftp.la %{tde_tdelibdir}/tdeio_sftp.so +%endif %{tde_tdelibdir}/tdeio_system.la %{tde_tdelibdir}/tdeio_system.so %{tde_tdelibdir}/tdeio_tar.la @@ -1756,7 +1803,9 @@ group. %{tde_datadir}/services/programs.protocol %{tde_datadir}/services/remote.protocol %{tde_datadir}/services/settings.protocol +%if 0%{?with_libssh} %{tde_datadir}/services/sftp.protocol +%endif %{tde_datadir}/services/system.protocol %{tde_datadir}/services/tar.protocol %{tde_datadir}/services/textthumbnail.desktop @@ -1767,6 +1816,9 @@ group. %{tde_datadir}/servicetypes/thumbcreator.desktop %{tde_datadir}/services/tdefile_trash.desktop %{tde_tdedocdir}/HTML/en/tdeioslave/ +%{tde_mandir}/man1/ktrash.1* +%{tde_mandir}/man1/tdeio_media_mounthelper.1* +%{tde_mandir}/man1/tdeio_system_documenthelper.1* %if 0%{?with_exr} %{tde_tdelibdir}/exrthumbnail.la @@ -1836,6 +1888,7 @@ system passwords. %{_datadir}/faces/Star.png %{_datadir}/faces/Teddybear.png %{_datadir}/faces/Turtle.png +%{tde_mandir}/man1/tdepasswd.1* ########## @@ -1898,6 +1951,9 @@ Installation of smbclient will make you able to use smb shared printers. %{tde_tdedocdir}/HTML/en/tdeprint/ %{tde_tdedocdir}/HTML/en/tdeprintfax/ %{tde_tdedocdir}/HTML/en/kjobviewer/ +%{tde_mandir}/man1/kjobviewer.1* +%{tde_mandir}/man1/kprinter.1* +%{tde_mandir}/man1/tdeprintfax.1* ########## @@ -2030,6 +2086,12 @@ already. Most users won't need this. %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np %endif +%{tde_mandir}/man1/gentdmconf.1* +%{tde_mandir}/man1/krootimage.1* +%{tde_mandir}/man1/tdm.1* +%{tde_mandir}/man1/tdmctl.1* +%{tde_mandir}/man1/tdm_config.1* +%{tde_mandir}/man1/tdm_greet.1* %if "%{?tde_version}" == "14.1.0" %{tde_bindir}/tdecryptocardwatcher @@ -2191,6 +2253,7 @@ workstations. %{tde_datadir}/services/kfindpart.desktop %{tde_datadir}/servicetypes/findpart.desktop %{tde_tdedocdir}/HTML/en/kfind/ +%{tde_mandir}/man1/kfind.1* ########## @@ -2340,6 +2403,10 @@ functionality. %if 0%{?mgaversion} >= 3 %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg %endif +%{tde_mandir}/man1/appletproxy.1* +%{tde_mandir}/man1/extensionproxy.1* +%{tde_mandir}/man1/kasbar.1* +%{tde_mandir}/man1/kicker.1* ########## @@ -2428,6 +2495,7 @@ structure. %{tde_datadir}/apps/kcontroledit/ %{tde_datadir}/apps/kmenuedit/ %{tde_tdedocdir}/HTML/en/kmenuedit/ +%{tde_mandir}/man1/kmenuedit.1* ########## @@ -2560,6 +2628,9 @@ ever launching another application. %{tde_datadir}/servicetypes/konqaboutpage.desktop %{tde_tdedocdir}/HTML/en/konqueror/ %{tde_tdedocdir}/HTML/en/keditbookmarks/ +%{tde_mandir}/man1/keditbookmarks.1* +%{tde_mandir}/man1/kfmclient.1* +%{tde_mandir}/man1/konqueror.1* %post -n trinity-konqueror if [ $1 -eq 1 ]; then @@ -2667,6 +2738,7 @@ Using Konsole, a user can open: %{tde_tdedocdir}/HTML/en/konsole/ %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/ %config %{_sysconfdir}/fonts/conf.d/99-konsole.conf +%{tde_mandir}/man1/konsole.1* ########## @@ -2687,6 +2759,7 @@ applications. It is used to switch between applications or desktops. %{tde_datadir}/applnk/Utilities/kpager.desktop %{tde_datadir}/icons/hicolor/*/apps/kpager.png %{tde_tdedocdir}/HTML/en/kpager/ +%{tde_mandir}/man1/kpager.1* ########## @@ -2708,6 +2781,7 @@ automatically started. KPersonalizer can also be called later. %{tde_datadir}/applnk/System/kpersonalizer.desktop %{tde_datadir}/apps/kpersonalizer/ %{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png +%{tde_mandir}/man1/kpersonalizer.1* ########## @@ -2745,6 +2819,7 @@ TDE will start, but many good defaults will not be set. %{tde_datadir}/apps/tdeconf_update/ksmserver.upd %{tde_datadir}/apps/tdeconf_update/move_session_config.sh %{tde_datadir}/apps/ksmserver/ +%{tde_mandir}/man1/starttde.1* %post -n trinity-ksmserver %if 0%{?mdkversion} || 0%{?mgaversion} diff --git a/redhat/main/tdebase/tdm.el9.te b/redhat/main/tdebase/tdm.el9.te new file mode 120000 index 000000000..034e33247 --- /dev/null +++ b/redhat/main/tdebase/tdm.el9.te @@ -0,0 +1 @@ +tdm.el8.te
\ No newline at end of file diff --git a/redhat/main/tdebase/tdm.fc37.te b/redhat/main/tdebase/tdm.fc37.te new file mode 100644 index 000000000..afe6de52a --- /dev/null +++ b/redhat/main/tdebase/tdm.fc37.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/main/tdebase/tdm.service.el9 b/redhat/main/tdebase/tdm.service.el9 new file mode 120000 index 000000000..87f56ea08 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.el9 @@ -0,0 +1 @@ +tdm.service.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/tdm.service.fc37 b/redhat/main/tdebase/tdm.service.fc37 new file mode 100644 index 000000000..9ef7e07ff --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc37 @@ -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 diff --git a/redhat/main/tdebindings/tdebindings.spec b/redhat/main/tdebindings/tdebindings.spec index 59baee29d..3a827ab6d 100644 --- a/redhat/main/tdebindings/tdebindings.spec +++ b/redhat/main/tdebindings/tdebindings.spec @@ -169,8 +169,9 @@ BuildRequires: Mesa-libGLU-devel %endif # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define with_python 0 +%global __python %__python3 %else %define with_python 1 %if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 7 @@ -373,6 +374,7 @@ This package is part of the official TDE bindings module. %files -n trinity-libdcop3-java-devel %defattr(-,root,root,-) %{tde_bindir}/dcopidl2java +%{tde_mandir}/man1/dcopidl2java.1* %endif @@ -806,6 +808,7 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{tde_bindir}/juic %{tde_datadir}/juic/ +%{tde_mandir}/man1/juic.1* %endif ########## @@ -836,6 +839,9 @@ This package is part of the official TDE bindings module. %{ruby_arch}/korundum.la %{ruby_arch}/korundum.so* %doc korundum/ChangeLog +%{tde_mandir}/man1/krubyinit.1* +%{tde_mandir}/man1/rbtdeapi.1* +%{tde_mandir}/man1/rbtdesh.1* ########## @@ -867,6 +873,10 @@ This package is part of the official TDE bindings module. %{ruby_arch}/tqui.so* %{ruby_arch}/tqui.la %doc qtruby/ChangeLog +%{tde_mandir}/man1/qtrubyinit.1* +%{tde_mandir}/man1/rbqtapi.1* +%{tde_mandir}/man1/rbqtsh.1* +%{tde_mandir}/man1/rbuic.1* ########## diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec index 06f9dd206..367506e6e 100644 --- a/redhat/main/tdeedu/tdeedu.spec +++ b/redhat/main/tdeedu/tdeedu.spec @@ -94,8 +94,13 @@ BuildRequires: openssl-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else +%if 0%{?fedora} >= 37 +BuildRequires: libusb1-devel +BuildRequires: libusb-compat-0.1-devel +%else BuildRequires: libusb-devel %endif +%endif # PYTHON3 support %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8 diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec index 7c925dd1c..d3f676c4c 100644 --- a/redhat/main/tdegames/tdegames.spec +++ b/redhat/main/tdegames/tdegames.spec @@ -91,7 +91,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec index 7d3037300..f5885d39f 100644 --- a/redhat/main/tdegraphics/tdegraphics.spec +++ b/redhat/main/tdegraphics/tdegraphics.spec @@ -28,6 +28,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -80,13 +81,18 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif # LIBUSB support -BuildRequires: libusb-devel +%if 0%{?fedora} >= 37 +BuildRequires: libusb1-devel +BuildRequires: libusb-compat-0.1-devel +%else +BuildRequires: libusb-devel +%endif # MNG support BuildRequires: libmng-devel @@ -339,6 +345,8 @@ picker. %{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png %{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png %{tde_tdedocdir}/HTML/en/kcoloredit/ +%{tde_mandir}/man1/kcolorchooser.1* +%{tde_mandir}/man1/kcoloredit.1* ########## @@ -435,6 +443,7 @@ This program and KPart allow the user to display *.DVI files from TeX. %{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz %{tde_datadir}/services/kdvimultipage.desktop %{tde_tdedocdir}/HTML/en/kdvi/ +%{tde_mandir}/man1/kdvi.1* ########## @@ -454,6 +463,7 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images %{tde_datadir}/icons/hicolor/??x??/apps/kfax.png %{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz %{tde_tdedocdir}/HTML/en/kfax/ +%{tde_mandir}/man1/kfax.1* ########## @@ -480,6 +490,7 @@ kfax application once it reproduces all of kfax's features. %{tde_datadir}/services/kfaxmultipage.desktop %{tde_datadir}/services/kfaxmultipage_tiff.desktop %{tde_tdedocdir}/HTML/en/kfaxview/ +%{tde_mandir}/man1/kfaxview.1* ########## @@ -533,6 +544,7 @@ online. %{tde_datadir}/icons/hicolor/*/apps/kghostview.png %{tde_datadir}/services/kghostview_part.desktop %{tde_tdedocdir}/HTML/en/kghostview/ +%{tde_mandir}/man1/kghostview.1* ########## @@ -553,6 +565,7 @@ TDEIconedit allows you easily to create and edit icons. %{tde_datadir}/apps/tdeiconedit/ %{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png %{tde_tdedocdir}/HTML/en/tdeiconedit/ +%{tde_mandir}/man1/tdeiconedit.1* ########## @@ -620,6 +633,7 @@ Homepage: http://kolourpaint.sourceforge.net %{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png %{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz %{tde_tdedocdir}/HTML/en/kolourpaint/ +%{tde_mandir}/man1/kolourpaint.1* ########## @@ -650,6 +664,7 @@ Homepage: http://kooka.kde.org/ %config(noreplace) %{tde_confdir}/kookarc %{tde_datadir}/icons/hicolor/*/apps/kooka.png %{tde_tdedocdir}/HTML/en/kooka/ +%{tde_mandir}/man1/kooka.1* ########## @@ -675,6 +690,7 @@ application. %{tde_datadir}/icons/hicolor/*/apps/kpdf.png %{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz %{tde_datadir}/services/kpdf_part.desktop +%{tde_mandir}/man1/kpdf.1* ########## @@ -708,6 +724,7 @@ Homepage: http://www.kpovmodeler.org %{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.* %doc %{tde_tdedocdir}/HTML/en/kpovmodeler/ +%{tde_mandir}/man1/kpovmodeler.1* ########## @@ -726,6 +743,7 @@ Kruler is a screen ruler (using pixels) and color measurement tool for KDE. %{tde_datadir}/apps/kruler/ %{tde_datadir}/icons/hicolor/*/apps/kruler.png %{tde_tdedocdir}/HTML/en/kruler/ +%{tde_mandir}/man1/kruler.1* ########## @@ -745,6 +763,7 @@ The images can then be saved in a variety of formats. %{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png %{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz %{tde_tdedocdir}/HTML/en/ksnapshot/ +%{tde_mandir}/man1/ksnapshot.1* ########## @@ -832,6 +851,7 @@ as well. %{tde_datadir}/servicetypes/kimageviewer.desktop %{tde_datadir}/servicetypes/kimageviewercanvas.desktop %{tde_tdedocdir}/HTML/en/kview/ +%{tde_mandir}/man1/kview.1* ########## @@ -868,6 +888,7 @@ DjVu images. %{tde_datadir}/services/emptymultipage.desktop %{tde_datadir}/services/djvumultipage.desktop %{tde_datadir}/servicetypes/tdemultipage.desktop +%{tde_mandir}/man1/kviewshell.1* ########## diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index 5f9eac00b..0920255c2 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -140,7 +140,7 @@ BuildRequires: aspell-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/main/tdemultimedia/tdemultimedia.spec b/redhat/main/tdemultimedia/tdemultimedia.spec index 0370625f9..6484ae4d8 100644 --- a/redhat/main/tdemultimedia/tdemultimedia.spec +++ b/redhat/main/tdemultimedia/tdemultimedia.spec @@ -31,6 +31,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -459,6 +460,7 @@ Some of JuK's features include: %{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png %{tde_datadir}/icons/hicolor/*/apps/juk.png %{tde_tdedocdir}/HTML/en/juk/ +%{tde_mandir}/man1/juk.1* ########## @@ -485,6 +487,7 @@ for TDE. It uses the aRts framework for playing media files. %{tde_datadir}/services/kaboodle_component.desktop %{tde_datadir}/services/kaboodleengine.desktop %{tde_tdedocdir}/HTML/en/kaboodle/ +%{tde_mandir}/man1/kaboodle.1* ########## @@ -515,6 +518,7 @@ searches CDDB to retrieve the information of the disk. %{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png %{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png %{tde_tdedocdir}/HTML/en/kaudiocreator/ +%{tde_mandir}/man1/kaudiocreator.1* ########## @@ -672,6 +676,8 @@ This package includes TDE's dockable sound mixer applet. %{tde_datadir}/icons/hicolor/*/apps/kmix.png %{tde_datadir}/services/kmixctrl_restore.desktop %{tde_tdedocdir}/HTML/en/kmix/ +%{tde_mandir}/man1/kmix.1* +%{tde_mandir}/man1/kmixctrl.1* ########## @@ -710,6 +716,7 @@ This is a sound recording utility for Trinity. %{tde_datadir}/services/krec_exportwave.desktop %{tde_datadir}/servicetypes/krec_exportitem.desktop %{tde_tdedocdir}/HTML/en/krec/ +%{tde_mandir}/man1/krec.1* ########## @@ -968,6 +975,7 @@ formats supported by your installation of aRts (including aRts plugins). %{tde_datadir}/icons/hicolor/*/apps/noatun.png %{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop %{tde_tdedocdir}/HTML/en/noatun/ +%{tde_mandir}/man1/noatun.1* ########## diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index c7681f983..f519297af 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -137,7 +137,7 @@ BuildRequires: pcre-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -252,6 +252,14 @@ BuildRequires: speex-devel %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_consolehelper 1 +# XINETD support +%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 +# No xinetd +%else +%define with_xinetd 1 +Requires: xinetd +%endif + # Avoids relinking, which breaks consolehelper %define dont_relink 1 %endif @@ -433,6 +441,7 @@ basic as well as advanced queries. %{tde_datadir}/apps/kicker/applets/kdictapplet.desktop %{tde_datadir}/icons/hicolor/*/apps/kdict.* %{tde_tdedocdir}/HTML/en/kdict +%{tde_mandir}/man1/kdict.1* ########## @@ -492,6 +501,7 @@ applications and Netscape. %{tde_datadir}/sounds/KGet_Finished_All.ogg %{tde_datadir}/sounds/KGet_Started.ogg %{tde_tdedocdir}/HTML/en/kget +%{tde_mandir}/man1/kget.1* ########## @@ -721,6 +731,7 @@ Support for more IM protocols can be added through a plugin system. %{tde_libdir}/libkopete_msn_shared.so.0 %{tde_libdir}/libkopete_msn_shared.so.0.0.0 %endif +%{tde_mandir}/man1/kopete.1* ########## @@ -918,7 +929,7 @@ Summary: Talk daemon for Trinity Group: Applications/Internet Requires: trinity-kcontrol >= %{tde_version} Requires: trinity-tdebase-data >= %{tde_version} -%if 0%{?fedora} == 0 || 0%{?fedora} <= 33 +%if 0%{?with_xinetd} Requires: xinetd %endif @@ -938,10 +949,10 @@ and shouldn't be run on a multi-user machine. %{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png %{tde_datadir}/icons/hicolor/*/apps/ktalkd.png %{tde_datadir}/sounds/ktalkd.wav -%if 0%{?fedora} == 0 || 0%{?fedora} <= 30 +%if 0%{?with_xinetd} %dir %{_sysconfdir}/xinetd.d -%endif %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk +%endif %{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd %{tde_tdedocdir}/HTML/en/ktalkd @@ -974,6 +985,7 @@ wavelan card that uses the wireless extensions interface. %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz %{tde_tdedocdir}/HTML/en/kwifimanager/ %{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/ +%{tde_mandir}/man1/kwifimanager.1* %endif @@ -1024,6 +1036,8 @@ but relying only on the TCP/IP protocol. %{tde_datadir}/services/rlan.protocol %{tde_bindir}/lisa %{tde_bindir}/reslisa +%{tde_mandir}/man8/lisa.8* +%{tde_mandir}/man8/reslisa.8* ########## @@ -1167,8 +1181,10 @@ if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then chmod 0755 "%{?buildroot}%{tde_bindir}/kppp" fi +%if 0%{?with_xinetd} # ktalk %__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk +%endif # Avoids conflict with trinity-kvirc %__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/ diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec index 244229e11..40b05d660 100644 --- a/redhat/main/tdepim/tdepim.spec +++ b/redhat/main/tdepim/tdepim.spec @@ -97,7 +97,7 @@ BuildRequires: brp-check-trinity # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -149,7 +149,7 @@ BuildRequires: libXcomposite-devel # RHEL 6: available in EPEL # RHEL 7: available in NUX # RHEL 8: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/main/tdesdk/tdesdk.spec index 0718a6fa8..87a63ad0b 100644 --- a/redhat/main/tdesdk/tdesdk.spec +++ b/redhat/main/tdesdk/tdesdk.spec @@ -87,7 +87,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -253,6 +253,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %defattr(-,root,root,-) %{tde_bindir}/kapptemplate %{tde_datadir}/apps/kapptemplate/ +%{tde_mandir}/man1/kapptemplate.1* %pre -n trinity-kapptemplate if [ -d "%{tde_bindir}/kapptemplate" ]; then @@ -378,6 +379,9 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/servicetypes/kbabel_validator.desktop %{tde_datadir}/servicetypes/kbabeldict_module.desktop %{tde_datadir}/servicetypes/kbabelfilter.desktop +%{tde_mandir}/man1/catalogmanager.1* +%{tde_mandir}/man1/kbabel.1* +%{tde_mandir}/man1/kbabeldict.1* ########## @@ -434,6 +438,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/icons/locolor/*/apps/kbugbuster.png %{tde_datadir}/services/tderesources/kcal/bugzilla.desktop %{tde_tdedocdir}/HTML/en/kbugbuster/ +%{tde_mandir}/man1/kbugbuster.1* ########## @@ -461,6 +466,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/icons/hicolor/*/apps/tdecachegrind.png %{tde_datadir}/mimelnk/application/x-tdecachegrind.desktop %{tde_tdedocdir}/HTML/en/tdecachegrind/ +%{tde_mandir}/man1/tdecachegrind.1* ########## @@ -492,6 +498,11 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_bindir}/memprof2calltree %{tde_bindir}/op2calltree %{tde_bindir}/pprof2calltree +%{tde_mandir}/man1/dprof2calltree.1* +%{tde_mandir}/man1/hotshot2calltree.1* +%{tde_mandir}/man1/memprof2calltree.1* +%{tde_mandir}/man1/op2calltree.1* +%{tde_mandir}/man1/pprof2calltree.1* ########## @@ -626,13 +637,46 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_bindir}/svnchangesince %{tde_bindir}/svn-clean %{tde_datadir}/apps/katepart/syntax/tdesvn-buildrc.xml -%{tde_mandir}/man1/cvsblame.1 -%{tde_mandir}/man1/cvscheck.1 -%{tde_mandir}/man1/cvsversion.1 -%{tde_mandir}/man1/kde-build.1 -%{tde_mandir}/man1/includemocs.1 -%{tde_mandir}/man1/noncvslist.1 -%{tde_mandir}/man1/tdesvn-build.1 +%{tde_mandir}/man1/adddebug.1* +%{tde_mandir}/man1/build-progress.sh.1* +%{tde_mandir}/man1/cheatmake.1* +%{tde_mandir}/man1/create_cvsignore.1* +%{tde_mandir}/man1/create_makefile.1* +%{tde_mandir}/man1/create_makefiles.1* +%{tde_mandir}/man1/cvsblame.1* +%{tde_mandir}/man1/cvscheck.1* +%{tde_mandir}/man1/cvs-clean.1* +%{tde_mandir}/man1/cvs2dist.1* +%{tde_mandir}/man1/cvsaskpass.1* +%{tde_mandir}/man1/cvsbackport.1* +%{tde_mandir}/man1/cvsforwardport.1* +%{tde_mandir}/man1/cvslastchange.1* +%{tde_mandir}/man1/cvslastlog.1* +%{tde_mandir}/man1/cvsrevertlast.1* +%{tde_mandir}/man1/cvsservice.1* +%{tde_mandir}/man1/cvsversion.1* +%{tde_mandir}/man1/cxxmetric.1* +%{tde_mandir}/man1/extend_dmalloc.1* +%{tde_mandir}/man1/extractattr.1* +%{tde_mandir}/man1/extractrc.1* +%{tde_mandir}/man1/findmissingcrystal.1* +%{tde_mandir}/man1/fixkdeincludes.1* +%{tde_mandir}/man1/fixuifiles.1* +%{tde_mandir}/man1/includemocs.1* +%{tde_mandir}/man1/kde-build.1* +%{tde_mandir}/man1/kdedoc.1* +%{tde_mandir}/man1/kdelnk2desktop.py.1* +%{tde_mandir}/man1/kdemangen.pl.1* +%{tde_mandir}/man1/licensecheck.1* +%{tde_mandir}/man1/noncvslist.1* +%{tde_mandir}/man1/makeobj.1* +%{tde_mandir}/man1/package_crystalsvg.1* +%{tde_mandir}/man1/png2mng.pl.1 +%{tde_mandir}/man1/pruneemptydirs.1 +%{tde_mandir}/man1/qtdoc.1* +%{tde_mandir}/man1/tdekillall.1* +%{tde_mandir}/man1/tdesvn-build.1* +%{tde_mandir}/man1/zonetab2pot.py.1* %{tde_tdedocdir}/HTML/en/tdesvn-build/ #scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts #scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts @@ -673,6 +717,10 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_libdir}/kmtrace/libktrace.la %{tde_libdir}/kmtrace/libktrace.so %{tde_datadir}/apps/kmtrace/ +%{tde_mandir}/man1/demangle.1* +%{tde_mandir}/man1/kminspector.1* +%{tde_mandir}/man1/kmmatch.1* +%{tde_mandir}/man1/kmtrace.1* ########## @@ -705,6 +753,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/icons/hicolor/*/apps/kompare.png %{tde_datadir}/icons/hicolor/scalable/apps/kompare.svgz %{tde_tdedocdir}/HTML/en/kompare/ +%{tde_mandir}/man1/kompare.1* ########## @@ -729,6 +778,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %defattr(-,root,root,-) %{tde_libdir}/libkspy.la %{tde_libdir}/libkspy.so.* +%{tde_mandir}/man1/testkspy.1* ########## @@ -760,6 +810,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/services/designerthumbnail.desktop %{tde_datadir}/services/kuiviewer_part.desktop %{tde_tdedocdir}/HTML/en/kuiviewer/ +%{tde_mandir}/man1/kuiviewer.1* ########## @@ -842,6 +893,11 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_bindir}/swappo %{tde_bindir}/transxx %{tde_bindir}/xml2pot +%{tde_mandir}/man1/po2xml.1* +%{tde_mandir}/man1/split2po.1* +%{tde_mandir}/man1/swappo.1* +%{tde_mandir}/man1/transxx.1* +%{tde_mandir}/man1/xml2pot.1* ########## @@ -875,6 +931,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/icons/hicolor/*/mimetypes/umbrellofile.png %{tde_datadir}/mimelnk/application/x-umbrello.desktop %{tde_tdedocdir}/HTML/en/umbrello/ +%{tde_mandir}/man1/umbrello.1* ########## diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec index 98b95239a..9846c40fa 100644 --- a/redhat/main/tdetoys/tdetoys.spec +++ b/redhat/main/tdetoys/tdetoys.spec @@ -87,7 +87,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec index a482ce2cb..6ca4ab863 100644 --- a/redhat/main/tdeutils/tdeutils.spec +++ b/redhat/main/tdeutils/tdeutils.spec @@ -31,6 +31,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_sbindir %{tde_prefix}/sbin %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde @@ -84,7 +85,7 @@ BuildRequires: net-snmp-devel BuildRequires: gmp-devel # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define python python3 %define __python %__python3 %else @@ -127,7 +128,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -270,6 +271,7 @@ package. %{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz %{tde_datadir}/services/ark_part.desktop %{tde_tdedocdir}/HTML/en/ark/ +%{tde_mandir}/man1/ark.1* ########## @@ -299,6 +301,7 @@ It provides: %{tde_datadir}/icons/hicolor/*/apps/kcalc.png %{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz %{tde_tdedocdir}/HTML/en/kcalc/ +%{tde_mandir}/man1/kcalc.1* ########## @@ -321,6 +324,7 @@ This package contains kcharselect, a character set selector for TDE. %{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop %{tde_datadir}/icons/hicolor/*/apps/kcharselect.png %{tde_tdedocdir}/HTML/en/kcharselect/ +%{tde_mandir}/man1/kcharselect.1* ########## @@ -411,6 +415,8 @@ in a file manager. %{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png %{tde_tdedocdir}/HTML/en/kdf/ %{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/ +%{tde_mandir}/man1/kdf.1* +%{tde_mandir}/man1/kwikdisk.1* ########## @@ -437,6 +443,7 @@ reasonably fast start. %{tde_datadir}/config.kcfg/kedit.kcfg %{tde_datadir}/icons/hicolor/*/apps/kedit.png %{tde_tdedocdir}/HTML/en/kedit/ +%{tde_mandir}/man1/kedit.1* ########## @@ -456,6 +463,7 @@ to format 3.5" and 5.25" floppy disks. %{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop %{tde_datadir}/icons/hicolor/*/apps/kfloppy.png %{tde_tdedocdir}/HTML/en/kfloppy/ +%{tde_mandir}/man1/kfloppy.1* ########## @@ -491,6 +499,7 @@ Features: %{tde_datadir}/config.kcfg/kgpg.kcfg %{tde_datadir}/icons/hicolor/*/apps/kgpg.png %{tde_tdedocdir}/HTML/en/kgpg/ +%{tde_mandir}/man1/kgpg.1* ########## @@ -518,6 +527,7 @@ support and other powerful features. %{tde_datadir}/services/kbyteseditwidget.desktop %{tde_datadir}/services/khexedit2part.desktop %{tde_tdedocdir}/HTML/en/khexedit/ +%{tde_mandir}/man1/khexedit.1* ########## @@ -781,6 +791,7 @@ Here are just some examples of the things that can be done: %{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz %{tde_datadir}/mimelnk/application/x-superkaramba.desktop %{tde_tdedocdir}/HTML/en/superkaramba/ +%{tde_mandir}/man1/superkaramba.1* ########## diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/main/tdevelop/tdevelop.spec index 8755c4bd0..a9a08187e 100644 --- a/redhat/main/tdevelop/tdevelop.spec +++ b/redhat/main/tdevelop/tdevelop.spec @@ -100,7 +100,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif |