rpms/libvncserver/EL-5 libvncserver.spec,1.2,1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libvncserver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32063

Modified Files:
	libvncserver.spec 
Log Message:
no minilzo in epel yet, don't use it



Index: libvncserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvncserver/EL-5/libvncserver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvncserver.spec	4 May 2009 18:18:26 -0000	1.2
+++ libvncserver.spec	4 May 2009 18:27:52 -0000	1.3
@@ -1,6 +1,10 @@
 
 # Fedora pkg review: http://bugzilla.redhat.com/429749
 
+%if 0%{?fedora}
+%define system_minilzo 1
+%endif
+
 Summary: Library to make writing a vnc server easy
 Name:    libvncserver
 Version: 0.9.7
@@ -22,7 +26,7 @@ Provides:  LibVNCServer = %{version}-%{r
 BuildRequires: findutils
 BuildRequires: libjpeg-devel
 BuildRequires: zlib-devel
-BuildRequires: lzo-minilzo lzo-devel
+%{?system_minilzo:BuildRequires: lzo-minilzo lzo-devel}
 
 %description
 LibVNCServer makes writing a VNC server (or more correctly, a program
@@ -47,9 +51,11 @@ Provides:  LibVNCServer-devel = %{versio
 %prep
 %setup -q -n LibVNCServer-%{version}
 
+%if 0%{?system_minilzo}
 %patch1 -p1 -b .system_minilzo
 #nuke bundled minilzo
 find . -name minilzo\* -exec rm -f {} \;
+%endif
 
 %patch2 -p1 -b .multilib
 
@@ -70,7 +76,7 @@ find -name "*.c" -o -name "*.h" | xargs 
 # hack to omit unused-direct-shlib-dependencies
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I %{_includedir}/lzo" LDFLAGS="$LDFLAGS -lminilzo"
+make %{?_smp_mflags} %{?system_minilzo:CFLAGS="$RPM_OPT_FLAGS -I %{_includedir}/lzo" LDFLAGS="$LDFLAGS -lminilzo"}
 
 
 %install