Hello community, here is the log from the commit of package freerdp for openSUSE:Factory checked in at 2013-11-04 14:52:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freerdp (Old) and /work/SRC/openSUSE:Factory/.freerdp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freerdp" Changes: -------- --- /work/SRC/openSUSE:Factory/freerdp/freerdp.changes 2013-09-12 20:03:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.freerdp.new/freerdp.changes 2013-11-04 14:52:50.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Oct 31 17:58:21 UTC 2013 - [email protected] + +- Allow build on SLES11: + * converted pkgconfig() BuildRequires to package names + * added FindALSA.cmake + * use 'make install' instead of '%make_install' macro + +------------------------------------------------------------------- New: ---- FindALSA.cmake ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freerdp.spec ++++++ --- /var/tmp/diff_new_pack.EqxObN/_old 2013-11-04 14:52:53.000000000 +0100 +++ /var/tmp/diff_new_pack.EqxObN/_new 2013-11-04 14:52:53.000000000 +0100 @@ -26,6 +26,7 @@ Group: Productivity/Networking/Other Url: http://www.freerdp.com/ Source0: https://github.com/downloads/FreeRDP/FreeRDP/%{name}-%{version}.tar.gz +Source1: FindALSA.cmake # PATCH-FIX-UPSTREAM freerdp-fix-FindPCSC-macro.patch https://github.com/FreeRDP/FreeRDP/issues/562 [email protected] -- Fix the build by setting PCSC_LIBRARIES and PCSC_INCLUDE_DIRS variables explicitly which are otherwise empty Patch1: freerdp-fix-FindPCSC-macro.patch # PATCH-FIX-UPSTREAM freerdp-fix-pulse-no-device-name.patch bnc#785437 [email protected] -- Fix a segfault in case device name is not provided @@ -38,10 +39,10 @@ BuildRequires: xmlto BuildRequires: xorg-x11-devel BuildRequires: zlib-devel -BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(libpcsclite) -BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(openssl) +BuildRequires: alsa-devel +BuildRequires: pcsc-lite-devel +BuildRequires: libpulse-devel +BuildRequires: libopenssl-devel Recommends: libfreerdp-plugins BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -88,6 +89,9 @@ ,s/FREERDP_PLUGIN_PATH "\${CMAKE_INSTALL_PREFIX}\/\${CMAKE_INSTALL_LIBDIR}\/freerdp"/FREERDP_PLUGIN_PATH "\${CMAKE_INSTALL_PREFIX}\/\${CMAKE_INSTALL_LIBDIR}\/%{libname}"/ w EOF +%if 0%{?sles_version} == 11 + cp %SOURCE1 cmake/ +%endif %build mkdir build @@ -110,7 +114,7 @@ %install cd build -%make_install +make install 'DESTDIR=%{buildroot}' # remove keymaps as we make use of libxkbfile # rm -rf $RPM_BUILD_ROOT/usr/share/freerdp/keymaps/ ++++++ FindALSA.cmake ++++++ # - Find alsa # Find the alsa libraries (asound) # # This module defines the following variables: # ALSA_FOUND - True if ALSA_INCLUDE_DIR & ALSA_LIBRARY are found # ALSA_LIBRARIES - Set when ALSA_LIBRARY is found # ALSA_INCLUDE_DIRS - Set when ALSA_INCLUDE_DIR is found # # ALSA_INCLUDE_DIR - where to find asoundlib.h, etc. # ALSA_LIBRARY - the asound library # #============================================================================= # Copyright 2009 Kitware, Inc. # Copyright 2009 Philip Lowman <[email protected]> # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. # # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. #============================================================================= # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) find_path(ALSA_INCLUDE_DIR NAMES asoundlib.h PATH_SUFFIXES alsa DOC "The ALSA (asound) include directory" ) find_library(ALSA_LIBRARY NAMES asound DOC "The ALSA (asound) library" ) # handle the QUIETLY and REQUIRED arguments and set ALSA_FOUND to TRUE if # all listed variables are TRUE FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALSA DEFAULT_MSG ALSA_LIBRARY ALSA_INCLUDE_DIR) if(ALSA_FOUND) set( ALSA_LIBRARIES ${ALSA_LIBRARY} ) set( ALSA_INCLUDE_DIRS ${ALSA_INCLUDE_DIR} ) endif() mark_as_advanced(ALSA_INCLUDE_DIR ALSA_LIBRARY) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
