From 051d82e10ea8327ac1413c2034eccfa67b0a3642 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Feb 23 2011 03:30:45 +0000 Subject: fix build --- diff --git a/.gitignore b/.gitignore index 0229fa6..b168970 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ vino-2.31.4.tar.bz2 /vino-2.31.91.tar.bz2 /vino-2.32.0.tar.bz2 +/vino-2.99.0.tar.bz2 diff --git a/sources b/sources index 24b3434..def3153 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e43a40dc3a1ad81ce6d417c237b68875 vino-2.32.0.tar.bz2 +2b55c8207478a6c48ea0aa06a2c01325 vino-2.99.0.tar.bz2 diff --git a/tube.patch b/tube.patch new file mode 100644 index 0000000..21b996a --- /dev/null +++ b/tube.patch @@ -0,0 +1,23 @@ +--- vino-2.99.0/server/vino-dbus-listener.c 2011-02-21 10:32:06.000000000 -0500 ++++ vino.hacked/server/vino-dbus-listener.c 2011-02-22 22:27:54.933847947 -0500 +@@ -42,6 +42,9 @@ + gint screen; + + VinoServer *server; ++#ifdef HAVE_TELEPATHY_GLIB ++ VinoTubeServersManager *manager; ++#endif + }; + + typedef GObjectClass VinoDBusListenerClass; +@@ -64,8 +67,8 @@ + #ifdef HAVE_TELEPATHY_GLIB + if (listener->manager != NULL) + { +- g_object_unref (listener->priv->manager); +- listener->priv->manager = NULL; ++ g_object_unref (listener->manager); ++ listener->manager = NULL; + } + #endif + diff --git a/vino.spec b/vino.spec index 1ede8b1..7b45870 100644 --- a/vino.spec +++ b/vino.spec @@ -1,35 +1,22 @@ -%define glib2_version 2.12.0 -%define gtk2_version 2.6.0 -%define libglade2_version 2.3.6 -%define gconf2_version 2.14.0 -%define libgnomeui_version 2.6.0 %define libgcrypt_version 1.2.0 %define libnotify_version 0.4.3 %define telepathy_glib_version 0.7.31 Summary: A remote desktop system for GNOME Name: vino -Version: 2.32.0 -Release: 3%{?dist} +Version: 2.99.0 +Release: 2%{?dist} URL: http://www.gnome.org #VCS: git:git://git.gnome.org/vino -Source0: http://download.gnome.org/sources/vino/2.32/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/vino/2.99/%{name}-%{version}.tar.bz2 -# https://bugzilla.gnome.org/show_bug.cgi?id=631948 -Patch0: notify.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=642910 +Patch0: tube.patch License: GPLv2+ Group: User Interface/Desktops -Requires(pre): GConf2 >= %{gconf2_version} -Requires(post): GConf2 >= %{gconf2_version} -Requires(preun): GConf2 >= %{gconf2_version} - -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: gtk2-devel >= %{gtk2_version} -BuildRequires: libglade2-devel >= %{libglade2_version} -BuildRequires: GConf2-devel >= %{gconf2_version} -BuildRequires: libgnomeui-devel >= %{libgnomeui_version} +BuildRequires: gtk3-devel BuildRequires: libgcrypt-devel >= %{libgcrypt_version} BuildRequires: libnotify-devel >= %{libnotify_version} BuildRequires: telepathy-glib-devel >= %{telepathy_glib_version} @@ -37,7 +24,6 @@ BuildRequires: libXt-devel, libXtst-devel, libXdamage-devel, avahi-glib-devel BuildRequires: desktop-file-utils BuildRequires: intltool BuildRequires: gettext -BuildRequires: dbus-glib-devel BuildRequires: libsoup-devel BuildRequires: NetworkManager-devel BuildRequires: libSM-devel @@ -52,16 +38,16 @@ connect to a running GNOME session using VNC. %prep %setup -q -%patch0 -p1 -b .notify +%patch0 -p1 -b .tube %build -%configure \ - --enable-avahi \ - --enable-gnome-keyring \ - --disable-gnutls \ - --disable-http-server \ - --enable-libnotify \ - --enable-network-manager \ +%configure \ + --enable-avahi \ + --enable-gnome-keyring \ + --disable-gnutls \ + --disable-http-server \ + --enable-libnotify \ + --enable-network-manager \ --enable-telepathy # drop unneeded direct library deps with --as-needed @@ -71,9 +57,7 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dyn make %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -85,31 +69,17 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache %find_lang %{name} -%post -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/vino-server.schemas >& /dev/null || : -touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : - -%pre -if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/vino-server.schemas >& /dev/null || : -fi - -%preun -if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/vino-server.schemas >& /dev/null || : -fi - %postun if [ $1 -eq 0 ]; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + glib-compile-schemas %{_datadir}/glib-2.0/schemas || : fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +glib-compile-schemas %{_datadir}/glib-2.0/schemas || : + %files -f %{name}.lang %defattr(-,root,root) @@ -120,10 +90,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/telepathy/clients/Vino.client %{_bindir}/* %{_libexecdir}/* -%{_sysconfdir}/gconf/schemas/*.schemas %{_sysconfdir}/xdg/autostart/vino-server.desktop %changelog +* Tue Feb 22 2011 Matthias Clasen - 2.99.0-1 +- Update to 2.99.0 + * Mon Feb 07 2011 Fedora Release Engineering - 2.32.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild