diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec index 8cc9e37d3..c679543fd 100644 --- a/redhat/applications/keximdb/keximdb.spec +++ b/redhat/applications/keximdb/keximdb.spec @@ -62,6 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-koffice-devel +BuildRequires: trinity-koffice-kexi BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/kshowmail/kshowmail.spec index bde79c7a3..71b8a07f6 100644 --- a/redhat/applications/kshowmail/kshowmail.spec +++ b/redhat/applications/kshowmail/kshowmail.spec @@ -144,10 +144,6 @@ fi %find_lang %{tde_pkg} -# Move desktop icon to correct location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Install missing icons install -D -m 644 "pics/cr16-app-kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/16x16/apps/kshowmail.png" install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/48x48/apps/kshowmail.png" @@ -191,6 +187,7 @@ install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/i %{tde_datadir}/services/kshowmailconfiggeneral.desktop %{tde_datadir}/services/kshowmailconfiglog.desktop %{tde_datadir}/services/kshowmailconfigspamcheck.desktop +%lang(cs) %{tde_tdedocdir}/HTML/cs/kshowmail/ %lang(de) %{tde_tdedocdir}/HTML/de/kshowmail/ %lang(en) %{tde_tdedocdir}/HTML/en/kshowmail/ %lang(es) %{tde_tdedocdir}/HTML/es/kshowmail/ diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec index 638990a6c..a190f4c2e 100644 --- a/redhat/applications/tdedocker/tdedocker.spec +++ b/redhat/applications/tdedocker/tdedocker.spec @@ -91,6 +91,14 @@ BuildRequires: libxmu-devel BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel %endif +# XPM support +%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} +BuildRequires: libXpm-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}xpm-devel +%endif + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -174,8 +182,7 @@ export PATH="%{tde_bindir}:${PATH}" %doc AUTHORS BUGS ChangeLog COPYING CREDITS HACKING INSTALL README TODO VERSION %{tde_bindir}/tdedocker %{tde_tdeappdir}/tdedocker.desktop -%{tde_datadir}/apps/tdedocker/icons/question.xpm -%{tde_datadir}/apps/tdedocker/icons/tdedocker.xpm +%{tde_datadir}/apps/tdedocker/ %{tde_datadir}/icons/hicolor/*/apps/tdedocker.png %{tde_datadir}/apps/tdedocker/icons/question.png %{tde_mandir}/man1/tdedocker.1* diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/tdepacman/tdepacman.spec index d47b704e8..332b6531d 100644 --- a/redhat/applications/tdepacman/tdepacman.spec +++ b/redhat/applications/tdepacman/tdepacman.spec @@ -22,6 +22,7 @@ %endif # TDE specific building variables +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share @@ -40,7 +41,7 @@ Name: trinity-%{tde_pkg} -Summary: A pacman game for the Trinity Desktop. +Summary: A pacman game for the Trinity Desktop Version: 0.3.2 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} @@ -60,10 +61,9 @@ BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: trinity-tdegames-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: trinity-libtdegames-devel >= %{tde_version} - BuildRequires: gettext BuildRequires: cmake @@ -134,7 +134,8 @@ export PATH="%{tde_bindir}:${PATH}" %doc AUTHORS ChangeLog COPYING README TODO %{tde_bindir}/tdepacman %{tde_tdeappdir}/tdepacman.desktop -%{tde_datadir}/apps/tdepacman/ +%{tde_datadir}/apps/tdepacman/ +%dir %{tde_datadir}/config %{tde_datadir}/config/tdepacmanrc %lang(de) %{tde_tdedocdir}/HTML/de/tdepacman/ %{tde_tdedocdir}/HTML/en/tdepacman/