From 8d0f47644e0e9c9de86eb462ee7515d1531fc02d Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Jun 14 2011 14:10:25 +0000 Subject: Update to 3.1.2 Removed -devel package --- diff --git a/.gitignore b/.gitignore index 0c2ad85..4e99cf8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ vinagre-2.31.4.tar.bz2 /vinagre-3.0.0.tar.bz2 /vinagre-3.0.1.tar.bz2 /vinagre-3.1.1.tar.bz2 +/vinagre-3.1.2.tar.xz diff --git a/sources b/sources index 200ff29..5eaad97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0bdafadc8090e21b59103bbc0fa4f823 vinagre-3.1.1.tar.bz2 +8d00b785ae434f5ab178e82e440be625 vinagre-3.1.2.tar.xz diff --git a/vinagre-3.1.2-spice-plugin.patch b/vinagre-3.1.2-spice-plugin.patch new file mode 100644 index 0000000..e79225a --- /dev/null +++ b/vinagre-3.1.2-spice-plugin.patch @@ -0,0 +1,25 @@ +From 06e7e7e7209d4446f2596e7ab2ffa76206ac00b4 Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek +Date: Tue, 14 Jun 2011 15:51:08 +0200 +Subject: [PATCH] Fix compilation of Spice plugin + +--- + plugins/spice/vinagre-spice-plugin.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/plugins/spice/vinagre-spice-plugin.c b/plugins/spice/vinagre-spice-plugin.c +index b4d8a99..f08dac0 100644 +--- a/plugins/spice/vinagre-spice-plugin.c ++++ b/plugins/spice/vinagre-spice-plugin.c +@@ -349,7 +349,7 @@ vinagre_spice_plugin_class_init (VinagreSpicePluginClass *klass) + } + + __attribute__((constructor)) void +-spice_register_types (PeasObjectModule *module) ++spice_register_types (void) + { + g_type_init (); + volatile dontoptimiseaway = vinagre_spice_plugin_get_type (); +-- +1.7.5.4 + diff --git a/vinagre-libs.patch b/vinagre-libs.patch deleted file mode 100644 index 22425c4..0000000 --- a/vinagre-libs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up vinagre-2.30.1/vinagre/Makefile.am.libs vinagre-2.30.1/vinagre/Makefile.am ---- vinagre-2.30.1/vinagre/Makefile.am.libs 2010-06-19 22:21:01.962179448 -0400 -+++ vinagre-2.30.1/vinagre/Makefile.am 2010-06-19 22:20:00.708166738 -0400 -@@ -135,7 +135,7 @@ vinagre_LDADD = \ - $(GTKVNC_LIBS) \ - $(NULL) - --vinagre_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" -+vinagre_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" -Wl,-O1,--as-needed - - if APPLET - -@@ -210,7 +210,7 @@ vinagre_applet_LDADD = \ - $(VINAGRE_LIBS) \ - $(AVAHI_LIBS) \ - $(NULL) --vinagre_applet_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" -+vinagre_applet_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" -Wl,-O1,--as-needed - - endif - diff --git a/vinagre-spice.patch b/vinagre-spice.patch deleted file mode 100644 index 3a826e2..0000000 --- a/vinagre-spice.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up vinagre-2.91.91/configure.spic vinagre-2.91.91/configure ---- vinagre-2.91.91/configure.spic 2011-03-08 06:13:00.648332001 -0500 -+++ vinagre-2.91.91/configure 2011-03-08 06:13:14.108163730 -0500 -@@ -11518,7 +11518,7 @@ fi - - - # Check for spice. --SPICE_DEPS="spice-slient-gtk-3.0 >= 0.5" -+SPICE_DEPS="spice-client-gtk-3.0 >= 0.5" - - # Check whether --enable-spice was given. - if test "${enable_spice+set}" = set; then : diff --git a/vinagre.spec b/vinagre.spec index 1f4d12e..c06d776 100644 --- a/vinagre.spec +++ b/vinagre.spec @@ -3,7 +3,7 @@ %endif Name: vinagre -Version: 3.1.1 +Version: 3.1.2 Release: 1%{?dist} Summary: VNC client for GNOME @@ -11,7 +11,7 @@ Group: Applications/System License: GPLv2+ URL: http://projects.gnome.org/vinagre/ #VCS: git:git://git.gnome.org/vinagre -Source0: http://download.gnome.org/sources/vinagre/3.1/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/vinagre/3.1/%{name}-%{version}.tar.xz %if 0%{?with_spice} BuildRequires: spice-gtk3-devel @@ -23,16 +23,14 @@ BuildRequires: avahi-ui-devel >= 0.6.26 BuildRequires: avahi-gobject-devel >= 0.6.26 BuildRequires: gettext intltool BuildRequires: desktop-file-utils -BuildRequires: gnome-keyring-devel +BuildRequires: libgnome-keyring-devel BuildRequires: gnome-doc-utils BuildRequires: telepathy-glib-devel >= 0.11.6 BuildRequires: libxml2-devel >= 2.6.31 BuildRequires: vte3-devel >= 0.20 BuildRequires: scrollkeeper -BuildRequires: libpeas-devel >= 0.7.2 -BuildRequires: gobject-introspection-devel -# dang circular dep -BuildRequires: vinagre + +Patch0: vinagre-3.1.2-spice-plugin.patch # for /usr/share/dbus-1/services Requires: dbus @@ -40,6 +38,13 @@ Requires: dbus BuildRequires: automake autoconf libtool BuildRequires: gnome-common +# -devel package removed in 3.1.2-1 +# http://git.gnome.org/browse/vinagre/commit/?id=6bb9d9fda0434e26ec7a7a8a114a96b930348a7c +# http://git.gnome.org/browse/vinagre/commit/?id=937b8070de0c165b2a17bae72ddd665360482db4 +Obsoletes: vinagre-devel < 3.1.2-1 +Provides: vinagre-devel = 3.1.2-1 + + %description Vinagre is a VNC client for the GNOME desktop. @@ -48,21 +53,9 @@ your servers thanks to the Favorites support, store the passwords in the GNOME keyring, and browse the network to look for VNC servers. -%package devel -Summary: Development files for vinagre -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig - -%description devel -Vinagre is a VNC client for the GNOME desktop. - -This package allows you to develop plugins that add new functionality -to vinagre. - - %prep %setup -q +%patch0 -p1 -b .spice-plugin %build %configure --enable-avahi \ @@ -72,7 +65,7 @@ to vinagre. --enable-spice \ %endif --enable-rdp \ - --enable-introspection + --enable-ssh make %{?_smp_mflags} @@ -123,19 +116,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %dir %{_libdir}/vinagre-3.0 %dir %{_libdir}/vinagre-3.0/plugins %{_libdir}/vinagre-3.0/plugins/*.so -%{_libdir}/vinagre-3.0/plugins/im-status.plugin -%{_libdir}/vinagre-3.0/plugins/rdp.plugin -%{_libdir}/vinagre-3.0/plugins/reverse-vnc.plugin -%{_libdir}/vinagre-3.0/plugins/vnc.plugin -%if 0%{?with_spice} -%{_libdir}/vinagre-3.0/plugins/spice.plugin -%endif -%{_libdir}/vinagre-3.0/plugins/im-status.js -%{_libdir}/vinagre-3.0/girepository-1.0/Vinagre-3.0.typelib -%dir %{_datadir}/vinagre-3.0 -%dir %{_datadir}/vinagre-3.0/plugins -%dir %{_datadir}/vinagre-3.0/plugins/reverse-vnc -%{_datadir}/vinagre-3.0/plugins/reverse-vnc/reverse-vnc.ui %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service %{_datadir}/telepathy/clients/Vinagre.client %{_datadir}/glib-2.0/schemas/org.gnome.Vinagre.gschema.xml @@ -145,12 +125,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %doc %{_mandir}/man1/vinagre.1.gz %doc README NEWS COPYING AUTHORS -%files devel -%{_includedir}/vinagre-3.0 -%{_libdir}/pkgconfig/vinagre-3.0.pc - %changelog +* Tue Jun 14 2011 Tomas Bzatek - 3.1.2-1 +- Update to 3.1.2 +- Removed -devel package + * Wed May 11 2011 Tomas Bzatek - 3.1.1-1 - Update to 3.1.1