diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-08-05 20:25:18 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-08-05 20:25:18 +0200 |
| commit | 562049cd694f6dd0927b9880227fc4f6da008839 (patch) | |
| tree | e939e442f1fb29ff29811ebc02f672ecf62a47c1 /redhat/main/tdeaddons | |
| parent | 6253ed4f8177cb33fef709fb7e215ff94e6300c1 (diff) | |
| download | tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.tar.gz tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.zip | |
RPM Packaging: massive update
Diffstat (limited to 'redhat/main/tdeaddons')
| -rw-r--r-- | redhat/main/tdeaddons/tdeaddons-14.0.0.spec | 5 | ||||
| -rw-r--r-- | redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch | 18 |
2 files changed, 23 insertions, 0 deletions
diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec index 3f0b192b2..a2a61abb4 100644 --- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec @@ -66,6 +66,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Patch1: tdeaddons-14.0.1-fix_sdl_detection.patch # Trinity dependencies @@ -115,6 +116,9 @@ BuildRequires: gamin-devel BuildRequires: pcre-devel %endif +# ACL support +BuildRequires: libacl-devel + # DB4/DB5 support %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} %define with_db 1 @@ -729,6 +733,7 @@ done %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .sdl %build diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch b/redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch new file mode 100644 index 000000000..ca2fe2fcc --- /dev/null +++ b/redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch @@ -0,0 +1,18 @@ +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index 1fedc9a..f3872b9 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -74,7 +74,12 @@ if( BUILD_NOATUN_PLUGINS ) + if( WITH_SDL ) + pkg_search_module( SDL sdl ) + if( NOT SDL_FOUND ) +- tde_message_fatal( "SDL is requested, but was not found on your system" ) ++ check_include_file( SDL/SDL.h HAVE_SDL_H ) ++ if( NOT HAVE_SDL_H ) ++ tde_message_fatal( "SDL is requested, but was not found on your system" ) ++ endif ( ) ++ set ( SDL_INCLUDE_DIRS /usr/include/SDL ) ++ set ( SDL_LIBRARIES SDL pthread ) + endif( ) + endif( WITH_SDL ) + |