RPM packaging: update R14 packages

1 files changed, 13 insertions, 1 deletions

diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
index 5c6d2ff63..d47264b1a 100644
--- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -59,6 +59,7 @@ BuildRequires:	libxcb-devel
 BuildRequires:	%{_lib}xcb-devel
 %endif
 
+# X11 stuff
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}xi-devel
 %if 0%{?mgaversion} >= 4
@@ -81,6 +82,13 @@ BuildRequires:	libXau-devel
 BuildRequires:	xorg-x11-devel
 %endif
 
+# Broken PNG images
+%if 0%{?mgaversion} >= 4 || 0%{?fedora} >= 20
+BuildRequires:	kde-dev-scripts
+BuildRequires:	optipng
+BuildRequires:	advancecomp
+%endif
+
 Obsoletes:		trinity-kdeaccessibility < %{version}-%{release}
 Provides:		trinity-kdeaccessibility = %{version}-%{release}
 Obsoletes:		trinity-kdeaccessibility-libs < %{version}-%{release}
@@ -465,7 +473,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
 
 %configure \
@@ -495,6 +503,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+if [ -x /usr/bin/optimizegraphics ]; then
+  (cd %{?buildroot} && /usr/bin/optimizegraphics)
+fi
+
 
 %clean
 %__rm -rf %{buildroot}