Author: lisu                         Date: Tue Nov 29 22:15:38 2011 GMT
Module: packages                      Tag: GNOME_2
---- Log message:
- up to 2.32.2

---- Files affected:
packages/vino:
   vino.spec (1.64 -> 1.64.2.1) 

---- Diffs:

================================================================
Index: packages/vino/vino.spec
diff -u packages/vino/vino.spec:1.64 packages/vino/vino.spec:1.64.2.1
--- packages/vino/vino.spec:1.64        Sun Oct 23 11:52:57 2011
+++ packages/vino/vino.spec     Tue Nov 29 23:15:33 2011
@@ -2,45 +2,40 @@
 Summary:       A remote desktop system for GNOME
 Summary(pl.UTF-8):     System zdalnego pulpitu dla GNOME
 Name:          vino
-Version:       3.2.1
+Version:       2.32.2
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Networking
-Source0:       
http://ftp.gnome.org/pub/GNOME/sources/vino/3.2/%{name}-%{version}.tar.xz
-# Source0-md5: 93d6b6404f3ee248e67d8bcb6b50db83
+Source0:       
http://ftp.gnome.org/pub/GNOME/sources/vino/2.32/%{name}-%{version}.tar.bz2
+# Source0-md5: 5e9800b7c5698da87cfb0029ddc4249a
 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 >= 2.2.0
-BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: gnutls-devel >= 1.0.0
+BuildRequires: gtk+2-devel >= 2:2.20.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.7.0
+BuildRequires: libnotify-devel >= 0.4.4
 BuildRequires: libsoup-devel >= 2.26.0
-BuildRequires: libtool >= 2:2.2.6
+BuildRequires: libtool
+BuildRequires: libunique-devel >= 1.0.0
 BuildRequires: perl-base
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.592
-BuildRequires: tar >= 1:1.22
-BuildRequires: telepathy-glib-devel >= 0.13.13
+BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: telepathy-glib-devel >= 0.12.0
 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: xz
 BuildRequires: zlib-devel
-Requires(post,postun): glib2 >= 1:2.26.0
+Requires(post,preun):  GConf2
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,6 +53,9 @@
 %prep
 %setup -q
 
+sed -i -e 's/^en@shaw//' po/LINGUAS
+rm -f po/[email protected]
+
 %build
 %{__intltoolize}
 %{__libtoolize}
@@ -66,8 +64,11 @@
 %{__autoheader}
 %{__automake}
 %configure \
+       --enable-avahi \
        --enable-ipv6 \
-       --disable-schemas-compile \
+       --enable-gnome-keyring \
+       --enable-libnotify \
+       --disable-schemas-install \
        --disable-silent-rules
 %{__make}
 
@@ -83,10 +84,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%glib_compile_schemas
+%gconf_schema_install vino-server.schemas
 
-%postun
-%glib_compile_schemas
+%preun
+%gconf_schema_uninstall vino-server.schemas
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -103,9 +104,7 @@
 %{_datadir}/vino/webservices
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 %{_desktopdir}/vino-preferences.desktop
-%{_datadir}/GConf/gsettings/org.gnome.Vino.convert
-%{_datadir}/glib-2.0/schemas/org.gnome.Vino.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.Vino.gschema.xml
+%{_sysconfdir}/gconf/schemas/vino-server.schemas
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -113,45 +112,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.64  2011/10/23 09:52:57  wiget
-- up to 3.2.1
-
-Revision 1.63  2011/09/30 18:51:17  wiget
-- merge from DEVEL
-
-Revision 1.62.2.2  2011/09/30 18:50:54  wiget
-- up to 3.2.0
-
-Revision 1.62.2.1  2011/09/07 18:47:53  wiget
-- up to 3.1.91
-
-Revision 1.62  2011/08/31 06:58:13  arekm
-- release 2
-
-Revision 1.61  2011/07/15 18:43:23  megabajt
-- updated to 3.0.3
-
-Revision 1.60  2011/05/04 17:36:25  marti
-- security fix for CVE-2011-0904 and CVE-2011-0905
-
-Revision 1.59  2011/04/26 10:42:29  megabajt
-- updated to 3.0.1
-
-Revision 1.58  2011/04/07 11:32:41  megabajt
-- updated to 3.0.0; merged from DEVEL
-
-Revision 1.57.2.4  2011/03/26 20:27:03  megabajt
-- updated to 2.99.5
-
-Revision 1.57.2.3  2011/03/21 21:47:33  megabajt
-- updated to 2.99.4
-- removed obsolete configure options
-
-Revision 1.57.2.2  2011/03/07 21:50:51  wiget
-- up to 2.99.3
-
-Revision 1.57.2.1  2011/02/21 23:49:06  wiget
-- updated to 2.99.0
+Revision 1.64.2.1  2011/11/29 22:15:33  lisu
+- up to 2.32.2
 
 Revision 1.57  2011/01/14 21:25:12  megabajt
 - updated to 2.32.1
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vino/vino.spec?r1=1.64&r2=1.64.2.1&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to