summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-02-06 19:20:59 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-02-06 19:20:59 +0100
commita67bf0c2e7354d30ca008a48bc36ca1c6ea05712 (patch)
tree53f3b129a47d9375adea5e0bf7631d139028e6fa /redhat
parenta2030eb3a57cde9db1ab019f4c135e229b8b332e (diff)
downloadtde-packaging-a67bf0c2e7354d30ca008a48bc36ca1c6ea05712.tar.gz
tde-packaging-a67bf0c2e7354d30ca008a48bc36ca1c6ea05712.zip
RPM Packaging: patch kaffeine
Diffstat (limited to 'redhat')
-rw-r--r--redhat/build/Makefile.r148
-rwxr-xr-xredhat/build/get_installed_package_version.sh1
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec11
3 files changed, 19 insertions, 1 deletions
diff --git a/redhat/build/Makefile.r14 b/redhat/build/Makefile.r14
index 5712c83f4..cb82e3898 100644
--- a/redhat/build/Makefile.r14
+++ b/redhat/build/Makefile.r14
@@ -24,7 +24,7 @@ i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
# Dependencies
-arts: tqtinterface
+arts: tqtinterface esound
$(call buildpkg,dependencies/arts)
avahi-tqt: tqtinterface
@@ -122,6 +122,12 @@ tdewebdev: tdebase tdesdk
$(call buildpkg,tdewebdev)
# 3rd party libraries and tools
+esound:
+# Build on Mageia only
+ifneq ($(wildcard /etc/mageia-release),)
+ $(call buildpkg,3rdparty/esound)
+endif
+
htdig:
$(call buildpkg,3rdparty/htdig)
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index 1fced7d42..fa2ff5cf9 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -12,6 +12,7 @@ case ${PKGNAME} in
"trinity-"*) PKGNAME="${PKGNAME#trinity-}";;
"qt3") [ -r /etc/mandriva-release ] && PKGNAME="qt3-common";;
"curl") PKGNAME="trinity-libcurl";;
+ "esound") PKGNAME="$(rpm -E %_lib)esound";;
esac
VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" trinity-${PKGNAME} 2>/dev/null)
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 6751ebeee..7781973d6 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -222,6 +222,17 @@ Requires: indexhtml
%define tde_aboutpage /usr/share/mga/about/index.html
%endif
+# Mageia 4 Theme
+%if 0%{?mgaversion} == 4
+Requires: mageia-theme-Default
+%define tde_bg /usr/share/mga/backgrounds/default.jpg
+%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
+
+Requires: indexhtml
+%define tde_aboutlabel Mageia 4
+%define tde_aboutpage /usr/share/mga/about/index.html
+%endif
+
# Mandriva 2011 Theme: "rosa"
%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
Requires: mandriva-theme