mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4797 from akallabeth/rpm_expand_fix

Browse Source 
Removed comments with variables and (previously added) buggy suse con…
This commit is contained in:
David Fort 2018-08-22 17:53:16 +02:00 committed by GitHub
commit d093189ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/rpm/freerdp-nightly.spec
View File

@ -24,7 +24,6 @@ Summary: Free implementation of the Remote Desktop Protocol (RDP)
Url: http://www.freerdp.com Url: http://www.freerdp.com
Group: Productivity/Networking/Other Group: Productivity/Networking/Other
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
#Source1: %{name}-rpmlintrc
Source1: source_version Source1: source_version
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cmake >= 2.8.12 BuildRequires: cmake >= 2.8.12
@ -80,10 +79,9 @@ BuildRequires: dbus-glib-devel
BuildRequires: gstreamer1-devel BuildRequires: gstreamer1-devel
BuildRequires: gstreamer1-plugins-base-devel BuildRequires: gstreamer1-plugins-base-devel
BuildRequires: libjpeg-turbo-devel BuildRequires: libjpeg-turbo-devel
#BuildRequires: ffmpeg-devel
%endif %endif
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 || %{defined suse_version} %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
BuildRequires: libwayland-client-devel BuildRequires: libwayland-client-devel
%endif %endif
@ -117,12 +115,10 @@ cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/.source_version
-DWITH_CUPS=ON \ -DWITH_CUPS=ON \
-DWITH_PCSC=ON \ -DWITH_PCSC=ON \
-DWITH_JPEG=ON \ -DWITH_JPEG=ON \
-DWITH_GSTREAMER_0_10=ON \
%if %{defined suse_version} %if %{defined suse_version}
-DWITH_FFMPEG=ON \ -DWITH_FFMPEG=ON \
-DWITH_DSP_FFMPEG=ON \ -DWITH_DSP_FFMPEG=ON \
%endif %endif
%if %{defined rhel} && 0%{?rhel} <= 7 %if %{defined rhel} && 0%{?rhel} <= 7
-DWITH_WAYLAND=OFF \ -DWITH_WAYLAND=OFF \
%endif %endif
@ -172,7 +168,7 @@ export NO_BRP_CHECK_RPATH true
%{INSTALL_PREFIX}/share/man/man1/winpr-hash.1* %{INSTALL_PREFIX}/share/man/man1/winpr-hash.1*
%{INSTALL_PREFIX}/share/man/man7/wlog.7* %{INSTALL_PREFIX}/share/man/man7/wlog.7*
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 || %{defined suse_version} %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
%{INSTALL_PREFIX}/share/man/man1/wlfreerdp.1* %{INSTALL_PREFIX}/share/man/man1/wlfreerdp.1*
%endif %endif