diff options
Diffstat (limited to 'redhat')
13 files changed, 64 insertions, 3 deletions
diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec index fa43303b6..5b0b65921 100644 --- a/redhat/applications/graphics/gwenview/gwenview.spec +++ b/redhat/applications/graphics/gwenview/gwenview.spec @@ -59,6 +59,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: trinity-libkipi-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -87,6 +88,13 @@ BuildRequires: libexiv2-devel BuildRequires: exiv2-devel %endif +# MNG support +%if 0%{?mdkver} +BuildRequires: %{_lib}mng-devel +%else +BuildRequires: libmng-devel +%endif + %if "%{?tde_prefix}" == "/usr" Conflicts: kdegraphics %endif @@ -167,6 +175,9 @@ export PATH="%{tde_bindir}:${PATH}" %suse_update_desktop_file gwenview RasterGraphics Viewer %endif +# Remove unwanted files +%__rm -rf "%{?buildroot}%{tde_datadir}/pixmaps" + %clean %__rm -rf %{buildroot} @@ -213,7 +224,6 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg %{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz %{tde_datadir}/man/man1/gwenview.1* -%{tde_datadir}/pixmaps/gwenview.xpm %{tde_datadir}/services/gvdirpart.desktop %{tde_datadir}/services/gvimagepart.desktop %lang(en) %{tde_tdedocdir}/HTML/en/gwenview/ diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec index fa43fdd30..6b163b725 100644 --- a/redhat/applications/internet/tork/tork.spec +++ b/redhat/applications/internet/tork/tork.spec @@ -70,6 +70,9 @@ BuildRequires: fdupes %if 0%{?pclinuxos} BuildRequires: %{_lib}gcrypt-devel BuildRequires: %{_lib}gnutls-devel +%else +BuildRequires: libgcrypt-devel +BuildRequires: gnutls-devel %endif # SUSE desktop files utility diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index d2099a9cf..3952bfe36 100644 --- a/redhat/applications/multimedia/amarok/amarok.spec +++ b/redhat/applications/multimedia/amarok/amarok.spec @@ -212,7 +212,7 @@ BuildRequires: libmtp-devel %if 0%{?mdkver} BuildRequires: %{_lib}njb-devel %else -BuildRequires: libmtp-devel +BuildRequires: libnjb-devel %endif %endif diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index 725b5ae63..83fa6dc5d 100644 --- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec +++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec @@ -144,7 +144,6 @@ university etc.) %{tde_datadir}/mimelnk/application/kmfnet.desktop %{tde_datadir}/mimelnk/application/kmfpkg.desktop %{tde_datadir}/mimelnk/application/kmfrs.desktop -%{tde_datadir}/pixmaps/kmyfirewall.xpm %{tde_datadir}/services/kmf*.desktop %{tde_datadir}/servicetypes/kmf*.desktop %{tde_mandir}/man1/kmyfirewall.1* @@ -218,6 +217,9 @@ export PATH="%{tde_bindir}:${PATH}" %suse_update_desktop_file -r "%{tde_pkg}" System Network %endif +# Remove unwanted pixmaps +%__rm -rf "%{buildroot}%{tde_datadir}/pixmaps/" + %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index 7931960ba..352fb53ac 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -145,6 +145,7 @@ BuildRequires: xscreensaver-gl %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} BuildRequires: %{python} BuildRequires: %{python}-devel +BuildRequires: %{python}-setuptools Requires: pytqt Requires: trinity-pytde diff --git a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec index cdbcec24c..b0c9b60d0 100644 --- a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec +++ b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec @@ -72,6 +72,13 @@ BuildRequires: %{_lib}acl-devel BuildRequires: libacl-devel %endif +# GTK2 support +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}gtk+2.0-devel +%else +BuildRequires: gtk2-devel +%endif + # IDN support BuildRequires: libidn-devel diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec index e33738d66..55d001e5e 100644 --- a/redhat/applications/utilities/kbarcode/kbarcode.spec +++ b/redhat/applications/utilities/kbarcode/kbarcode.spec @@ -88,6 +88,13 @@ BuildRequires: openssl-devel # PCRE support BuildRequires: pcre-devel +# PCRE2 support +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files diff --git a/redhat/applications/utilities/kommando/kommando.spec b/redhat/applications/utilities/kommando/kommando.spec index 1dea01897..947a2a762 100644 --- a/redhat/applications/utilities/kommando/kommando.spec +++ b/redhat/applications/utilities/kommando/kommando.spec @@ -65,6 +65,20 @@ BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig +# XMU support +%if 0%{?suse_version} == 1140 +BuildRequires: xorg-x11-libXmu-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210 +BuildRequires: libXmu-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} >= 4 +BuildRequires: %{_lib}xmu-devel +%endif +%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 +BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel +%endif + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index 44ead0cbd..0759676fd 100644 --- a/redhat/core/tdebase/tdebase.spec +++ b/redhat/core/tdebase/tdebase.spec @@ -3436,6 +3436,13 @@ fi %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver} || 0%{?pclinuxos} -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \ %endif + \ +%if 0%{?suse_version} + -HALT_BINARY="/usr/sbin/halt" \ + -DPOWEROFF_BINARY="/usr/sbin/poweroff" \ + -DREBOOT_BINARY="/usr/sbin/reboot" \ + -DSHUTDOWN_BINARY="/usr/sbin/shutdown" \ +%endif .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index 4811ec68a..b6bc32d85 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec @@ -50,6 +50,7 @@ Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index 157141007..fd1310190 100644 --- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec +++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec @@ -179,6 +179,7 @@ This package contains example files and applications. %{_bindir}/polkit-tqt-agent-example %{_bindir}/polkit-tqt-example %{_bindir}/polkit-tqt-example-helper +%dir %{_datadir}/apps/ %{_datadir}/apps/polkit-tqt/ %{_datadir}/dbus-1/system-services/org.tqt.policykit.examples.service %{_datadir}/polkit-1/actions/org.tqt.policykit.examples.policy diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec index 619d4b1a8..b045e0bf5 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec @@ -623,6 +623,7 @@ done %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_CN.GB2312/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_CN/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_Hans/LC_MESSAGES/ +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_Hant/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_TW.Big5/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_TW/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zu/LC_MESSAGES/ diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec index f0e86d97a..9d997bdd6 100644 --- a/redhat/libraries/libksquirrel/libksquirrel.spec +++ b/redhat/libraries/libksquirrel/libksquirrel.spec @@ -91,6 +91,13 @@ BuildRequires: ghostscript BuildRequires: gettext BuildRequires: gettext-devel +# LCMS support +%if 0%{?suse_version} || 0%{?rhel} >= 7 +BuildRequires: liblcms-devel +%else +BuildRequires: lcms-devel +%endif + # OPENEXR support %if 0%{?mdkver} BuildRequires: %{_lib}openexr-devel |