Merge remote-tracking branch 'origin/master' into f17
Conflicts: .gitignore sources spice-gtk.spec
This commit is contained in:
commit
95926aff23
2
.gitignore
vendored
2
.gitignore
vendored
@ -7,4 +7,4 @@
|
|||||||
/spice-gtk-0.8.tar.bz2
|
/spice-gtk-0.8.tar.bz2
|
||||||
/spice-gtk-0.9.tar.bz2
|
/spice-gtk-0.9.tar.bz2
|
||||||
/spice-gtk-0.10.tar.bz2
|
/spice-gtk-0.10.tar.bz2
|
||||||
/spice-gtk-0.10.6-9473.tar.bz2
|
/spice-gtk-0.11.tar.bz2
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
858de39dc91b6fcb29aa8f8c8eb59ea7 spice-gtk-0.10.6-9473.tar.bz2
|
c8f2c274ab81e0ac273be5c6490b8603 spice-gtk-0.11.tar.bz2
|
||||||
|
@ -9,10 +9,10 @@
|
|||||||
%define with_gtk3 1
|
%define with_gtk3 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define _version_suffix -9473
|
#define _version_suffix -ab64
|
||||||
|
|
||||||
Name: spice-gtk
|
Name: spice-gtk
|
||||||
Version: 0.10.6
|
Version: 0.11
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A GTK+ widget for SPICE clients
|
Summary: A GTK+ widget for SPICE clients
|
||||||
|
|
||||||
@ -150,13 +150,13 @@ cp -a spice-gtk-%{version} spice-gtk3-%{version}
|
|||||||
%build
|
%build
|
||||||
|
|
||||||
cd spice-gtk-%{version}
|
cd spice-gtk-%{version}
|
||||||
%configure --with-gtk=2.0 --enable-gtk-doc --with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk/
|
%configure --with-gtk=2.0 --enable-gtk-doc --with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk-%{_arch}/
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
%if %{with_gtk3}
|
%if %{with_gtk3}
|
||||||
cd spice-gtk3-%{version}
|
cd spice-gtk3-%{version}
|
||||||
%configure --with-gtk=3.0 --enable-vala --with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk/
|
%configure --with-gtk=3.0 --enable-vala --with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk-%{_arch}/
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
cd ..
|
cd ..
|
||||||
%endif
|
%endif
|
||||||
@ -211,7 +211,7 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
|
|||||||
%{_libdir}/libspice-client-glib-2.0.so.*
|
%{_libdir}/libspice-client-glib-2.0.so.*
|
||||||
%{_libdir}/libspice-controller.so.*
|
%{_libdir}/libspice-controller.so.*
|
||||||
%{_libdir}/girepository-1.0/SpiceClientGLib-2.0.typelib
|
%{_libdir}/girepository-1.0/SpiceClientGLib-2.0.typelib
|
||||||
%{_libexecdir}/spice-gtk/spice-client-glib-usb-acl-helper
|
%{_libexecdir}/spice-gtk-%{_arch}/spice-client-glib-usb-acl-helper
|
||||||
%{_datadir}/polkit-1/actions/org.spice-space.lowlevelusbaccess.policy
|
%{_datadir}/polkit-1/actions/org.spice-space.lowlevelusbaccess.policy
|
||||||
|
|
||||||
%files -n spice-glib-devel
|
%files -n spice-glib-devel
|
||||||
@ -252,8 +252,9 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
|
|||||||
%{_bindir}/spicy-stats
|
%{_bindir}/spicy-stats
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Mar 01 2012 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.10.6-1
|
* Fri Mar 9 2012 Hans de Goede <hdegoede@redhat.com> - 0.11-1
|
||||||
- Add foreign menu support
|
- New upstream release 0.11
|
||||||
|
- Fix multilib conflict in spice-glib
|
||||||
|
|
||||||
* Thu Feb 23 2012 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.10-1
|
* Thu Feb 23 2012 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.10-1
|
||||||
- New upstream release 0.10
|
- New upstream release 0.10
|
||||||
|
Loading…
Reference in New Issue
Block a user