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/tdegraphics | |
| parent | d8260a6ce3beb4f6aa74e66f9f9b56995a36d79e (diff) | |
| download | tde-packaging-a89bfaa6c8ee648f38797165346971c15da15875.tar.gz tde-packaging-a89bfaa6c8ee648f38797165346971c15da15875.zip | |
RPM Packaging: update 3.5.13.2
Diffstat (limited to 'redhat/tdegraphics')
| -rw-r--r-- | redhat/tdegraphics/tdegraphics-3.5.13.2.spec | 6 |
1 files changed, 3 insertions, 3 deletions
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 \ |