rpms/gtk-vnc/devel .cvsignore, 1.11, 1.12 gtk-vnc.spec, 1.39, 1.40 sources, 1.14, 1.15 gtk-vnc-0.3.10-bounds.patch, 1.1, NONE gtk-vnc-0.3.10-gcrypt-threading.patch, 1.1, NONE

Sun Jul 11 21:10:33 UTC 2010

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20928

Modified Files:
	.cvsignore gtk-vnc.spec sources 
Removed Files:
	gtk-vnc-0.3.10-bounds.patch 
	gtk-vnc-0.3.10-gcrypt-threading.patch 
Log Message:
Update to 0.4.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12

--- .cvsignore	11 Aug 2009 13:49:34 -0000	1.11
+++ .cvsignore	11 Jul 2010 21:10:33 -0000	1.12
@@ -1,3 +1,3 @@
 .build*.log
 *.rpm
-gtk-vnc-0.3.9.tar.bz2
+gtk-vnc-0.4.0.tar.bz2


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gtk-vnc.spec	27 Apr 2010 11:45:39 -0000	1.39
+++ gtk-vnc.spec	11 Jul 2010 21:10:33 -0000	1.40
@@ -4,20 +4,33 @@
 # a security audit at very least
 %define with_plugin 0
 
+%define with_gir 0
+
+%if 0%{fedora} >= 12
+%define with_gir 1
+%endif
+
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.3.10
-Release: 3%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
-Patch1: %{name}-%{version}-gcrypt-threading.patch
-Patch2: %{name}-%{version}-bounds.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://live.gnome.org/gtk-vnc
-BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
-BuildRequires: gnutls-devel cyrus-sasl-devel
-BuildRequires: intltool
+BuildRequires: gtk2-devel >= 2.14
+BuildRequires: pygtk2-devel python-devel zlib-devel
+BuildRequires: gnutls-devel cyrus-sasl-devel intltool
+%if %{with_gir}
+# Temp hack for missing dep
+# https://bugzilla.redhat.com/show_bug.cgi?id=613466
+BuildRequires: libtool
+BuildRequires: gobject-introspection-devel
+%if 0%{?fedora} < 14
+BuildRequires: gir-repository-devel
+%endif
+%endif
 %if %{with_plugin}
 %if 0%{?fedora} > 8
 BuildRequires: xulrunner-devel
@@ -33,7 +46,7 @@ allowing it to be completely asynchronou
 %package devel
 Summary: Libraries, includes, etc. to compile with the gtk-vnc library
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: gtk2-devel gnutls-devel
 
@@ -68,18 +81,54 @@ This package provides a web browser plug
 browsers.
 %endif
 
+%package -n gvnc
+Summary: A GObject for VNC connections
+
+%description -n gvnc
+gvnc is a GObject for managing a VNC connection. It provides all the
+infrastructure required to build a VNC client without having to deal
+with the raw protocol itself.
+
+%package -n gvnc-devel
+Summary: Libraries, includes, etc. to compile with the gvnc library
+Group: Development/Libraries
+Requires: gvnc = %{version}-%{release}
+Requires: pkgconfig
+
+%description -n gvnc-devel
+gvnc is a GObject for managing a VNC connection. It provides all the
+infrastructure required to build a VNC client without having to deal
+with the raw protocol itself.
+
+Libraries, includes, etc. to compile with the gvnc library
+
+%package -n gvnc-tools
+Summary: Command line VNC tools
+Group: Applications/Internet
+
+%description -n gvnc-tools
+Provides useful command line utilities for interacting with
+VNC servers. Includes the gvnccapture program for capturing
+screenshots of a VNC desktop
+
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
+%if %{with_gir}
+%define gir_arg --enable-introspection=yes
+%else
+%define gir_arg --enable-introspection=no
+%endif
+
 %if %{with_plugin}
-%configure --enable-plugin=yes
+%define plugin_arg --enable-plugin=yes
 %else
-%configure
+%define plugin_arg --enable-plugin=no
 %endif
-%__make %{?_smp_mflags}
+
+%configure %{plugin_arg} %{gir_arg}
+%__make %{?_smp_mflags} V=1
 
 %install
 rm -fr %{buildroot}
@@ -92,8 +141,7 @@ rm -f %{buildroot}%{_libdir}/python*/sit
 rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.a
 rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la
 %endif
-
-%find_lang gtk-vnc
+%find_lang %{name}
 
 %clean
 rm -fr %{buildroot}
@@ -102,18 +150,27 @@ rm -fr %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files -f gtk-vnc.lang
+%files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog NEWS README COPYING.LIB
-%{_libdir}/lib*.so.*
+%doc AUTHORS ChangeLog ChangeLog-old NEWS README COPYING.LIB
+%{_libdir}/libgtk-vnc-1.0.so.*
+%if %{with_gir}
+%{_libdir}/girepository-1.0/GtkVnc-1.0.typelib
+%endif
 
 %files devel
 %defattr(-, root, root)
 %doc examples/gvncviewer.c
-%{_libdir}/lib*.so
+%if %{with_gir}
+%doc examples/gvncviewer.js
+%endif
+%{_libdir}/libgtk-vnc-1.0.so
 %dir %{_includedir}/%{name}-1.0/
 %{_includedir}/%{name}-1.0/*.h
 %{_libdir}/pkgconfig/%{name}-1.0.pc
+%if %{with_gir}
+%{_datadir}/gir-1.0/GtkVnc-1.0.gir
+%endif
 
 %files python
 %defattr(-, root, root)
@@ -126,7 +183,34 @@ rm -fr %{buildroot}
 %{_libdir}/mozilla/plugins/%{name}-plugin.so
 %endif
 
+%files -n gvnc
+%defattr(-, root, root)
+%{_libdir}/libgvnc-1.0.so.*
+%if %{with_gir}
+%{_libdir}/girepository-1.0/GVnc-1.0.typelib
+%endif
+
+%files -n gvnc-devel
+%defattr(-, root, root)
+%{_libdir}/libgvnc-1.0.so
+%dir %{_includedir}/gvnc-1.0/
+%{_includedir}/gvnc-1.0/*.h
+%{_libdir}/pkgconfig/gvnc-1.0.pc
+%if %{with_gir}
+%{_datadir}/gir-1.0/GVnc-1.0.gir
+%endif
+
+%files -n gvnc-tools
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog NEWS README COPYING.LIB
+%{_bindir}/gvnccapture
+%{_mandir}/man1/gvnccapture.1*
+
 %changelog
+* Sun Jul 11 2010 Daniel P. Berrange <berrange at redhat.com> - 0.4.0-1
+- Update to 0.4.0 release
+- Add new sub-packages for gvnc
+
 * Tue Apr 27 2010 Daniel P. Berrange <berrange at redhat.com> - 0.3.10-3
 - Drop VNC connection if the server sends a update spaning outside bounds of desktop (rhbz #540810)
 - Fix gcrypt threading initialization (rhbz #537489)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Nov 2009 04:31:00 -0000	1.14
+++ sources	11 Jul 2010 21:10:33 -0000	1.15
@@ -1 +1 @@
-9aa9d830b219255c8d6753ef55802932  gtk-vnc-0.3.10.tar.bz2
+f38ce99af9080637c915b1b608155ba3  gtk-vnc-0.4.0.tar.bz2


--- gtk-vnc-0.3.10-bounds.patch DELETED ---


--- gtk-vnc-0.3.10-gcrypt-threading.patch DELETED ---

