- build fixes, disable RH-specific desktop changes, don't disable SSL

- removed COPYING from doc (just GPL)

Changed files:
    vino.spec -> 1.3

diff --git a/vino.spec b/vino.spec
index ed86cf4cec1c2b9c5b559f950a88ec2b89e091a6..a667dbf3ac3a33e448dc1ecf9e4af4c287b5a1a4 100644 (file)
--- a/vino.spec
+++ b/vino.spec
@@ -9,13 +9,18 @@ Source0:      http://ftp.gnome.org/pub/GNOME/sources/vino/2.7/%{name}-%{version}.tar.
 # Source0-md5: 359d5bc52be64bedb2d8af42bdff2f0c
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.6.0
+BuildRequires: gnutls-devel >= 1.0.0
 BuildRequires: gtk+2-devel >= 2.4.0
-BuildRequires: libgcrypt-devel
+BuildRequires: libgcrypt-devel >= 1.1.90
 BuildRequires: libglade2-devel >= 2.3.6
 BuildRequires: libgnomeui-devel >= 2.6.0
+BuildRequires: libjpeg-devel
+BuildRequires: zlib-devel
 Requires(post):        GConf2 >= 2.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _libexecdir     %{_libdir}/%{name}
+
 %description
 Vino is a VNC server for GNOME. It allows remote users to connect to a
 running GNOME session using VNC.
@@ -29,22 +34,21 @@ si
 
 %build
 %configure \
-       --disable-gnutls
+       --disable-schemas-install
 # --disable-session-support
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor gnome --delete-original                   \
-  --dir $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets          \
-  --add-only-show-in GNOME                                              \
-  --add-category X-Red-Hat-Base                                         \
-  $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets/vino-preferences.desktop
+#desktop-file-install --vendor gnome --delete-original                   \
+#  --dir $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets          \
+#  --add-only-show-in GNOME                                              \
+#  --add-category X-Red-Hat-Base                                         \
+#  $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets/vino-preferences.desktop
 
 # stuff we don't want
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/vino/vino-client.*
@@ -59,12 +63,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING NEWS README docs/TODO docs/remote-desktop.txt
+%doc AUTHORS ChangeLog NEWS README docs/TODO docs/remote-desktop.txt
 %attr(755,root,root) %{_bindir}/*
+%dir %{_libexecdir}
+%attr(755,root,root) %{_libexecdir}/vino-server
 %dir %{_datadir}/gnome/vino
 %{_datadir}/gnome/vino/*.glade
 %{_datadir}/control-center-2.0/capplets/*.desktop
 %{_pixmapsdir}/*.png
 %{_libdir}/bonobo/servers/*.server
-%{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/*.schemas