diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-02-06 19:22:11 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-02-06 19:22:11 +0100 |
| commit | 93a84eaf6b9472fd64a025cfb63b0d256f2e6319 (patch) | |
| tree | 38d8a68957e6aa34e06e3da0e183d3e45b649c27 /redhat | |
| parent | 6453d918fe45209039a7931e3045a98610c253b4 (diff) | |
| parent | a67bf0c2e7354d30ca008a48bc36ca1c6ea05712 (diff) | |
| download | tde-packaging-93a84eaf6b9472fd64a025cfb63b0d256f2e6319.tar.gz tde-packaging-93a84eaf6b9472fd64a025cfb63b0d256f2e6319.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/build/Makefile.r14 | 8 | ||||
| -rwxr-xr-x | redhat/build/get_installed_package_version.sh | 1 | ||||
| -rw-r--r-- | redhat/tdebase/tdebase-14.0.0.spec | 11 |
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 94ec3cad1..9998f6721 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 |