rpms/vnc/devel vnc.spec,1.193,1.194 vnc-noxkb.patch,1.1,NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22208

Modified Files:
	vnc.spec 
Removed Files:
	vnc-noxkb.patch 
Log Message:
- enabled XKEYBOARD extension (#450033)
- icons have correct permissions (#453495)



Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- vnc.spec	3 Jun 2008 08:57:07 -0000	1.193
+++ vnc.spec	2 Jul 2008 11:16:31 -0000	1.194
@@ -3,7 +3,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   31.1%{?dist}
+Release:   32%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   Makefile.am
@@ -38,7 +38,6 @@
 Patch41:   vnc-privates.patch
 Patch42:   vnc-mieq.patch
 Patch43:   vnc-allocate.patch
-Patch44:   vnc-noxkb.patch
 Patch45:   vnc-paint.patch
 Patch46:   vnc-selections.patch
 Patch48:   vnc-manminor.patch
@@ -54,7 +53,7 @@
 BuildRequires: perl, openssl-devel, libpciaccess-devel
 BuildRequires: zlib-devel libjpeg-devel
 BuildRequires: desktop-file-utils >= 0.2.92
-BuildRequires: autoconf,  automake, libtool, flex, bison, pkgconfig, patchutils
+BuildRequires: autoconf,  automake, libtool, flex, pkgconfig, patchutils
 BuildRequires: expat-devel, freetype-devel
 BuildRequires: libX11-devel, xorg-x11-xtrans-devel
 BuildRequires: libxkbfile-devel, libXfont-devel
@@ -136,7 +135,6 @@
 popd
 %patch42 -p1 -b .mieq
 %patch43 -p1 -b .alloc
-%patch44 -p1 -b .noxkb
 %patch45 -p1 -b .paint
 %patch46 -p1 -b .selections
 %patch48 -p1 -b .minor
@@ -176,7 +174,7 @@
 	--enable-xcsecurity \
 	--with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
 	--with-fontdir=%{_datadir}/X11/fonts \
-        --with-os-name="Fedora 9" \
+        --with-os-name="Fedora 10" \
         --with-os-vendor="Red Hat, Inc." \
         --with-xkb-output=%{_localstatedir}/lib/xkb \
         --with-rgb-path=%{_datadir}/X11/rgb \
@@ -244,9 +242,9 @@
 chmod 644 $RPM_BUILD_ROOT/etc/sysconfig/vncservers
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps
-install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png
-install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png
-install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png
 mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications
 cat > vncviewer.desktop << EOF
 [Desktop Entry]
@@ -335,6 +333,10 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Tue Jul 01 2008 Adam Tkac <atkac redhat com> 4.1.2-32
+- enabled XKEYBOARD extension (#450033)
+- icons have correct permissions (#453495)
+
 * Mon Jun 02 2008 Adam Tkac <atkac redhat com> 4.1.2-31.1
 - minor cleanup in IPv6 patch
 


--- vnc-noxkb.patch DELETED ---