- updated to 3.0.0; merged from DEVEL

Changed files:
    vino.spec -> 1.58

diff --git a/vino.spec b/vino.spec
index 35fa4d777ee5223891e04227b1bd263f9748c156..fdb62762b3fd9306488776c4d4529089d962220e 100644 (file)
--- a/vino.spec
+++ b/vino.spec
@@ -1,40 +1,43 @@
 Summary:       A remote desktop system for GNOME
 Summary(pl.UTF-8):     System zdalnego pulpitu dla GNOME
 Name:          vino
-Version:       2.32.1
+Version:       3.0.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Networking
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/vino/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5: 136af49e142adc1d6df0bfe3374e203e
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/vino/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 62ce938520d5f29ac9fea00554b8ccd0
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.26.0
 BuildRequires: NetworkManager-devel >= 0.7
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.10
+BuildRequires: avahi-devel >= 0.6.18
 BuildRequires: avahi-glib-devel >= 0.6.18
-BuildRequires: dbus-devel >= 1.2.3
-BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gnome-common >= 2.24.0
 BuildRequires: gnutls-devel >= 1.0.0
-BuildRequires: gtk+2-devel >= 2:2.20.0
+BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libgcrypt-devel >= 1.2.0
 BuildRequires: libgnome-keyring-devel >= 2.26.0
 BuildRequires: libjpeg-devel
-BuildRequires: libnotify-devel >= 0.4.4
+BuildRequires: libnotify-devel >= 0.7.0
 BuildRequires: libsoup-devel >= 2.26.0
-BuildRequires: libtool
-BuildRequires: libunique-devel >= 1.0.0
+BuildRequires: libtool >= 2:2.2.6
 BuildRequires: perl-base
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: telepathy-glib-devel >= 0.12.0
+BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: telepathy-glib-devel >= 0.13.13
 BuildRequires: xorg-lib-libICE-devel
 BuildRequires: xorg-lib-libSM-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXdamage-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXfixes-devel
+BuildRequires: xorg-lib-libXtst-devel
 BuildRequires: zlib-devel
-Requires(post,preun):  GConf2
+Requires(post,postun): glib2 >= 1:2.26.0
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,9 +55,6 @@ się z działającą sesją GNOME przy użyciu VNC.
 %prep
 %setup -q
 
-sed -i -e 's/^en@shaw//' po/LINGUAS
-rm -f po/en@shaw.po
-
 %build
 %{__intltoolize}
 %{__libtoolize}
@@ -63,11 +63,8 @@ rm -f po/en@shaw.po
 %{__autoheader}
 %{__automake}
 %configure \
-       --enable-avahi \
        --enable-ipv6 \
-       --enable-gnome-keyring \
-       --enable-libnotify \
-       --disable-schemas-install \
+       --disable-schemas-compile \
        --disable-silent-rules
 %{__make}
 
@@ -83,10 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install vino-server.schemas
+%glib_compile_schemas
 
-%preun
-%gconf_schema_uninstall vino-server.schemas
+%postun
+%glib_compile_schemas
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -103,4 +100,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vino/webservices
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 %{_desktopdir}/vino-preferences.desktop
-%{_sysconfdir}/gconf/schemas/vino-server.schemas
+%{_datadir}/glib-2.0/schemas/org.gnome.Vino.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.Vino.gschema.xml