packages: spice-gtk/spice-gtk-sh.patch, spice-gtk/spice-gtk.spec, spice-gtk...
qboosh
qboosh at pld-linux.org
Thu Jul 21 21:38:20 CEST 2011
Author: qboosh Date: Thu Jul 21 19:38:20 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 0.7
- removed obsolete proto patch (use spice-protocol 0.8.1 instead)
- build both gtk-2.0/gtk-3.0 libs; python requires gtk-2.0
---- Files affected:
packages/spice-gtk:
spice-gtk-sh.patch (1.1 -> 1.2) , spice-gtk.spec (1.1 -> 1.2) , spice-gtk-proto.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/spice-gtk/spice-gtk-sh.patch
diff -u packages/spice-gtk/spice-gtk-sh.patch:1.1 packages/spice-gtk/spice-gtk-sh.patch:1.2
--- packages/spice-gtk/spice-gtk-sh.patch:1.1 Tue Jul 19 20:44:07 2011
+++ packages/spice-gtk/spice-gtk-sh.patch Thu Jul 21 21:38:14 2011
@@ -1,24 +1,33 @@
---- spice-gtk-0.6/configure.ac.orig 2011-04-10 00:36:27.000000000 +0200
-+++ spice-gtk-0.6/configure.ac 2011-07-18 19:31:00.096087566 +0200
+--- spice-gtk-0.7/configure.ac.orig 2011-07-18 20:28:07.000000000 +0200
++++ spice-gtk-0.7/configure.ac 2011-07-21 18:49:42.148016898 +0200
@@ -70,18 +70,18 @@
PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
AC_SUBST(PIXMAN_CFLAGS)
AC_SUBST(PIXMAN_LIBS)
--SPICE_REQUIRES+=" pixman-1 >= 0.17.7"
-+SPICE_REQUIRES="$SPICE_REQUIRES pixman-1 >= 0.17.7"
+-SPICE_GLIB_REQUIRES+=" pixman-1 >= 0.17.7"
++SPICE_GLIB_REQUIRES="$SPICE_GLIB_REQUIRES pixman-1 >= 0.17.7"
PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1)
AC_SUBST(CELT051_CFLAGS)
AC_SUBST(CELT051_LIBS)
AC_SUBST(CELT051_LIBDIR)
--SPICE_REQUIRES+=" celt051 >= 0.5.1.1"
-+SPICE_REQUIRES="$SPICE_REQUIRES celt051 >= 0.5.1.1"
+-SPICE_GLIB_REQUIRES+=" celt051 >= 0.5.1.1"
++SPICE_GLIB_REQUIRES="$SPICE_GLIB_REQUIRES celt051 >= 0.5.1.1"
PKG_CHECK_MODULES(SSL, openssl)
AC_SUBST(SSL_CFLAGS)
AC_SUBST(SSL_LIBS)
--SPICE_REQUIRES+=" openssl"
-+SPICE_REQUIRES="$SPICE_REQUIRES openssl"
+-SPICE_GLIB_REQUIRES+=" openssl"
++SPICE_GLIB_REQUIRES="$SPICE_GLIB_REQUIRES openssl"
dnl Cyrus SASL
AC_ARG_WITH([sasl],
+@@ -164,7 +164,7 @@
+ PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+-SPICE_GTK_REQUIRES+=" gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
++SPICE_GTK_REQUIRES="$SPICE_GTK_REQUIRES gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
+
+ PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [have_x11=yes], [have_x11=no])
+ AS_IF([test "x$have_x11" = "xyes"], [AC_DEFINE([HAVE_X11], 1, [Have x11?])])
================================================================
Index: packages/spice-gtk/spice-gtk.spec
diff -u packages/spice-gtk/spice-gtk.spec:1.1 packages/spice-gtk/spice-gtk.spec:1.2
--- packages/spice-gtk/spice-gtk.spec:1.1 Tue Jul 19 20:44:07 2011
+++ packages/spice-gtk/spice-gtk.spec Thu Jul 21 21:38:14 2011
@@ -1,17 +1,14 @@
# $Revision$, $Date$
-# TODO: build for gtk+3 or both? (spice-glib-*, spice-gtk-2-*, spice-gtk-3-* in such case?)
-# NOTE: python requires gtk-2 version
Summary: A GTK+ client and libraries for SPICE remote desktop servers
Summary(pl.UTF-8): Klient i biblioteki GTK+ dla serwerów zdalnych pulpitów SPICE
Name: spice-gtk
-Version: 0.6
+Version: 0.7
Release: 1
License: LGPL v2.1+
Group: X11/Applications
Source0: http://spice-space.org/download/gtk/%{name}-%{version}.tar.bz2
-# Source0-md5: fe4b31a4e7b20ec53ff58d53957ab0b1
+# Source0-md5: a47ca51ef4bb27cab35ddbfb9e6c0fff
Patch0: %{name}-sh.patch
-Patch1: %{name}-proto.patch
URL: http://spice-space.org/
BuildRequires: autoconf >= 2.57
BuildRequires: automake
@@ -23,8 +20,9 @@
BuildRequires: glib2-devel >= 1:2.22
BuildRequires: gtk-doc >= 1.14
BuildRequires: gtk+2-devel >= 2:2.18.0
-#BuildRequires: gtk+3-devel >= 3.0
+BuildRequires: gtk+3-devel >= 3.0
BuildRequires: intltool >= 0.40.0
+BuildRequires: libcacard-devel >= 0.1.2
BuildRequires: libjpeg-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:2.0
@@ -36,12 +34,11 @@
BuildRequires: pulseaudio-devel
BuildRequires: python-devel >= 2.0
BuildRequires: python-pygtk-devel >= 2:2.0.0
-BuildRequires: spice-protocol >= 0.6.3
+BuildRequires: spice-protocol >= 0.8.1
BuildRequires: xorg-lib-libXrandr-devel
BuildRequires: zlib-devel
-Requires: celt051 >= 0.5.1.1
-Requires: glib2 >= 1:2.22
-Requires: pixman >= 0.17.7
+Requires: libcacard >= 0.1.2
+Requires: spice-glib = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -51,50 +48,127 @@
Klient i biblioteki GTK+ dla serwerów zdalnych pulpitów SPICE.
%package devel
-Summary: Header files for SPICE client libraries
-Summary(pl.UTF-8): Pliki nagłówkowe bibliotek klienckich SPICE
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: celt051-devel >= 0.5.1.1
-Requires: glib2-devel >= 1:2.22
-Requires: openssl-devel
-Requires: pixman-devel >= 0.17.7
-Requires: spice-protocol >= 0.6.3
+Summary: Header files for SPICE GTK 3.0 client library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki klienckiej SPICE GTK 3.0
+Group: X11/Development/Libraries
+Requires: spice-glib-devel = %{version}-%{release}
+Requires: gtk+3-devel >= 3.0
%description devel
-Header files for SPICE client libraries.
+Header files for SPICE GTK 3.0 client library.
%description devel -l pl.UTF-8
-Pliki nagłówkowe bibliotek klienckich SPICE.
+Pliki nagłówkowe biblioteki klienckiej SPICE GTK 3.0.
%package static
-Summary: Static SPICE client libraries
-Summary(pl.UTF-8): Statyczne biblioteki klienckie SPICE
-Group: Development/Libraries
+Summary: Static SPICE GTK 3.0 client library
+Summary(pl.UTF-8): Statyczna biblioteka kliencka SPICE GTK 3.0
+Group: X11/Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
-Static SPICE client libraries.
+Static SPICE GTK 3.0 client library.
%description static -l pl.UTF-8
-Statyczne biblioteki klienckie SPICE.
+Statyczna biblioteka kliencka SPICE GTK 3.0.
%package apidocs
Summary: SPICE GTK API documentation
-Summary(pl.UTF-8): Dokumentacja API biblioteki SPICE GTK
+Summary(pl.UTF-8): Dokumentacja API bibliotek SPICE GTK
Group: Documentation
%description apidocs
-API documentation for SPICE GTK library.
+API documentation for SPICE GTK libraries.
%description apidocs -l pl.UTF-8
-Dokumentacja API biblioteki SPICE GTK.
+Dokumentacja API bibliotek SPICE GTK.
+
+%package -n spice-glib
+Summary: SPICE Client GLib library
+Summary(pl.UTF-8): Biblioteka kliencka SPICE GLib
+Group: Libraries
+Requires: celt051 >= 0.5.1.1
+Requires: glib2 >= 1:2.22
+Requires: pixman >= 0.17.7
+
+%description -n spice-glib
+SPICE Client GLib library.
+
+%description -n spice-glib -l pl.UTF-8
+Biblioteka kliencka SPICE GLib.
+
+%package -n spice-glib-devel
+Summary: Header files for SPICE Client GLib library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki klienckiej SPICE GLib
+Group: Development/Libraries
+Requires: celt051-devel >= 0.5.1.1
+Requires: glib2-devel >= 1:2.22
+Requires: openssl-devel
+Requires: pixman-devel >= 0.17.7
+Requires: spice-glib = %{version}-%{release}
+Requires: spice-protocol >= 0.8.1
+
+%description -n spice-glib-devel
+Header files for SPICE Client GLib library.
+
+%description -n spice-glib-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki klienckiej SPICE GLib.
+
+%package -n spice-glib-static
+Summary: SPICE Client GLib static library
+Summary(pl.UTF-8): Statyczna biblioteka kliencka SPICE GLib
+Group: Development/Libraries
+Requires: spice-glib-devel = %{version}-%{release}
+
+%description -n spice-glib-static
+SPICE Client GLib static library.
+
+%description -n spice-glib-static -l pl.UTF-8
+Statyczna biblioteka kliencka SPICE GLib.
+
+%package -n spice-gtk2
+Summary: SPICE Client GTK 2.0 library
+Summary(pl.UTF-8): Biblioteka kliencka SPICE GTK 2.0
+Group: X11/Libraries
+Requires: gtk+2 >= 2:2.18.0
+Requires: spice-glib = %{version}-%{release}
+
+%description -n spice-gtk2
+SPICE Client GTK 2.0 library.
+
+%description -n spice-gtk2 -l pl.UTF-8
+Biblioteka kliencka SPICE GTK 2.0.
+
+%package -n spice-gtk2-devel
+Summary: Header files for SPICE Client GTK 2.0 library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki klienckiej SPICE GTK 2.0
+Group: X11/Development/Libraries
+Requires: gtk+2-devel >= 2:2.18.0
+Requires: spice-glib-devel = %{version}-%{release}
+
+%description -n spice-gtk2-devel
+Header files for SPICE Client GTK 2.0 library.
+
+%description -n spice-gtk2-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki klienckiej SPICE GTK 2.0.
+
+%package -n spice-gtk2-static
+Summary: SPICE Client GTK 2.0 static library
+Summary(pl.UTF-8): Statyczna biblioteka kliencka SPICE GTK 2.0
+Group: X11/Development/Libraries
+Requires: spice-gtk2-devel = %{version}-%{release}
+
+%description -n spice-gtk2-static
+SPICE Client GTK 2.0 static library.
+
+%description -n spice-gtk2-static -l pl.UTF-8
+Statyczna biblioteka kliencka SPICE GTK 2.0.
%package -n python-spice-gtk
Summary: Python interface to SPICE client GTK library
Summary(pl.UTF-8): Pythonowy interfejs do biblioteki klienckiej SPICE GTK
Group: Libraries/Python
-Requires: %{name} = %{version}-%{release}
+Requires: spice-gtk2 = %{version}-%{release}
%description -n python-spice-gtk
Python interface to SPICE client GTK library.
@@ -102,23 +176,24 @@
%description -n python-spice-gtk -l pl.UTF-8
Pythonowy interfejs do biblioteki klienckiej SPICE GTK.
-%package -n vala-spice-gtk
-Summary: Vala API for SPICE client GTK library
-Summary(pl.UTF-8): Interfejs języka Vala do biblioteki klienckiej SPICE GTK
+%package -n vala-spice-protocol
+Summary: Vala API for SPICE client library
+Summary(pl.UTF-8): Interfejs języka Vala do biblioteki klienckiej SPICE
Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: spice-protocol >= 0.8.1
Requires: vala >= 0.11.7
-%description -n vala-spice-gtk
-Vala API for SPICE client GTK library.
+%description -n vala-spice-protocol
+Vala API for SPICE client library.
-%description -n vala-spice-gtk -l pl.UTF-8
-Interfejs języka Vala do biblioteki klienckiej SPICE GTK.
+%description -n vala-spice-protocol -l pl.UTF-8
+Interfejs języka Vala do biblioteki klienckiej SPICE.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+
+mkdir gtk{2,3}
%build
%{__gettextize}
@@ -128,15 +203,29 @@
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure \
+
+cd gtk2
+../%configure \
--disable-silent-rules \
+ --with-gtk=2.0 \
+ --with-html-dir=%{_gtkdocdir}
+%{__make}
+
+cd ../gtk3
+../%configure \
+ --disable-silent-rules \
+ --with-gtk=3.0 \
--with-html-dir=%{_gtkdocdir}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+# gtk2 first, so executables will use gtk3 libs
+%{__make} -C gtk2 install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%{__make} -C gtk3 install \
DESTDIR=$RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/SpiceClientGtk.{la,a}
@@ -151,49 +240,82 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%post -n spice-glib -p /sbin/ldconfig
+%postun -n spice-glib -p /sbin/ldconfig
+
+%post -n spice-gtk2 -p /sbin/ldconfig
+%postun -n spice-gtk2 -p /sbin/ldconfig
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS NEWS README THANKS TODO
%attr(755,root,root) %{_bindir}/snappy
%attr(755,root,root) %{_bindir}/spicy
+%attr(755,root,root) %{_bindir}/spicy-stats
+%attr(755,root,root) %{_libdir}/libspice-client-gtk-3.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libspice-client-gtk-3.0.so.1
+%{_libdir}/girepository-1.0/SpiceClientGtk-3.0.typelib
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libspice-client-gtk-3.0.so
+%{_includedir}/spice-client-gtk-3.0
+%{_pkgconfigdir}/spice-client-gtk-3.0.pc
+%{_datadir}/gir-1.0/SpiceClientGtk-3.0.gir
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libspice-client-gtk-3.0.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/spice-gtk
+
+%files -n spice-glib
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libspice-client-glib-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libspice-client-glib-2.0.so.3
-%attr(755,root,root) %{_libdir}/libspice-client-gtk-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libspice-client-gtk-2.0.so.1
+%attr(755,root,root) %ghost %{_libdir}/libspice-client-glib-2.0.so.4
%attr(755,root,root) %{_libdir}/libspice-controller.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libspice-controller.so.0
%{_libdir}/girepository-1.0/SpiceClientGLib-2.0.typelib
-%{_libdir}/girepository-1.0/SpiceClientGtk-2.0.typelib
-%files devel
+%files -n spice-glib-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libspice-client-glib-2.0.so
-%attr(755,root,root) %{_libdir}/libspice-client-gtk-2.0.so
%attr(755,root,root) %{_libdir}/libspice-controller.so
%{_includedir}/spice-client-glib-2.0
-%{_includedir}/spice-client-gtk-2.0
%{_includedir}/spice-controller
%{_pkgconfigdir}/spice-client-glib-2.0.pc
-%{_pkgconfigdir}/spice-client-gtk-2.0.pc
%{_pkgconfigdir}/spice-controller.pc
%{_datadir}/gir-1.0/SpiceClientGLib-2.0.gir
-%{_datadir}/gir-1.0/SpiceClientGtk-2.0.gir
-%files static
+%files -n spice-glib-static
%defattr(644,root,root,755)
%{_libdir}/libspice-client-glib-2.0.a
-%{_libdir}/libspice-client-gtk-2.0.a
%{_libdir}/libspice-controller.a
-%files apidocs
+%files -n spice-gtk2
%defattr(644,root,root,755)
-%{_gtkdocdir}/spice-gtk
+%attr(755,root,root) %{_libdir}/libspice-client-gtk-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libspice-client-gtk-2.0.so.1
+%{_libdir}/girepository-1.0/SpiceClientGtk-2.0.typelib
+
+%files -n spice-gtk2-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libspice-client-gtk-2.0.so
+%{_includedir}/spice-client-gtk-2.0
+%{_pkgconfigdir}/spice-client-gtk-2.0.pc
+%{_datadir}/gir-1.0/SpiceClientGtk-2.0.gir
+
+%files -n spice-gtk2-static
+%defattr(644,root,root,755)
+%{_libdir}/libspice-client-gtk-2.0.a
%files -n python-spice-gtk
%defattr(644,root,root,755)
%attr(755,root,root) %{py_sitedir}/SpiceClientGtk.so
-%files -n vala-spice-gtk
+%files -n vala-spice-protocol
%defattr(644,root,root,755)
%{_datadir}/vala/vapi/spice-protocol.vapi
@@ -203,6 +325,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2011/07/21 19:38:14 qboosh
+- updated to 0.7
+- removed obsolete proto patch (use spice-protocol 0.8.1 instead)
+- build both gtk-2.0/gtk-3.0 libs; python requires gtk-2.0
+
Revision 1.1 2011/07/19 18:44:07 qboosh
- initial
- sh patch to build with sh not being bash
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice-gtk/spice-gtk-sh.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice-gtk/spice-gtk.spec?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list