rpms/libvncserver/devel .cvsignore, 1.2, 1.3 libvncserver.spec, 1.2, 1.3 sources, 1.2, 1.3

[Manuel Wolfshant (wolfy)]

Author: wolfy

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

Modified Files:
	.cvsignore libvncserver.spec sources 
Log Message:
do not use bundled copy of minilzo



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvncserver/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Feb 2008 13:18:04 -0000	1.2
+++ .cvsignore	14 Apr 2008 20:40:24 -0000	1.3
@@ -1 +1,2 @@
 LibVNCServer-0.9.1.tar.gz
+libvnc-minilzo.patch


Index: libvncserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvncserver/devel/libvncserver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libvncserver.spec	1 Feb 2008 14:52:37 -0000	1.2
+++ libvncserver.spec	14 Apr 2008 20:40:24 -0000	1.3
@@ -4,12 +4,13 @@
 Summary: Library to make writing a vnc server easy
 Name:    libvncserver
 Version: 0.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 # NOTE: --with-tightvnc-filetransfer => GPLv2
 License: GPLv2+
 Group:   System Environment/Libraries
 URL:     http://libvncserver.sourceforge.net/
 Source0: http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz
+Patch0:  libvnc-minilzo.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO
@@ -26,6 +27,7 @@
 BuildRequires: libjpeg-devel
 #BuildRequires: libICE-devel libXdamage-devel libXfixes-devel libXinerama-devel libXrandr-devel
 BuildRequires: zlib-devel
+BuildRequires: lzo-minilzo lzo-devel
 
 %description
 LibVNCServer makes writing a VNC server (or more correctly, a program
@@ -49,6 +51,9 @@
 
 %prep
 %setup -q -n LibVNCServer-%{version}
+#nuke bundled minilzo
+%patch0 -p1
+find . -name minilzo\* -exec rm -f {} \;
 
 #patch1 -p1 -b .pkgconfig
 #aclocal
@@ -70,11 +75,10 @@
 %configure \
   --disable-static \
   --without-tightvnc-filetransfer
-
 # hack to omit unused-direct-shlib-dependencies
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I %{_includedir}/lzo" LDFLAGS="$LDFLAGS -lminilzo"
 
 
 %install
@@ -110,6 +114,9 @@
 
 
 %changelog
+* Thu Apr 10 2008 Manuel Wolfshant <wolfy at fedoraproject.org> 0.9.1-3
+- do not use bundled copy of minilzo
+
 * Sun Jan 27 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.1-2
 - hack libtool to omit unused shlib dependencies
 - fix AUTHORS encoding


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvncserver/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Feb 2008 13:18:04 -0000	1.2
+++ sources	14 Apr 2008 20:40:24 -0000	1.3
@@ -1 +1,2 @@
 aa00efc3dabde82fde9509bfbab0aba4  LibVNCServer-0.9.1.tar.gz
+0e0db2560a08d993306442294121c3b7  libvnc-minilzo.patch