summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--redhat/dependencies/arts/arts-14.0.0.spec1
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec12
-rw-r--r--redhat/tdeadmin/tdeadmin-14.0.0.spec3
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec31
-rw-r--r--redhat/tdebindings/tdebindings-14.0.0.spec2
-rw-r--r--redhat/tdegraphics/tdegraphics-14.0.0.spec3
-rw-r--r--redhat/tdepim/tdepim-14.0.0.spec17
-rw-r--r--redhat/tdesdk/tdesdk-14.0.0.spec2
8 files changed, 37 insertions, 34 deletions
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index ab8473689..244c370e3 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -29,6 +29,7 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_sbindir %{tde_prefix}/sbin
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 95a41864d..8b71f3508 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -23,16 +23,6 @@
%define tde_epoch 2
%define tde_version 14.0.0
%define tde_pkg tqtinterface
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
%define cmake_modules_dir %{_datadir}/cmake/Modules
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -230,7 +220,7 @@ fi
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
- -DQTDIR="%{tde_datadir}/tqt3" \
+ -DQTDIR="%{_datadir}/tqt3" \
-DQT_INCLUDE_DIR="%{_includedir}/tqt3" \
-DQT_LIBRARY_DIR="%{_libdir}" \
\
diff --git a/redhat/tdeadmin/tdeadmin-14.0.0.spec b/redhat/tdeadmin/tdeadmin-14.0.0.spec
index 102aa23f8..0b1312a57 100644
--- a/redhat/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/tdeadmin/tdeadmin-14.0.0.spec
@@ -209,7 +209,8 @@ Summary: Trinity file metainfo plugins for deb and rpm files
Group: System/GUI/Other
%description kfile-plugins
-File metainfo plugins for deb and rpm package files.
+This package contains the Trinity File metainfo plugins for deb and rpm
+package files.
%files kfile-plugins
%defattr(-,root,root,-)
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index abaf6a296..0844117f2 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -263,6 +263,14 @@ Requires: hicolor-icon-theme-branding = 13.1
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
+# OpenSuse 13.2 Theme
+%if "%{?suse_version}" == "1320"
+Requires: wallpaper-branding = 13.2
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires: hicolor-icon-theme-branding = 13.2
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -378,13 +386,10 @@ BuildRequires: OpenEXR-devel
%endif
# XSCREENSAVER support
-# Disabled on RHEL4, RHEL >= 7
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version} || 0%{?with_xscreensaver}
-%if 0%{?rhel} == 0 || 0%{?rhel} <= 6
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
%define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: gnome-screensaver
+%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires: libXScrnSaver-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
@@ -393,17 +398,6 @@ BuildRequires: %{_lib}xscrnsaver-devel
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires: xscreensaver
-BuildRequires: libXScrnSaver-devel
-%if 0%{?suse_version}
-BuildRequires: xscreensaver-data-extra
-%endif
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires: xscreensaver
-%endif
-%endif
%endif
# AVAHI support
@@ -3388,7 +3382,7 @@ Windows and Samba shares.
##########
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -3713,7 +3707,6 @@ popd
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-# Other applications
%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Help.desktop Documentation Viewer
%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Home.desktop System FileManager core
%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kate.desktop TextEditor
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index a32f8d1aa..2d98f8874 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -184,7 +184,7 @@ BuildRequires: perl-devel
%define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
## QScintilla
-BuildRequires: trinity-tqscintilla-devel
+BuildRequires: libtqscintilla-devel >= %{?tde_epoch:%{tde_epoch}:}1.7.1
%define _enable_qscintilla --enable-qscintilla
Obsoletes: trinity-kdebindings < %{version}-%{release}
diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec
index 1aee2caa7..c63d352a4 100644
--- a/redhat/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec
@@ -179,6 +179,9 @@ BuildRequires: mesaglu-devel
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
+%if 0%{?rhel} == 4
+BuildRequires: xorg-x11-Mesa-libGLU
+%endif
# DRM support
%if 0%{?rhel} == 4
diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec
index 6f27a4153..4456ec3c4 100644
--- a/redhat/tdepim/tdepim-14.0.0.spec
+++ b/redhat/tdepim/tdepim-14.0.0.spec
@@ -945,12 +945,27 @@ keybox and for retrieving certificates from LDAP servers.
%{tde_tdeappdir}/kleopatra.desktop
%{tde_tdedocdir}/HTML/en/kleopatra/
%{tde_tdedocdir}/HTML/en/kwatchgnupg/
+%{tde_datadir}/icons/hicolor/128x128/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/16x16/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/22x22/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/32x32/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/48x48/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/64x64/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kleopatra.svgz
%post -n trinity-kleopatra
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+for f in hicolor ; do
+ touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+ gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
+done
%postun -n trinity-kleopatra
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+for f in hicolor ; do
+ touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+ gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
+done
##########
@@ -2325,7 +2340,7 @@ export PATH="%{tde_bindir}:${PATH}"
%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kalarm.desktop Utility TimeUtility X-TDE-Utilities-PIM
%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kandy.desktop Utility Telephony X-TDE-Utilities-Peripherals
%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/karm.desktop Utility TimeUtility X-TDE-Utilities-PIM
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kleopatra.desktop Utility
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kleopatra.desktop X-TDE-Utilities-PIM
%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KNode.desktop
%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/knotes.desktop Utility DesktopUtility X-TDE-Utilities-Desktop
%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KMail.desktop
diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec
index b9167bbff..8e97c70b0 100644
--- a/redhat/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/tdesdk/tdesdk-14.0.0.spec
@@ -1074,7 +1074,7 @@ Provides: trinity-kdesdk-devel = %{version}-%{release}
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 05:22:41 +0000