summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec42
-rw-r--r--redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec39
-rwxr-xr-xredhat/kdeutils/trinity-kdeutils-3.5.13.spec17
3 files changed, 64 insertions, 34 deletions
diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
index 8f74f748d..56ea21eaf 100644
--- a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
+++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
@@ -1,3 +1,6 @@
+# Avoids relinking, which breaks consolehelper
+%define dont_relink 1
+
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
@@ -6,7 +9,7 @@
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_sbindir %{tde_prefix}/sbin
-%define tde_datadir %{_prefix}/share
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
@@ -52,7 +55,9 @@ Patch2: bp004-1f719050.diff
Patch3: kdeadmin-3.5.13-remove_more_applications_in_menu.patch
BuildRequires: autoconf automake libtool m4
-BuildRequires: trinity-kdelibs-devel
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-tdelibs-devel
BuildRequires: rpm-devel
BuildRequires: pam-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -79,6 +84,10 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
%files
%defattr(-,root,root,-)
+# LILO is not provided in RHEL or Fedora
+%if 0%{?rhel} || 0%{?fedora}
+%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
+%endif
##########
@@ -284,6 +293,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kuser
Summary: Trinity user/group administration tool
Group: Applications/Utilities
+# package 'usermode' provides '/usr/bin/consolehelper-gtk'
%if 0%{?rhel} || 0%{?fedora}
Requires: usermode-gtk
%else
@@ -296,6 +306,7 @@ A user/group administration tool for TDE.
%files -n trinity-kuser
%defattr(-,root,root,-)
%doc rpmdocs/kuser/*
+%{_sbindir}/kuser
%{tde_bindir}/kuser
%{tde_sbindir}/kuser
%{tde_tdeappdir}/kuser.desktop
@@ -329,7 +340,7 @@ Summary: Trinity frontend for lilo configuration
Group: Applications/Utilities
Requires: trinity-kcontrol
Requires: trinity-tdebase-bin
-Requires: lilo
+#Requires: lilo
%description -n trinity-lilo-config
lilo-config is a TDE based frontend to the lilo boot manager configuration.
@@ -344,6 +355,9 @@ tdebase-bin since it uses the tdesu command to gain root privileges.
%{tde_tdelibdir}/kcm_lilo.so
%{tde_tdeappdir}/lilo.desktop
%{tde_tdedocdir}/HTML/en/lilo-config/
+
+%post -n trinity-lilo-config
+touch /etc/lilo.conf
%endif
##########
@@ -375,11 +389,13 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
+ --prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--sbindir=%{tde_sbindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
+ --docdir=%{tde_docdir} \
--includedir=%{tde_tdeincludedir} \
--enable-new-ldflags \
--disable-dependency-tracking \
@@ -402,17 +418,21 @@ export PATH="%{tde_bindir}:${PATH}"
comps="kcron kdat knetworkconf kpackage ksysv kuser"
%__mkdir_p %{buildroot}%{tde_datadir}/config \
- %{buildroot}/etc/security/console.apps \
- %{buildroot}/etc/pam.d \
- %{buildroot}%{tde_sbindir}
+ %{buildroot}%{_sysconfdir}/security/console.apps \
+ %{buildroot}%{_sysconfdir}/pam.d \
+ %{buildroot}%{tde_sbindir} \
+ %{buildroot}%{_sbindir}
%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
# Run kuser through consolehelper
-%__install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
-%__install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
+%__install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/security/console.apps/kuser
+%__install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/kuser
%__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir}
-%__ln_s consolehelper %{buildroot}%{tde_bindir}/kuser
+%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kuser
+%if "%{tde_prefix}" != "/usr"
+%__ln_s %{tde_sbindir}/kuser %{?buildroot}%{_sbindir}/kuser
+%endif
# locale's
HTML_DIR=$(kde-config --expandvars --install html)
@@ -451,10 +471,6 @@ done
# * Removed useless program secpolicy. (Closes: #399426)
%__rm -f %{?buildroot}%{tde_bindir}/secpolicy
-# LILO is not provided in RHEL or Fedora
-%if 0%{?rhel} || 0%{?fedora}
-%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
-%endif
%clean
diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
index 85fe3a196..f4e2ea6bd 100644
--- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
+++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
@@ -1,3 +1,6 @@
+# Avoids relinking, which breaks consolehelper
+%define dont_relink 1
+
# If TDE is built iwn a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
@@ -55,6 +58,8 @@ Patch4: kdenetwork-3.2.3-resolv.patch
# include more/proper ppp headers
Patch6: kdenetwork-3.5.9-krfb_httpd.patch
+# [kdenetworks] Missing LDFLAGS cause FTBFS
+Patch1: kdenetwork-3.5.13-missing_ldflags.patch
# [kdenetwork] Fix kopete protocol compilation [Bug #695]
Patch10: kdenetwork-3.5.13-kopete_msn_protocol.patch
Patch11: kdenetwork-3.5.13-kopete_sms_protocol.patch
@@ -76,8 +81,6 @@ Patch19: kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch
Patch20: kdenetwork-3.5.13-fix_a_fatal_error_message.patch
# [tdenetwork] Fix a parallel build bug [Commit #35c41f35]
Patch21: kdenetwork-3.5.13-fix_parallel_build.patch
-# [tdenetwork] Use libv4l if available, otherwise check for v4l1 headers [Commit #d8cbbab8]
-Patch22: kdenetwork-3.5.13-use_libv4l_or_libv4l1.patch
BuildRequires: gettext
BuildRequires: trinity-kdelibs-devel
@@ -212,6 +215,8 @@ Requires: trinity-kdelibs-devel
Obsoletes: trinity-kdenetwork-devel < %{version}-%{release}
Provides: trinity-kdenetwork-devel = %{version}-%{release}
+Obsoletes: tdenetwork-devel < %{version}-%{release}
+Provides: tdenetwork-devel = %{version}-%{release}
%description devel
This is the development package which contains the headers for the KDE RSS
@@ -579,7 +584,6 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/services/aim.protocol
%{tde_datadir}/services/chatwindow.desktop
%{tde_datadir}/services/emailwindow.desktop
-#%{tde_datadir}/services/irc.protocol /opt/trinity/share/apps/kopete/
%{tde_datadir}/services/jabberdisco.protocol
%{tde_datadir}/services/kconfiguredialog/kopete_*.desktop
%{tde_datadir}/services/kopete_*.desktop
@@ -693,9 +697,10 @@ track of the time spent online for you.
%defattr(-,root,root,-)
%config(noreplace) /etc/security/console.apps/kppp3
%config(noreplace) /etc/pam.d/kppp3
-%{tde_bindir}/kppp
+%{tde_bindir}/kppp3
%{tde_bindir}/kppplogview
-%{tde_sbindir}/kppp
+%{_sbindir}/kppp3
+%{tde_sbindir}/kppp3
%{tde_tdeappdir}/Kppp.desktop
%{tde_tdeappdir}/kppplogview.desktop
%{tde_datadir}/apps/checkrules
@@ -1024,6 +1029,7 @@ update-desktop-database 2> /dev/null || :
%prep
%setup -q -n kdenetwork
+%patch1 -p1 -b .ldflags
%patch3 -p1 -b .kppp
%patch4 -p1 -b .resolv
%patch6 -p1 -b .krfb_httpd
@@ -1071,7 +1077,7 @@ cd build
..
# Tdenetwork is not smp safe !
-%__make
+%__make VERBOSE=1
%install
@@ -1106,17 +1112,21 @@ for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
fi
done
-# Run kppp through consolehelper
-install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
-mkdir -p %{buildroot}%{tde_sbindir}
-mv %{buildroot}%{tde_bindir}/kppp %{buildroot}%{tde_sbindir}
-ln -s /usr/bin/consolehelper %{buildroot}%{tde_bindir}/kppp
-mkdir -p %{buildroot}/etc/security/console.apps
-cat > %{buildroot}/etc/security/console.apps/kppp3 <<EOF
+# Run kppp through consolehelper, and rename it to 'kppp3'
+%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
+%__mkdir_p %{buildroot}%{tde_sbindir} %{buildroot}%{_sbindir}
+%__mv %{buildroot}%{tde_bindir}/kppp %{buildroot}%{tde_sbindir}/kppp3
+%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kppp3
+%if "%{tde_prefix}" != "/usr"
+%__ln_s %{tde_sbindir}/kppp3 %{?buildroot}%{_sbindir}/kppp3
+%endif
+%__mkdir_p %{buildroot}%{_sysconfdir}/security/console.apps
+cat > %{buildroot}%{_sysconfdir}/security/console.apps/kppp3 <<EOF
USER=root
-PROGRAM=%{tde_sbindir}/kppp
+PROGRAM=%{tde_sbindir}/kppp3
SESSION=true
EOF
+%__sed -i %{buildroot}%{tde_tdeappdir}/Kppp.desktop -e "/Exec=/ s|kppp|kppp3|"
# ktalk
%__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
@@ -1144,7 +1154,6 @@ EOF
- Fix html special chars in kopete nowlistening plugin [Bug #944] [Commit #0a2892ed]
- Fix a fatal error message [Commit #5c988de1]
- Fix a parallel build bug [Commit #35c41f35]
-- Use libv4l if available, otherwise check for v4l1 headers [Commit #d8cbbab8]
* Sat Jun 16 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Split single package in multiple packages
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
index 3c32f5e12..d85cfc7d4 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
@@ -1,7 +1,9 @@
+# Avoids relinking, which breaks consolehelper
+%define dont_relink 1
+
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{tde_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
@@ -615,6 +617,7 @@ power management, for laptops, from within TDE.
%{_sysconfdir}/pam.d/klaptop_acpi_helper
%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
%{tde_sbindir}/klaptop_acpi_helper
+%{_sbindir}/klaptop_acpi_helper
%config %{tde_datadir}/config/kcmlaptoprc
%post -n trinity-klaptopdaemon
@@ -1024,11 +1027,13 @@ fi
%__install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/klaptop_acpi_helper
%__install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-pushd %{buildroot}%{tde_bindir}
- %__mkdir_p %{buildroot}%{tde_sbindir}
- %__mv klaptop_acpi_helper ../sbin
- %__ln_s /usr/bin/consolehelper klaptop_acpi_helper
-popd
+# Use consolehelper for 'klaptop_acpi_helper'
+%__mkdir_p %{buildroot}%{tde_sbindir} %{buildroot}%{_sbindir}
+%__mv %{buildroot}%{tde_bindir}/klaptop_acpi_helper %{buildroot}%{tde_sbindir}
+%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/klaptop_acpi_helper
+%if "%{tde_prefix}" != "/usr"
+%__ln_s %{tde_sbindir}/klaptop_acpi_helper %{?buildroot}%{_sbindir}/klaptop_acpi_helper
+%endif
# klaptop setting
%__install -p -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/config/kcmlaptoprc
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 04:04:57 +0000