summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--redhat/Makefile.r148
-rw-r--r--redhat/applications/amarok/amarok-14.0.0.spec4
-rw-r--r--redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec17
-rw-r--r--redhat/applications/kaffeine/kaffeine-14.0.0.spec4
-rw-r--r--redhat/applications/kmplayer/kmplayer-14.0.0.spec4
-rwxr-xr-xredhat/build/configure_repository.sh18
-rwxr-xr-xredhat/build/get_rpm_package_name.sh4
-rw-r--r--redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec5
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.pclos20175
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.pclos20177
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.pclos20178
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.pclos20175
-rw-r--r--redhat/main/tdelibs/tdelibs-14.0.0.spec3
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec4
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec4
15 files changed, 69 insertions, 31 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index d377ab753..ffd1575f0 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -255,6 +255,12 @@ endif
python-qt3: tdelibs sip
$(call buildpkg,3rdparty/python-qt3)
+rdiff-backup:
+# Only for PCLINUXOS
+ifneq ($(wildcard /etc/pclinuxos-release),)
+ $(call buildpkg,3rdparty/rdiff-backup)
+endif
+
sip:
# Build on CentOS 5 only (vendor-provided SIP is too old)
ifneq ($(wildcard /boot/vmlinuz*.el5*),)
@@ -452,7 +458,7 @@ kdirstat: tdebase
kdpkg: tdebase
$(call buildpkg,applications/kdpkg)
-keep: tdebase
+keep: tdebase rdiff-backup
$(call buildpkg,applications/keep)
kerberostray: tdebase
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 289c85f72..824c9361a 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -210,12 +210,8 @@ BuildRequires: %{_lib}inotifytools-devel
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} >= 5
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
BuildRequires: %{_lib}xine1.2-devel
%endif
-%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
index c28db02e8..be57d2f0e 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
+++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
@@ -109,6 +109,19 @@ GTK3 style engine which uses the active TDE style to draw its widgets
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+if [ -d "/usr/include/atk-1.0" ]; then
+ extra_includes="%{_includedir}/atk-1.0:${extra_includes}"
+fi
+if [ -d "/usr/include/gdk-pixbuf-2.0" ]; then
+ extra_includes="%{_includedir}/gdk-pixbuf-2.0:${extra_includes}"
+fi
+if [ -d "/usr/include/gtk-3.0" ]; then
+ extra_includes="%{_includedir}/gtk-3.0:${extra_includes}"
+fi
+if [ -d "/usr/include/pango-1.0" ]; then
+ extra_includes="%{_includedir}/pango-1.0:${extra_includes}"
+fi
+
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -124,7 +137,9 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-final \
--enable-closure \
--enable-rpath \
- --disable-gcc-hidden-visibility
+ --disable-gcc-hidden-visibility \
+ \
+ --with-extra-includes=${extra_includes}
%__make %{?_smp_mflags}
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index b9b4f22d4..068d5e22c 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -142,12 +142,8 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0
%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
BuildRequires: %{_lib}xine1.2-devel
%endif
-%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
index 11b191ddf..f68698644 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
@@ -104,12 +104,8 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0
%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
BuildRequires: %{_lib}xine1.2-devel
%endif
-%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
index 27dad6125..c40e64b64 100755
--- a/redhat/build/configure_repository.sh
+++ b/redhat/build/configure_repository.sh
@@ -4,6 +4,9 @@ TDE_VERSION=${1:-14.0.0}
ARCH=$(rpm -E %_target_cpu)
RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
+[ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch"
+[ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"
+
# RHEL / CentOS / Fedora
if [ -x /usr/bin/yum ]; then
cat <<EOF >/tmp/rpmbuild-tde.repo
@@ -23,17 +26,22 @@ EOF
fi
# Mageia / Mandriva
-if [ -x /usr/sbin/urpmi ]; then
+if [ -x "/usr/sbin/urpmi" ]; then
sudo urpmi.removemedia -y "rpmbuild"
- sudo urpmi.addmedia rpmbuild.${ARCH} ${RPMDIR}/${ARCH}
- sudo urpmi.addmedia rpmbuild.noarch ${RPMDIR}/noarch
+ sudo urpmi.addmedia "rpmbuild.${ARCH}" "${RPMDIR}/${ARCH}"
+ sudo urpmi.addmedia "rpmbuild.noarch" "${RPMDIR}/noarch"
fi
# openSUSE
if [ -x /usr/bin/zypper ]; then
sudo rm -f "/etc/zypp/repos.d/rpmbuild"*
- sudo zypper ar -G ${RPMDIR}/${ARCH} rpmbuild.${ARCH}
- sudo zypper ar -G ${RPMDIR}/noarch rpmbuild.noarch
+ sudo zypper ar -G "${RPMDIR}/${ARCH}" "rpmbuild.${ARCH}"
+ sudo zypper ar -G "${RPMDIR}/noarch" "rpmbuild.noarch"
fi
# PCLOS
+if [ -x "/usr/bin/apt-get" ]; then
+ [ ! -L "${RPMDIR}/RPMS.${ARCH}" ] && ln -sf "${ARCH}" "${RPMDIR}/RPMS.${ARCH}"
+ [ ! -L "${RPMDIR}/RPMS.noarch" ] && ln -sf "noarch" "${RPMDIR}/RPMS.noarch"
+ echo "rpm file:${RPMDIR%/*} ${RPMDIR##*/} ${ARCH} noarch" >"/etc/apt/sources.list.d/rpmbuild.list"
+fi
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 4167b8f2a..3fa65ebcb 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -24,7 +24,7 @@ case "${PKGNAME}" in
# Most TDE libraries have no prefix
#"libkdcraw") PREFIX="";;
# 3rd party dependencies
- "dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"hk_classes"|"lcms"|"mp4v2"|"python-qt3"|"tar") PREFIX="";;
+ "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"hk_classes"|"lcms"|"mp4v2"|"python-qt3"|"rdiff-backup"|"tar") PREFIX="";;
# Extra build stuff
"autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
# Other
@@ -85,7 +85,7 @@ if [ -n "${DEVEL}" ]; then
# Some other packags NOT having development package
case "${PKGNAME}" in
- "cmake"|"hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks") exit 0;;
+ "cmake"|"cscope"|"hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"rdiff-backup"|"torsocks") exit 0;;
"tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;;
esac
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index a0a3c5978..b9d293309 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -202,8 +202,9 @@ for i in doc/html/*; do
done
# Installs the Designer plugin
-for i in designer/*.so; do
- %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/} || %__install -D -m 644 ${QTDIR}/plugins/$i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
+for i in designer/*.so ${QTDIR}/plugins/designer/*.so; do
+ [ -r "${i}" ] || continue
+ %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
done
# Installs libraries
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017
new file mode 100644
index 000000000..690b4df08
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2017 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2017
new file mode 100644
index 000000000..87d080f58
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2017
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth include system-auth
+auth required pam_nologin.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
+session required pam_namespace.so
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 28c17154e..1c7d5e619 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -218,6 +218,9 @@ Requires: avahi
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_openexr 1
BuildRequires: OpenEXR-devel
+%if 0%{?pclinuxos}
+BuildRequires: libpthread-stubs
+%endif
%endif
# LIBTOOL
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
index a6fc880f2..26743e5d8 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
@@ -173,12 +173,8 @@ BuildRequires: libXxf86vm-devel
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
BuildRequires: %{_lib}xine1.2-devel
%endif
-%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
index de36dda1e..604f73ef1 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
@@ -173,12 +173,8 @@ BuildRequires: libXxf86vm-devel
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
BuildRequires: %{_lib}xine1.2-devel
%endif
-%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-14 19:34:18 +0000