rpms/vnc/devel Makefile.am,1.1,1.2 vnc.spec,1.184,1.185

[Adam Tkac (atkac)]

Author: atkac

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

Modified Files:
	Makefile.am vnc.spec 
Log Message:
- fixed building issues (typo in Makefile.am and BuildRequires)



Index: Makefile.am
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	11 Mar 2008 12:54:15 -0000	1.1
+++ Makefile.am	11 Mar 2008 13:25:25 -0000	1.2
@@ -53,7 +53,7 @@
 	xf86vncModule.cc
 
 libvnc_la_CPPFLAGS = \
-		$(RFB_INCS) \
+		-I$(LIB_DIR) \
 		-I$(top_srcdir)/hw/xfree86/common \
 		-I$(top_srcdir)/hw/xfree86/os-support \
 		-I$(top_srcdir)/hw/xfree86/os-support/bus \


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- vnc.spec	11 Mar 2008 12:50:34 -0000	1.184
+++ vnc.spec	11 Mar 2008 13:25:25 -0000	1.185
@@ -6,11 +6,11 @@
 Release:   25.3%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
+Source1:   Makefile.am
 Source2:   vncserver.init
 Source3:   vnc-16x16.png
 Source4:   vnc-24x24.png
 Source5:   vnc-48x48.png
-Source1:   Makefile.am
 Patch0:    vnc-cookie.patch
 Patch1:    vnc-gcc4.patch
 Patch2:    vnc-use-fb.patch
@@ -46,7 +46,7 @@
 License:   GPLv2
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: perl 
+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
@@ -89,7 +89,7 @@
 Remote framebuffer library which is used by vncviewer and vncserver
 
 %prep
-%setup -q -n vnc-%{vnc_version}-unixsrc -a1
+%setup -q -n vnc-%{vnc_version}-unixsrc
 cp -r %{_datadir}/xorg-x11-server-source unix
 mkdir -p unix/xorg-x11-server-source/hw/vnc
 cp %{SOURCE1} unix/xorg-x11-server-source/hw/vnc/