- merge from DEVEL

Changed files:
    vino.spec -> 1.42

diff --git a/vino.spec b/vino.spec
index 24035bb1ad6b03ebf583ff3ba6746b526d4e0492..5ec37583b27e25203cca0d2070681ad18a4e4b4c 100644 (file)
--- a/vino.spec
+++ b/vino.spec
@@ -1,12 +1,12 @@
 Summary:       A remote desktop system for GNOME
 Summary(pl.UTF-8):     System zdalnego pulpitu dla GNOME
 Name:          vino
-Version:       2.22.2
-Release:       2
+Version:       2.24.0
+Release:       1
 License:       GPL v2+
 Group:         Applications/Networking
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/vino/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5: be507a80ec2c3cd5888060b81ff74f4e
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/vino/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5: c02bec87196e1655043c60870bfec7a7
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.22.0
 BuildRequires: ORBit2-devel >= 1:2.14.7
@@ -23,8 +23,9 @@ BuildRequires:        libgcrypt-devel >= 1.2.0
 BuildRequires: libglade2-devel >= 1:2.6.2
 BuildRequires: libgnomeui-devel >= 2.22.0
 BuildRequires: libjpeg-devel
-BuildRequires: libnotify-devel >= 0.4.3
+BuildRequires: libnotify-devel >= 0.4.4
 BuildRequires: libtool
+BuildRequires: pango-devel
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.311
@@ -49,9 +50,6 @@ się z działającą sesją GNOME przy użyciu VNC.
 %prep
 %setup -q
 
-sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
-mv po/sr@{Latn,latin}.po
-
 %build
 %{__intltoolize}
 %{__libtoolize}
@@ -87,12 +85,12 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README docs/TODO docs/remote-desktop.txt
+%attr(755,root,root) %{_bindir}/vino-passwd
 %attr(755,root,root) %{_bindir}/vino-preferences
-%attr(755,root,root) %{_bindir}/vino-session
 %dir %{_libexecdir}
 %attr(755,root,root) %{_libexecdir}/vino-server
 %dir %{_datadir}/vino
 %{_datadir}/vino/*.glade
+%{_datadir}/gnome/autostart/vino-server.desktop
 %{_desktopdir}/vino-preferences.desktop
-%{_libdir}/bonobo/servers/GNOME_RemoteDesktop.server
 %{_sysconfdir}/gconf/schemas/vino-server.schemas