diff options
Diffstat (limited to 'redhat/main')
-rw-r--r-- | redhat/main/tdebase/tdebase.spec | 7 | ||||
-rw-r--r-- | redhat/main/tdeedu/tdeedu.spec | 7 | ||||
-rw-r--r-- | redhat/main/tdegames/tdegames.spec | 14 | ||||
-rw-r--r-- | redhat/main/tdegraphics/tdegraphics.spec | 6 | ||||
-rw-r--r-- | redhat/main/tdenetwork/tdenetwork.spec | 14 |
5 files changed, 39 insertions, 9 deletions
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index 2095a743d..b95b83894 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -1304,6 +1304,7 @@ plugdev group. %{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop +%{tde_datadir}/apps/kcm_componentchooser/kcm_filemanager.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop %{tde_datadir}/apps/kcmview1394/ %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop @@ -1637,6 +1638,7 @@ needed for a basic TDE desktop installation. %{tde_datadir}/icons/crystalsvg/*/apps/penguin.png %{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop-personal.png %{tde_datadir}/icons/crystalsvg/*/apps/phppg.png +%{tde_datadir}/icons/crystalsvg/*/apps/package_games_logic.png %{tde_datadir}/icons/crystalsvg/*/apps/proxy.png %{tde_datadir}/icons/crystalsvg/*/apps/pysol.png %{tde_datadir}/icons/crystalsvg/*/apps/randr.png @@ -2107,6 +2109,7 @@ Installation of smbclient will make you able to use smb shared printers. %{tde_datadir}/apps/tdeprintfax/ %{tde_datadir}/apps/kjobviewer/ %{tde_datadir}/apps/tdeprint_part/ +%{tde_datadir}/autostart/kjobviewer-autostart.desktop %{tde_datadir}/icons/hicolor/*/apps/tdeprintfax.png %{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png %{tde_datadir}/icons/hicolor/*/apps/printmgr.png @@ -2149,7 +2152,6 @@ the TDE desktop. %config(noreplace) %{tde_confdir}/kdesktop_custom_menu1 %config(noreplace) %{tde_confdir}/kdesktop_custom_menu2 %{tde_bindir}/kcheckrunning -%{tde_bindir}/kxdglauncher %{tde_bindir}/tdeeject %{tde_bindir}/kdesktop %{tde_bindir}/kdesktop_lock @@ -2770,7 +2772,6 @@ ever launching another application. %{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png %{tde_datadir}/apps/konqueror/profiles/ %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop -%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop @@ -2869,6 +2870,7 @@ Using Konsole, a user can open: %files -n trinity-konsole %defattr(-,root,root,-) %{tde_bindir}/konsole +%{tde_bindir}/terminalhere %{tde_tdelibdir}/kcm_konsole.la %{tde_tdelibdir}/kcm_konsole.so %{tde_tdelibdir}/kded_kwrited.la @@ -2884,7 +2886,6 @@ Using Konsole, a user can open: %{tde_datadir}/applnk/.hidden/kcmkonsole.desktop %{tde_datadir}/apps/tdeconf_update/konsole.upd %{tde_datadir}/apps/tdeconf_update/schemaStrip.pl -%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop %{tde_datadir}/apps/konsole/ %{tde_datadir}/icons/hicolor/*/apps/konsole.* %{tde_datadir}/mimelnk/application/x-konsole.desktop diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec index b1198f509..81b17e82c 100644 --- a/redhat/main/tdeedu/tdeedu.spec +++ b/redhat/main/tdeedu/tdeedu.spec @@ -100,7 +100,7 @@ BuildRequires: libusb-devel # PYTHON support %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 %define python python3 -%define __python %__python2 +%define __python %__python3 %else %define python python %endif @@ -109,6 +109,11 @@ BuildRequires: %{python}-devel # BOOST support BuildRequires: boost-devel +%if 0%{?suse_version} +BuildRequires: libboost_%{python}-devel +%else +BuildRequires: boost-%{python}-devel +%endif # OCAML support %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec index c7685d9cb..d57163534 100644 --- a/redhat/main/tdegames/tdegames.spec +++ b/redhat/main/tdegames/tdegames.spec @@ -71,6 +71,20 @@ BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: libtool +# AVAHI support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_avahi 1 +BuildRequires: libavahi-tqt-devel >= 1:0.6.30 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}avahi-client-devel +Requires: %{_lib}avahi-client3 +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +BuildRequires: avahi-devel +Requires: avahi +%endif +%endif + # IDN support BuildRequires: libidn-devel diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec index abef4ab03..40258b2f9 100644 --- a/redhat/main/tdegraphics/tdegraphics.spec +++ b/redhat/main/tdegraphics/tdegraphics.spec @@ -237,7 +237,7 @@ BuildRequires: openssl-devel %if 0%{?build_kmrml} #Requires: gift %else -Obsoletes: trinity-kmrml +Obsoletes: trinity-kmrml < %{version}-%{release} %endif Obsoletes: trinity-kdegraphics < %{version}-%{release} @@ -313,10 +313,6 @@ to allow access to your camera's pictures with the URL camera:/ %{tde_tdelibdir}/tdeio_kamera.la %{tde_tdelibdir}/tdeio_kamera.so %{tde_tdeappdir}/kamera.desktop -%{tde_datadir}/icons/crystalsvg/*/actions/camera_test.png -%{tde_datadir}/icons/crystalsvg/*/apps/camera-photo.png -%{tde_datadir}/icons/crystalsvg/*/devices/camera-photo.png -%{tde_datadir}/icons/crystalsvg/*/places/camera-photo.png %{tde_datadir}/services/camera.protocol %{tde_tdedocdir}/HTML/en/kamera/ %{tde_tdedocdir}/HTML/en/tdeioslave/camera/ diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index afbcd44d4..45323afe3 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -98,6 +98,20 @@ BuildRequires: brp-check-trinity PreReq: permissions %endif +# AVAHI support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_avahi 1 +BuildRequires: libavahi-tqt-devel >= 1:0.6.30 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}avahi-client-devel +Requires: %{_lib}avahi-client3 +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +BuildRequires: avahi-devel +Requires: avahi +%endif +%endif + # OPENSSL support BuildRequires: openssl-devel |