summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2018-06-18 22:04:05 +0200
committerFran├žois Andriot <albator78@libertysurf.fr>2018-06-19 20:11:02 +0200
commita5fdb0ea69d56f6d5a68e8a38fc72e367b797464 (patch)
treefe807a900c1e38ea1ae92929c51c8eaf21c2b171 /redhat
parentffaa912975f8f31b0daa221a1d604f65fc9b429d (diff)
downloadtde-packaging-a5fdb0ea69d56f6d5a68e8a38fc72e367b797464.tar.gz
tde-packaging-a5fdb0ea69d56f6d5a68e8a38fc72e367b797464.zip
RPM: update spec files for opensuse TW on OBS
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec3
-rw-r--r--redhat/applications/kpilot/kpilot-14.0.0.spec3
-rw-r--r--redhat/applications/qalculate-tde/qalculate-tde.spec2
-rw-r--r--redhat/dependencies/arts/arts-14.0.0.spec1
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec5
-rw-r--r--[-rwxr-xr-x]redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec0
-rw-r--r--[-rwxr-xr-x]redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec0
-rw-r--r--redhat/main/tdebase/tdebase-14.0.0.spec3
-rw-r--r--redhat/main/tdenetwork/tdenetwork-14.0.0.spec36
-rw-r--r--redhat/main/tdeutils/tdeutils-14.0.0.spec1
10 files changed, 39 insertions, 15 deletions
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 3a564f894..78026fb0a 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -70,7 +70,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1: %{name}-rpmlintrc
+Source1: trinity-koffice-rpmlintrc
# BuildRequires: world-devel ;)
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -115,6 +115,7 @@ BuildRequires: readline-devel
%if 0%{?suse_version}
BuildRequires: libbz2-devel
+BuildRequires: liblcms-devel
BuildRequires: liblcms2-devel
%else
BuildRequires: bzip2-devel
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index b03589e2c..c63417e81 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -147,6 +147,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Unwanted files
%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
+%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/
# Updates applications categories for openSUSE
%if 0%{?suse_version}
@@ -155,6 +156,7 @@ export PATH="%{tde_bindir}:${PATH}"
%endif
+
%clean
%__rm -rf %{buildroot}
@@ -164,7 +166,6 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_bindir}/kpalmdoc
%{tde_bindir}/kpilot
%{tde_bindir}/kpilotDaemon
-%{tde_tdeincludedir}/kpilot
%{tde_libdir}/libkpilot.la
%{tde_libdir}/libkpilot.so.0
%{tde_libdir}/libkpilot.so.0.0.0
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index cf20eb00a..b0079234e 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/qalculate-tde/qalculate-tde.spec
@@ -68,7 +68,7 @@ BuildRequires: libtool
BuildRequires: libqalculate-devel >= 0.9.6
-%if 0%{?suse_version} == 1330 || 0%{?suse_version} == 1500
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500
BuildRequires: cln-devel
%endif
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index c5091e55b..765d14efa 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -60,6 +60,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
BuildRequires: trinity-filesystem >= %{tde_version}
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index a2b09f24a..dda0eb54c 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -1281,6 +1281,11 @@ things that are possible with TQt3.
%__sed -i "src/kernel/ntqstyle.h" -e "s|#ifdef ENABLE_T*QSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
%endif
+%if 0%{?suse_version}
+echo "suse_version = %{?suse_version}"
+echo "sle_version = %{?sle_version}"
+%endif
+
# Add missing sqlite3 header
%__ln_s ../src/sql/drivers/sqlite3/qsql_sqlite3.h include/qsql_sqlite3.h
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 09c1cab1d..09c1cab1d 100755..100644
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
index 127e0b908..127e0b908 100755..100644
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index a8ec98222..36a25eea4 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -1403,6 +1403,9 @@ TDE applications, particularly those in the TDE base module.
%{tde_libdir}/libtdeinit_kxkb.la
%{tde_libdir}/libtdeinit_kxkb.so
%{tde_libdir}/libkhotkeys_shared.so.*
+%if "%{?tde_version}" == "14.1.0"
+%{tde_tdeappdir}/kdcop.desktop
+%endif
%{tde_tdeappdir}/keyboard.desktop
%{tde_tdeappdir}/keyboard_layout.desktop
%{tde_tdeappdir}/khotkeys.desktop
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
index 099ccc187..28717c158 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
@@ -46,6 +46,11 @@
# Avoids relinking, which breaks consolehelper
%define dont_relink 1
+%if "%{?tde_version}" == "14.0.4"
+%define with_aim 1
+%else
+%define with_aim 0
+%endif
Name: trinity-%{tde_pkg}
Summary: Trinity Desktop Environment - Network Applications
@@ -629,13 +634,8 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz
%{tde_datadir}/icons/crystalsvg/*/actions/newmessage.mng
%{tde_datadir}/icons/hicolor/*/actions/newmessage.mng
-%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
%{tde_datadir}/icons/crystalsvg/*/apps/icq_protocol.png
%{tde_datadir}/icons/crystalsvg/*/apps/irc_protocol.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_connecting.mng
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_offline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_online.png
%{tde_datadir}/icons/crystalsvg/*/actions/icq_away.png
%{tde_datadir}/icons/crystalsvg/*/actions/icq_connecting.mng
%{tde_datadir}/icons/crystalsvg/*/actions/icq_dnd.png
@@ -653,10 +653,6 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/icons/crystalsvg/*/actions/irc_op.png
%{tde_datadir}/icons/crystalsvg/*/actions/irc_server.png
%{tde_datadir}/icons/crystalsvg/*/actions/irc_voice.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_away.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_connecting.mng
-%{tde_datadir}/icons/hicolor/*/actions/aim_offline.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_online.png
%{tde_datadir}/icons/hicolor/*/actions/icq_away.png
%{tde_datadir}/icons/hicolor/*/actions/icq_connecting.mng
%{tde_datadir}/icons/hicolor/*/actions/icq_dnd.png
@@ -666,11 +662,9 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/icons/hicolor/*/actions/icq_occupied.png
%{tde_datadir}/icons/hicolor/*/actions/icq_offline.png
%{tde_datadir}/icons/hicolor/*/actions/icq_online.png
-%{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png
%{tde_datadir}/icons/hicolor/*/apps/icq_protocol.png
%{tde_datadir}/mimelnk/application/x-icq.desktop
%{tde_datadir}/mimelnk/application/x-kopete-emoticons.desktop
-%{tde_datadir}/services/aim.protocol
%{tde_datadir}/services/chatwindow.desktop
%{tde_datadir}/services/emailwindow.desktop
%{tde_datadir}/services/jabberdisco.protocol
@@ -690,7 +684,20 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/config.kcfg/motionawayconfig.kcfg
# smpp plugin for kopete
%{tde_datadir}/config.kcfg/smpppdcs.kcfg
-
+# aim support is deprecated in TDE 14.1.0
+%if 0%{?with_aim}
+%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_connecting.mng
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_offline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_online.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_away.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_connecting.mng
+%{tde_datadir}/icons/hicolor/*/actions/aim_offline.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_online.png
+%{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png
+%{tde_datadir}/services/aim.protocol
+%endif
##########
@@ -777,6 +784,9 @@ track of the time spent online for you.
%{tde_datadir}/apps/kppp/
%{tde_datadir}/icons/hicolor/*/apps/kppp.png
%{tde_tdedocdir}/HTML/en/kppp/
+%if 0%{?suse_version} >= 1500
+%dir %{_sysconfdir}/ppp
+%endif
%dir %{_sysconfdir}/ppp/peers
%{_sysconfdir}/ppp/peers/kppp-options
@@ -887,6 +897,7 @@ Summary: Talk daemon for Trinity
Group: Applications/Internet
Requires: trinity-kcontrol >= %{tde_version}
Requires: trinity-tdebase-data >= %{tde_version}
+Requires: xinetd
%description -n trinity-ktalkd
KTalkd is an enhanced talk daemon - a program to handle incoming talk
@@ -904,6 +915,7 @@ 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
+%dir %{_sysconfdir}/xinetd.d
%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
%{tde_tdedocdir}/HTML/en/ktalkd
diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index 28464b8b3..51ba2ca49 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -61,6 +61,7 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: klaptop_acpi_helper.pam
Source2: klaptop_acpi_helper.console
Source3: kcmlaptoprc
+Source4: %{name}-rpmlintrc
Obsoletes: trinity-kdeutils < %{version}-%{release}
Provides: trinity-kdeutils = %{version}-%{release}