packages: gtk-vnc/gtk-vnc.spec, gtk-vnc/gtk-vnc-libtool.patch (NEW) - updat...
qboosh
qboosh at pld-linux.org
Sun Nov 13 16:00:25 CET 2011
Author: qboosh Date: Sun Nov 13 15:00:25 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 0.4.4
- added libtool patch (use the same libtool for compiling/linking and g-i-r operations)
---- Files affected:
packages/gtk-vnc:
gtk-vnc.spec (1.31 -> 1.32) , gtk-vnc-libtool.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gtk-vnc/gtk-vnc.spec
diff -u packages/gtk-vnc/gtk-vnc.spec:1.31 packages/gtk-vnc/gtk-vnc.spec:1.32
--- packages/gtk-vnc/gtk-vnc.spec:1.31 Fri Sep 9 21:11:24 2011
+++ packages/gtk-vnc/gtk-vnc.spec Sun Nov 13 16:00:20 2011
@@ -1,14 +1,19 @@
# $Revision$, $Date$
-Summary: A GTK+ widget for VNC clients
-Summary(pl.UTF-8): Widget GTK+ dla klientów VNC
+#
+# Conditional build:
+%bcond_without vala # Vala API
+#
+Summary: A GTK+ widget for VNC clients (GTK+ 2.x version)
+Summary(pl.UTF-8): Widget GTK+ dla klientów VNC (wersja dla GTK+ 2.x)
Name: gtk-vnc
-Version: 0.4.3
-Release: 6
-License: LGPL v2
+Version: 0.4.4
+Release: 1
+License: LGPL v2+
Group: X11/Libraries
Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc/0.4/%{name}-%{version}.tar.bz2
-# Source0-md5: 38d3fbacb5d00e630f939e88858206f1
+# Source0-md5: 0c51bcbdf1530c4856f49ace7c8f709a
Patch0: %{name}-codegen.patch
+Patch1: %{name}-libtool.patch
URL: http://live.gnome.org/gtk-vnc
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.10
@@ -23,7 +28,8 @@
BuildRequires: gtk+2-devel >= 2:2.18.0
BuildRequires: gtk+3-devel >= 3.0.0
BuildRequires: intltool >= 0.40.0
-BuildRequires: libtool >= 2.2.6
+BuildRequires: libgcrypt-devel
+BuildRequires: libtool >= 2:2.2.6
BuildRequires: libview-devel >= 0.6.0
BuildRequires: perl-Text-CSV
BuildRequires: perl-tools-pod
@@ -31,9 +37,12 @@
BuildRequires: python-devel >= 1:2.4
BuildRequires: python-pygtk-devel >= 2:2.0.0
BuildRequires: rpm-pythonprov
+%{?with_vala:BuildRequires: vala}
BuildRequires: xorg-lib-libX11-devel
BuildRequires: zlib-devel
Requires: libgvnc = %{version}-%{release}
+Requires: cairo >= 1.2.0
+Requires: gtk+2 >= 2:2.18.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -41,87 +50,131 @@
allowing it to be completely asynchronous while remaining single
threaded.
+This package contains version for GTK+ 2.x.
+
%description -l pl.UTF-8
gtk-vnc to widget przeglądarki VNC dla GTK+. Jest skonstruowany z
użyciem korutyn, dzięki czemu mogą być w pełni asynchroniczne
pozostając jednowątkowymi.
+Ten pakiet zawiera wersję dla GTK+ 2.x.
+
%package devel
-Summary: Header files for gtk-vnc library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki gtk-vnc
+Summary: Header files for gtk-vnc library (GTK+ 2.x version)
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki gtk-vnc (wersja dla GTK+ 2.x)
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: libgvnc-devel = %{version}-%{release}
+Requires: cairo-devel >= 1.2.0
Requires: gnutls-devel >= 1.4.0
Requires: gtk+2-devel >= 2:2.18.0
-Requires: libgvnc-devel = %{version}-%{release}
+Requires: xorg-lib-libX11-devel
%description devel
-Header files for gtk-vnc library.
+Header files for gtk-vnc library (GTK+ 2.x version).
%description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki gtk-vnc.
+Pliki nagłówkowe biblioteki gtk-vnc (wersja dla GTK+ 2.x).
%package static
-Summary: Static gtk-vnc library
-Summary(pl.UTF-8): Statyczna biblioteka gtk-vnc
+Summary: Static gtk-vnc library (GTK+ 2.x version)
+Summary(pl.UTF-8): Statyczna biblioteka gtk-vnc (wersja dla GTK+ 2.x)
Group: X11/Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: libgvnc-static = %{version}-%{release}
%description static
-Static gtk-vnc library.
+Static gtk-vnc library (GTK+ 2.x version).
%description static -l pl.UTF-8
-Statyczna biblioteka gtk-vnc.
+Statyczna biblioteka gtk-vnc (wersja dla GTK+ 2.x).
+
+%package -n python-gtk-vnc
+Summary: Python bindings for the gtk-vnc library (GTK+ 2.x version)
+Summary(pl.UTF-8): Wiązania Pythona do biblioteki gtk-vnc (wersja dla GTK+ 2.x)
+Group: Libraries/Python
+Requires: %{name} = %{version}-%{release}
+%requires_eq python-libs
+
+%description -n python-gtk-vnc
+A module allowing use of the GTK+ VNC widget (GTK+ 2.x version) from
+Python.
+
+%description -n python-gtk-vnc -l pl.UTF-8
+Moduł pozwalający na używanie widgetu GTK+ VNC (w wersji dla GTK+ 2.x)
+z poziomu Pythona.
%package -n gtk3-vnc
-Summary: A GTK+ widget for VNC clients
+Summary: A GTK+ widget for VNC clients (GTK+ 3.x version)
Summary(pl.UTF-8): Widget GTK+ dla klientów VNC
Group: X11/Libraries
Requires: libgvnc = %{version}-%{release}
+Requires: cairo >= 1.2.0
+Requires: gtk+3 >= 3.0.0
%description -n gtk3-vnc
-gtk-vnc is a VNC viewer widget for GTK+ 3.x. It is built using
-coroutines allowing it to be completely asynchronous while remaining
-single threaded.
+gtk-vnc is a VNC viewer widget for GTK+. It is built using coroutines
+allowing it to be completely asynchronous while remaining single
+threaded.
+
+This package contains version for GTK+ 3.x.
%description -n gtk3-vnc -l pl.UTF-8
-gtk-vnc to widget przeglądarki VNC dla GTK+ 3.x. Jest skonstruowany z
+gtk-vnc to widget przeglądarki VNC dla GTK+. Jest skonstruowany z
użyciem korutyn, dzięki czemu mogą być w pełni asynchroniczne
pozostając jednowątkowymi.
+Ten pakiet zawiera wersję dla GTK+ 3.x.
+
%package -n gtk3-vnc-devel
-Summary: Header files for gtk-vnc library - GTK+ 3.x version
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki gtk-vnc - wersja dla GTK+ 3.x
+Summary: Header files for gtk-vnc library (GTK+ 3.x version)
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki gtk-vnc (wersja dla GTK+ 3.x)
Group: X11/Development/Libraries
-Requires: gnutls-devel >= 1.4.0
+Requires: cairo-devel >= 1.2.0
Requires: gtk+3-devel >= 3.0.0
Requires: gtk3-vnc = %{version}-%{release}
Requires: libgvnc-devel = %{version}-%{release}
+Requires: xorg-lib-libX11-devel
%description -n gtk3-vnc-devel
-Header files for gtk-vnc library - GTK+ 3.x version.
+Header files for gtk-vnc library (GTK+ 3.x version).
%description -n gtk3-vnc-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki gtk-vnc - wersja dla GTK+ 3.x.
+Pliki nagłówkowe biblioteki gtk-vnc (wersja dla GTK+ 3.x).
%package -n gtk3-vnc-static
-Summary: Static gtk-vnc library - GTK+ 3.x version
-Summary(pl.UTF-8): Statyczna biblioteka gtk-vnc - wersja dla GTK+ 3.x
+Summary: Static gtk-vnc library (GTK+ 3.x version)
+Summary(pl.UTF-8): Statyczna biblioteka gtk-vnc (wersja dla GTK+ 3.x)
Group: X11/Development/Libraries
Requires: gtk3-vnc-devel = %{version}-%{release}
Requires: libgvnc-static = %{version}-%{release}
%description -n gtk3-vnc-static
-Static gtk-vnc library - GTK+ 3.x version.
+Static gtk-vnc library (GTK+ 3.x version).
%description -n gtk3-vnc-static -l pl.UTF-8
-Statyczna biblioteka gtk-vnc - wersja dla GTK+ 3.x.
+Statyczna biblioteka gtk-vnc (wersja dla GTK+ 3.x).
+
+%package -n vala-gtk3-vnc
+Summary: Vala API for gtk-vnc library (GTK+ 3.x version)
+Summary(pl.UTF-8): API języka Vala dla biblioteki gtk-vnc (wersja dla GTK+3)
+Group: Development/Languages
+Requires: gtk3-vnc-devel = %{version}-%{release}
+Requires: vala-libgvnc = %{version}-%{release}
+
+%description -n vala-gtk3-vnc
+Vala API for gtk-vnc library (GTK+ 3.x version).
+
+%description -n vala-gtk3-vnc -l pl.UTF-8
+API języka Vala dla biblioteki gtk-vnc (wersja dla GTK+3).
%package -n libgvnc
Summary: A library for VNC clients
Summary(pl.UTF-8): Biblioteka dla klientów VNC
Group: X11/Libraries
+Requires: glib2 >= 1:2.28.0
+Requires: gdk-pixbuf2 >= 2.10.0
+Requires: gnutls >= 1.4.0
%description -n libgvnc
A library for VNC clients.
@@ -134,6 +187,12 @@
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libgvnc
Group: X11/Development/Libraries
Requires: libgvnc = %{version}-%{release}
+Requires: cyrus-sasl-devel
+Requires: glib2-devel >= 1:2.28.0
+Requires: gdk-pixbuf2-devel >= 2.10.0
+Requires: gnutls-devel >= 1.4.0
+Requires: libgcrypt-devel
+Requires: zlib-devel
%description -n libgvnc-devel
Header files for libgvnc library.
@@ -153,18 +212,18 @@
%description -n libgvnc-static -l pl.UTF-8
Statyczna biblioteka libgvnc.
-%package -n python-gtk-vnc
-Summary: Python bindings for the gtk-vnc library
-Summary(pl.UTF-8): Wiązania Pythona do biblioteki gtk-vnc
-Group: Libraries/Python
-Requires: %{name} = %{version}-%{release}
-%requires_eq python-libs
+%package -n vala-libgvnc
+Summary: Vala API for libgvnc library
+Summary(pl.UTF-8): API języka Vala dla biblioteki libgvnc
+Group: Development/Languages
+Requires: libgvnc-devel = %{version}-%{release}
+Requires: vala
-%description -n python-gtk-vnc
-A module allowing use of the GTK+ VNC widget from Python.
+%description -n vala-libgvnc
+Vala API for libgvnc library.
-%description -n python-gtk-vnc -l pl.UTF-8
-Moduł pozwalający na używanie widgetu GTK+ VNC z poziomu Pythona.
+%description -n vala-libgvnc -l pl.UTF-8
+API języka Vala dla biblioteki libgvnc.
%package tools
Summary: Command line tools for VNC
@@ -181,6 +240,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -206,20 +266,17 @@
--without-libview \
--enable-static \
--disable-plugin \
- --disable-silent-rules
+ --disable-silent-rules \
+ %{!?with_vala:--disable-vala}
%{__make}
-cd ..
%install
rm -rf $RPM_BUILD_ROOT
-cd gtk2
-%{__make} -j1 install \
+%{__make} -C gtk2 -j1 install \
DESTDIR=$RPM_BUILD_ROOT
-cd ../gtk3
-%{__make} -j1 install \
+%{__make} -C gtk3 -j1 install \
DESTDIR=$RPM_BUILD_ROOT
-cd ..
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
$RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version}
@@ -238,11 +295,11 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%post -n gtk3-vnc -p /sbin/ldconfig
-%postun -n gtk3-vnc -p /sbin/ldconfig
+%post -n gtk3-vnc -p /sbin/ldconfig
+%postun -n gtk3-vnc -p /sbin/ldconfig
-%post -n libgvnc -p /sbin/ldconfig
-%postun -n libgvnc -p /sbin/ldconfig
+%post -n libgvnc -p /sbin/ldconfig
+%postun -n libgvnc -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
@@ -262,6 +319,11 @@
%defattr(644,root,root,755)
%{_libdir}/libgtk-vnc-1.0.a
+%files -n python-gtk-vnc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py_sitedir}/gtkvnc.so
+%{_examplesdir}/python-%{name}-%{version}
+
%files -n gtk3-vnc
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libgtk-vnc-2.0.so.*.*.*
@@ -279,6 +341,13 @@
%defattr(644,root,root,755)
%{_libdir}/libgtk-vnc-2.0.a
+%if %{with vala}
+%files -n vala-gtk3-vnc
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/gtk-vnc-2.0.deps
+%{_datadir}/vala/vapi/gtk-vnc-2.0.vapi
+%endif
+
%files -n libgvnc -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
@@ -297,10 +366,11 @@
%defattr(644,root,root,755)
%{_libdir}/libgvnc-1.0.a
-%files -n python-gtk-vnc
+%if %{with vala}
+%files -n vala-libgvnc
%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/gtkvnc.so
-%{_examplesdir}/python-%{name}-%{version}
+%{_datadir}/vala/vapi/gvnc-1.0.vapi
+%endif
%files tools
%defattr(644,root,root,755)
@@ -313,6 +383,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2011/11/13 15:00:20 qboosh
+- updated to 0.4.4
+- added libtool patch (use the same libtool for compiling/linking and g-i-r operations)
+
Revision 1.31 2011/09/09 19:11:24 arekm
- release 6
================================================================
Index: packages/gtk-vnc/gtk-vnc-libtool.patch
diff -u /dev/null packages/gtk-vnc/gtk-vnc-libtool.patch:1.1
--- /dev/null Sun Nov 13 16:00:25 2011
+++ packages/gtk-vnc/gtk-vnc-libtool.patch Sun Nov 13 16:00:20 2011
@@ -0,0 +1,18 @@
+--- gtk-vnc-0.4.4/src/Makefile.am.orig 2011-11-13 14:03:14.231161724 +0100
++++ gtk-vnc-0.4.4/src/Makefile.am 2011-11-13 14:30:58.397884111 +0100
+@@ -318,6 +318,7 @@
+ --include GObject-2.0 \
+ $(PREFIX_ARGS) \
+ --library=$(builddir)/libgvnc-1.0.la \
++ --libtool="$(LIBTOOL)" \
+ --add-include-path=$(top_srcdir) \
+ --add-include-path=$(srcdir) \
+ --add-include-path=$(builddir) \
+@@ -339,6 +339,7 @@
+ --include GVnc-1.0 \
+ $(PREFIX_ARGS) \
+ --library=$(builddir)/libgtk-vnc-$(GTK_VNC_API_VERSION).la \
++ --libtool="$(LIBTOOL)" \
+ --add-include-path=$(top_srcdir) \
+ --add-include-path=$(srcdir) \
+ --add-include-path=$(builddir) \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk-vnc/gtk-vnc.spec?r1=1.31&r2=1.32&f=u
More information about the pld-cvs-commit
mailing list