diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-11-07 15:32:15 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-11-07 15:32:15 +0100 |
| commit | e187705a4cf93d04d69e4b58351c128432bf8ba8 (patch) | |
| tree | 863436fe53d6780c1f9303f0061c520f39b4eeab /redhat/main/tdeaddons | |
| parent | 10d8be91c9ba6a6360c6ac9ee818408c42c0663b (diff) | |
| download | tde-packaging-e187705a4cf93d04d69e4b58351c128432bf8ba8.tar.gz tde-packaging-e187705a4cf93d04d69e4b58351c128432bf8ba8.zip | |
RPM Packaging: update for 14.0.2
Diffstat (limited to 'redhat/main/tdeaddons')
| -rw-r--r-- | redhat/main/tdeaddons/tdeaddons-14.0.0.spec | 2 | ||||
| -rw-r--r-- | redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch | 18 |
2 files changed, 0 insertions, 20 deletions
diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec index 4a913815e..17b36008b 100644 --- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec @@ -61,7 +61,6 @@ 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 @@ -728,7 +727,6 @@ 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 deleted file mode 100644 index ca2fe2fcc..000000000 --- a/redhat/main/tdeaddons/tdeaddons-14.0.1-fix_sdl_detection.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 ) - |