Merge branch 'master' into f17
This commit is contained in:
commit
4ff70754e3
@ -353,7 +353,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
mkdir -p %{_target_platform}
|
mkdir -p %{_target_platform}
|
||||||
pushd %{_target_platform}
|
pushd %{_target_platform}
|
||||||
%{cmake_kde4} \
|
%{cmake_kde4} \
|
||||||
-DKDE_DISTRIBUTION_TEXT="%{version}-%{release}%{?fedora: Fedora}%{?!fedora: Red Hat Enterprise Linux}" \
|
-DKDE_DISTRIBUTION_TEXT="%{version}-%{release}%{?fedora: Fedora}%{?rhel: Red Hat Enterprise Linux}" \
|
||||||
%if 0%{?rhel} > 6 || 0%{?fedora} > 17
|
%if 0%{?rhel} > 6 || 0%{?fedora} > 17
|
||||||
-DWITH_SOLID_UDISKS2:BOOL=ON \
|
-DWITH_SOLID_UDISKS2:BOOL=ON \
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user