diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-09-14 16:20:36 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-09-14 16:20:36 +0200 |
| commit | a89bfaa6c8ee648f38797165346971c15da15875 (patch) | |
| tree | e023f6e46560dfe494fe271d5082c0409ec98e5c /redhat/applications | |
| parent | d8260a6ce3beb4f6aa74e66f9f9b56995a36d79e (diff) | |
| download | tde-packaging-a89bfaa6c8ee648f38797165346971c15da15875.tar.gz tde-packaging-a89bfaa6c8ee648f38797165346971c15da15875.zip | |
RPM Packaging: update 3.5.13.2
Diffstat (limited to 'redhat/applications')
7 files changed, 11 insertions, 11 deletions
diff --git a/redhat/applications/abakus/abakus-3.5.13.2.spec b/redhat/applications/abakus/abakus-3.5.13.2.spec index 318512989..df8f863dc 100644 --- a/redhat/applications/abakus/abakus-3.5.13.2.spec +++ b/redhat/applications/abakus/abakus-3.5.13.2.spec @@ -75,7 +75,7 @@ export KDEDIR="%{tde_prefix}" # Specific path for RHEL4 if [ -d "/usr/X11R6" ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec index 102cfa9fd..a4e345197 100644 --- a/redhat/applications/amarok/amarok-3.5.13.2.spec +++ b/redhat/applications/amarok/amarok-3.5.13.2.spec @@ -364,7 +364,7 @@ export KDEDIR=%{tde_prefix} # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} diff --git a/redhat/applications/kbfx/kbfx-3.5.13.2.spec b/redhat/applications/kbfx/kbfx-3.5.13.2.spec index 4d176bca1..537ea1546 100644 --- a/redhat/applications/kbfx/kbfx-3.5.13.2.spec +++ b/redhat/applications/kbfx/kbfx-3.5.13.2.spec @@ -82,8 +82,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" # Shitty hack for RHEL4 ... if [ -d "/usr/X11R6" ]; then export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec index 5f67030ba..c369f8af8 100644 --- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec +++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec @@ -63,7 +63,7 @@ BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel %endif %if 0%{?rhel} == 4 BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-devel +#BuildRequires: gstreamer-plugins-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: gstreamer-devel diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec index 7facfdf39..a15205dda 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec @@ -77,13 +77,10 @@ unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export KDEDIR="%{tde_prefix}" -export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}" - # Shitty hack for RHEL4 ... if [ -d "/usr/X11R6" ]; then export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi # Error in "po/tr.po" diff --git a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec index d413e41f1..ef65bd1dc 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec @@ -75,6 +75,11 @@ unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" +# Specific path for RHEL4 +if [ -d /usr/X11R6 ]; then + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" +fi + %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %__mkdir_p build cd build diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec index e93214a0a..5d9ed7f1a 100644 --- a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec +++ b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec @@ -77,8 +77,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" # Shitty hack for RHEL4 ... if [ -d "/usr/X11R6" ]; then export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} |