diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-02-16 21:12:46 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-02-16 21:12:46 +0900 |
commit | 5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3 (patch) | |
tree | e5ed8e0ef8b269e375cc5ae3d0514e815fe54f22 /redhat/tdeartwork/tdeartwork-14.0.0.spec | |
parent | 74d6c6f82a27fc3ca51abe188461657782af75b1 (diff) | |
parent | 47f97be766d32c908a39d4dc10dc555af69c82dd (diff) | |
download | tde-packaging-5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3.tar.gz tde-packaging-5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdeartwork/tdeartwork-14.0.0.spec')
-rw-r--r-- | redhat/tdeartwork/tdeartwork-14.0.0.spec | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec index dedd1d1e2..8e73881a0 100644 --- a/redhat/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec @@ -62,7 +62,11 @@ BuildRequires: trinity-libart-lgpl-devel %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} >= 4 +BuildRequires: %{_lib}xscrnsaver-devel +%else BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel +%endif BuildRequires: xscreensaver BuildRequires: xscreensaver-base BuildRequires: xscreensaver-extrusion @@ -646,14 +650,14 @@ 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} >= 18 || 0%{?pclinuxos} +%if 0%{?fedora} >= 18 || 0%{?pclinuxos} || 0%{?mgaversion} >= 4 %{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 -%if 0%{?fedora} >= 20 +%if 0%{?fedora} >= 20 || 0%{?mgaversion} >= 4 %{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop %endif @@ -693,7 +697,7 @@ fi -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWITH_GCC_VISIBILITY=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ |