diff options
| author | François Andriot <albator78@libertysurf.fr> | 2017-08-02 17:19:39 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2017-08-02 17:19:39 +0200 |
| commit | df20fa92cb84771b6c0a3a0f3fa79af383f80d4d (patch) | |
| tree | de5c9c98c8da31f46872604da5497bc1871c64bd /redhat/applications | |
| parent | fafb41251ffab1087bd69f1a8a4232c0651075b0 (diff) | |
| download | tde-packaging-df20fa92cb84771b6c0a3a0f3fa79af383f80d4d.tar.gz tde-packaging-df20fa92cb84771b6c0a3a0f3fa79af383f80d4d.zip | |
RPM: update build scripts for PCLinuxOS 2017
Diffstat (limited to 'redhat/applications')
4 files changed, 16 insertions, 13 deletions
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 |