RPM Packaging: update 3.5.13.2

20 files changed, 43 insertions, 39 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}
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
index 3aaa84439..0ee74644a 100644
--- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
@@ -95,7 +95,7 @@ fi
   --disable-dependency-tracking
 
 # FIXME: bad libtool ??
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5
 %__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 %else
 %__make %{?_smp_mflags}
@@ -104,7 +104,7 @@ fi
 
 %install
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool)
+%__make install DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool
 
 # Unwanted files
 %__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
index d6794dbd2..3c7dc5f6f 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
@@ -62,7 +62,7 @@ BuildRequires:	libungif-devel
 %endif
 
 # DJVU support
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_djvu 1
 BuildRequires:	djvulibre
 %endif
@@ -80,9 +80,6 @@ BuildRequires:	xmedcon-devel
 %if 0%{?fedora} || 0%{?rhel} 
 BuildRequires:	librsvg2
 %endif
-%if 0%{?fedora}
-BuildRequires:	librsvg2-tools
-%endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	librsvg
 %endif
diff --git a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
index 1df1d2a0b..5ccf7a2a1 100644
--- a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
+++ b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
@@ -708,7 +708,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --enable-closure \
   --enable-rpath \
   \
-  --with-extra-includes=%{_includedir}/db4:%{_includedir}/db53:%{_includedir}/libdb4:%{tde_includedir}/arts \
+  --with-extra-includes=%{_includedir}/db4:%{_includedir}/db51:%{_includedir}/db53:%{_includedir}/libdb4:%{tde_includedir}/arts \
   \
   %{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \
   --with-sdl \
diff --git a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
index e96101a2c..7646dfc70 100644
--- a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
+++ b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
@@ -636,15 +636,18 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
 %endif
 
-%if 0%{?fedora} >= 19
+%if 0%{?fedora} >= 15
 %{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
+%endif
+
+%if 0%{?fedora} >= 18
+%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
 %endif
 
@@ -675,7 +678,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 # 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/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index 1e0d6f40a..90071914c 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -75,7 +75,7 @@ Source7:	xdm.oss114
 %endif
 
 # Fedora 17: special selinux policy required
-%if 0%{?fedora} >= 17 || 0%{?rhel} == 6
+%if 0%{?fedora} == 17 ||0%{?fedora} == 19 || 0%{?rhel} == 6
 %define with_selinux_policy 1
 Source8:	tdm%{?dist}.pp
 %endif
@@ -3378,8 +3378,7 @@ export KDEDIR=%{tde_prefix}
 # 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
 
 # Samba 4.0 includes (Fedora 18)
diff --git a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
index e77f2cb98..a27951ea6 100644
--- a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
+++ b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
@@ -174,7 +174,7 @@ BuildRequires:	%{_lib}poppler-devel
 %endif
 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
 # On RHEL 5, the distro-provided poppler is too old. We built a newer one.
-BuildRequires:	trinity-poppler-devel
+BuildRequires:	trinity-poppler-devel >= 0.12
 BuildRequires:	trinity-poppler-qt3-devel >= 0.12
 %endif
 
@@ -1267,7 +1267,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}
@@ -1279,7 +1279,7 @@ cd build
 %cmake \
   -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG -L%{tde_libdir}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG -L%{tde_libdir} -I%{tde_includedir}" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index 1956c6237..a2a9a3a79 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -210,7 +210,7 @@ Requires:		ca-certificates
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
 Requires:		openssl
 %endif
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+%if 0%{?rhel} == 5
 %define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 Requires:		openssl
 %endif
@@ -393,7 +393,7 @@ export LD_LIBRARY_PATH="%{tde_libdir}"
 export KDEDIR="%{tde_prefix}"
 
 if [ -d "/usr/X11R6" ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
 fi
 
 
diff --git a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
index 6190082c4..4b5b65217 100644
--- a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
+++ b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
@@ -1092,7 +1092,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 # 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/tdepim/tdepim-3.5.13.2.spec b/redhat/tdepim/tdepim-3.5.13.2.spec
index dd7780e53..3c31f67ba 100644
--- a/redhat/tdepim/tdepim-3.5.13.2.spec
+++ b/redhat/tdepim/tdepim-3.5.13.2.spec
@@ -2203,7 +2203,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 # 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/tdesdk/tdesdk-3.5.13.2.spec b/redhat/tdesdk/tdesdk-3.5.13.2.spec
index 540d01606..bd77686b4 100644
--- a/redhat/tdesdk/tdesdk-3.5.13.2.spec
+++ b/redhat/tdesdk/tdesdk-3.5.13.2.spec
@@ -1097,7 +1097,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 # 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}
 %__mkdir_p build
diff --git a/redhat/tdetoys/tdetoys-3.5.13.2.spec b/redhat/tdetoys/tdetoys-3.5.13.2.spec
index 32e3cbc41..82895e0e0 100644
--- a/redhat/tdetoys/tdetoys-3.5.13.2.spec
+++ b/redhat/tdetoys/tdetoys-3.5.13.2.spec
@@ -384,9 +384,13 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %build
 unset QTDIR || : ; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 export KDEDIR=%{tde_prefix}
 
+# 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/tdeutils/tdeutils-3.5.13.2.spec b/redhat/tdeutils/tdeutils-3.5.13.2.spec
index 35d023e11..4350fc161 100644
--- a/redhat/tdeutils/tdeutils-3.5.13.2.spec
+++ b/redhat/tdeutils/tdeutils-3.5.13.2.spec
@@ -981,8 +981,7 @@ export KDEDIR="%{tde_prefix}"
 # 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/tdevelop/tdevelop-3.5.13.2.spec b/redhat/tdevelop/tdevelop-3.5.13.2.spec
index 305fb8c0d..d212a5ce4 100644
--- a/redhat/tdevelop/tdevelop-3.5.13.2.spec
+++ b/redhat/tdevelop/tdevelop-3.5.13.2.spec
@@ -85,8 +85,10 @@ BuildRequires:	openldap2-devel
 BuildRequires:	openldap-devel
 %endif
 
-#ACL support
+# LIBACL support
+%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	libacl-devel
+%endif
 
 Obsoletes:	trinity-tdevelop < %{version}-%{release}
 Provides:	trinity-tdevelop = %{version}-%{release}
@@ -589,7 +591,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 # 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
 
 # c references