commit 7a834cd13beb911780a011b05fb126b2160b7c3b Merge: 291eb3c 8e49ef0 Author: Mads Kiilerich mads@kiilerich.com Date: Sun Sep 30 23:37:56 2012 +0200
Merge branch 'el6' into el5
Conflicts: freerdp.spec
.gitignore | 2 + c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch | 53 ++++++++++++++++++++++++ freerdp.spec | 51 ++++++++++++++++++++--- sources | 3 +- 4 files changed, 102 insertions(+), 7 deletions(-) --- diff --cc freerdp.spec index ed7cb62,d3140da..4cd9543 --- a/freerdp.spec +++ b/freerdp.spec @@@ -1,6 -1,6 +1,10 @@@ Name: freerdp Version: 1.0.1 ++<<<<<<< HEAD +Release: 3%{?dist} ++======= + Release: 7%{?dist} ++>>>>>>> el6 Summary: Remote Desktop Protocol client
Group: Applications/Communications @@@ -19,12 -22,14 +26,14 @@@ BuildRequires: libXcursor-deve BuildRequires: libXdamage-devel BuildRequires: libXv-devel BuildRequires: libxkbfile-devel -BuildRequires: pulseaudio-libs-devel +#BuildRequires: pulseaudio-libs-devel BuildRequires: cups-devel BuildRequires: pcsc-lite-devel + BuildRequires: desktop-file-utils
Provides: xfreerdp = %{version}-%{release} - Requires: %{name}-libs = %{version}-%{release}, %{name}-plugins = %{version}-%{release} + Requires: %{name}-libs%{?_isa} = %{version}-%{release} + Requires: %{name}-plugins%{?_isa} = %{version}-%{release}
%description The xfreerdp Remote Desktop Protocol (RDP) client from the FreeRDP @@@ -134,8 -166,22 +170,11 @@@ gtk-update-icon-cache %{_datadir}/icons
%changelog + * Sun Sep 30 2012 Mads Kiilerich mads@kiilerich.com - 1.0.1-7 -- merge f17 1.0.1-6 - Backport fix for bug 816692 ++- backport / merge from el6 + -* Thu Jul 19 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Feb 29 2012 Mads Kiilerich mads@kiilerich.com - 1.0.1-5 -- Use new upstream tar with standard naming -- Use _isa for subpackage dependencies - -* Tue Feb 28 2012 Mads Kiilerich mads@kiilerich.com - 1.0.1-4 -- Include patch for sending invalid extra data - -* Tue Feb 28 2012 Mads Kiilerich mads@kiilerich.com - 1.0.1-3 -- Install a freedesktop .desktop file and a high-res icon instead of relying on - _NET_WM_ICON +* Mon Feb 27 2012 Mads Kiilerich mads@kiilerich.com - 1.0.1-3 +- EL5: Disable pulseaudio - the version in EL5 is too old
* Sat Feb 25 2012 Mads Kiilerich mads@kiilerich.com - 1.0.1-2 - Explicit build requirement for xmlto - needed for EL6
scm-commits@lists.fedoraproject.org