rpms/spice-gtk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'origin/master' into f17

Browse Source 
Conflicts:
	.gitignore
	sources
	spice-gtk.spec
This commit is contained in:
Hans de Goede 2012-03-09 14:59:05 +01:00
commit 95926aff23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,4 +7,4 @@
/spice-gtk-0.8.tar.bz2
/spice-gtk-0.9.tar.bz2
/spice-gtk-0.10.tar.bz2
/spice-gtk-0.10.6-9473.tar.bz2
/spice-gtk-0.11.tar.bz2

2
sources
View File

@ -1 +1 @@
858de39dc91b6fcb29aa8f8c8eb59ea7 spice-gtk-0.10.6-9473.tar.bz2
c8f2c274ab81e0ac273be5c6490b8603 spice-gtk-0.11.tar.bz2

15
spice-gtk.spec
View File

@ -9,10 +9,10 @@
%define with_gtk3 1
%endif
%define _version_suffix -9473
#define _version_suffix -ab64
Name: spice-gtk
Version: 0.10.6
Version: 0.11
Release: 1%{?dist}
Summary: A GTK+ widget for SPICE clients
@ -150,13 +150,13 @@ cp -a spice-gtk-%{version} spice-gtk3-%{version}
%build
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}
cd ..
%if %{with_gtk3}
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}
cd ..
%endif
@ -211,7 +211,7 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
%{_libdir}/libspice-client-glib-2.0.so.*
%{_libdir}/libspice-controller.so.*
%{_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
%files -n spice-glib-devel
@ -252,8 +252,9 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
%{_bindir}/spicy-stats
%changelog
* Thu Mar 01 2012 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.10.6-1
- Add foreign menu support
* Fri Mar 9 2012 Hans de Goede <hdegoede@redhat.com> - 0.11-1
- 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
- New upstream release 0.10