[libvncserver] 0.9.8.2 (#694975) new %check section (yay for xvfb-run)

[Rex Dieter]

commit de4dfee1aa6b74ed01fd806a81d013dd2f6c866d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Dec 13 11:09:03 2011 -0600

    0.9.8.2 (#694975)
    new %check section (yay for xvfb-run)

 .gitignore                                   |    3 +-
 libvncserver-0.9.1-close_server_socket.patch |   11 ---
 libvncserver-0.9.7-system_minilzo.patch      |   99 --------------------------
 libvncserver.spec                            |   55 ++++++++------
 sources                                      |    2 +-
 5 files changed, 35 insertions(+), 135 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index daebdff..3cbe231 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-LibVNCServer-0.9.7-clean.tar.xz
+/LibVNCServer-0.9.7-clean.tar.xz
+/LibVNCServer-0.9.8.2.tar.gz
diff --git a/libvncserver.spec b/libvncserver.spec
index dcee420..f899064 100644
--- a/libvncserver.spec
+++ b/libvncserver.spec
@@ -7,34 +7,32 @@
 
 Summary: Library to make writing a vnc server easy
 Name:    libvncserver
-Version: 0.9.7
-Release: 5%{?dist}
+Version: 0.9.8.2
+Release: 1%{?dist}
 # NOTE: --with-tightvnc-filetransfer => GPLv2
 License: GPLv2+
 Group:   System Environment/Libraries
 URL:     http://libvncserver.sourceforge.net/
-# This source is made from
-# http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz
-# by deleting all .jar files.
-Source0:  LibVNCServer-%{version}-clean.tar.xz
+Source0: http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libvncserver-0.9.7-system_minilzo.patch
+Patch1: LibVNCServer-0.9.8.2-system_minilzo.patch
 Patch2: libvncserver-0.9.1-multilib.patch
 
 # safer LINUX platform detection (from opensuse)
 Patch50:  libvncserver-LINUX.patch
 
-## upstream patches
-Patch100: libvncserver-0.9.1-close_server_socket.patch
-
 # upstream name
 Obsoletes: LibVNCServer < 0.9.1
 Provides:  LibVNCServer = %{version}-%{release}
 
+BuildRequires: automake autoconf
 BuildRequires: libjpeg-devel
-BuildRequires: zlib-devel
 %{?system_minilzo:BuildRequires: lzo-minilzo lzo-devel}
+BuildRequires: pkgconfig(gnutls)
+# for %%check
+BuildRequires: xorg-x11-server-Xvfb
+BuildRequires: zlib-devel
 
 %description
 LibVNCServer makes writing a VNC server (or more correctly, a program
@@ -46,7 +44,7 @@ compression schemata.
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 # libvncserver-config deps
 Requires: coreutils
 # upstream name
@@ -62,20 +60,21 @@ Provides:  LibVNCServer-devel = %{version}-%{release}
 %if 0%{?system_minilzo}
 %patch1 -p1 -b .system_minilzo
 #nuke bundled minilzo
-find . -name minilzo\* -exec rm -f {} \;
+rm -f common/lzodefs.h common/lzoconf.h commmon/minilzo.h common/minilzo.c
 %endif
 
 %patch2 -p1 -b .multilib
 %patch50 -p0 -b .LINUX
-%patch100 -p1 -b .close_server_socket
 
 # fix encoding
-mv AUTHORS AUTHORS.OLD && \
-iconv -f ISO_8859-1 -t UTF8 AUTHORS.OLD > AUTHORS && \
-touch --reference AUTHORS.OLD AUTHORS
+for file in AUTHORS ChangeLog ; do
+mv ${file} ${file}.OLD && \
+iconv -f ISO_8859-1 -t UTF8 ${file}.OLD > ${file} && \
+touch --reference ${file}.OLD $file 
+done
 
-# fix source perms
-find -name "*.c" -o -name "*.h" | xargs chmod 644
+# needed by patches 1, 50
+autoreconf
 
 
 %build
@@ -86,7 +85,7 @@ find -name "*.c" -o -name "*.h" | xargs chmod 644
 # hack to omit unused-direct-shlib-dependencies
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-make %{?_smp_mflags} %{?system_minilzo:CFLAGS="$RPM_OPT_FLAGS -I %{_includedir}/lzo" LDFLAGS="$LDFLAGS -lminilzo"}
+make %{?_smp_mflags}
 
 
 %install
@@ -100,15 +99,19 @@ rm -f %{buildroot}%{_libdir}/lib*.a
 rm -f %{buildroot}%{_libdir}/lib*.la
 
 
+%check
+unset DISPLAY
+# Run a fake X session 
+xvfb-run -a make -C test test 
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
@@ -117,13 +120,19 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/*-config
+%{_bindir}/libvncserver-config
 %{_includedir}/rfb/
 %{_libdir}/libvncclient.so
 %{_libdir}/libvncserver.so
+%{_libdir}/pkgconfig/libvncclient.pc
+%{_libdir}/pkgconfig/libvncserver.pc
 
 
 %changelog
+* Tue Dec 13 2011 Rex Dieter <rdieter at fedoraproject.org> 0.9.8.2-1
+- 0.9.8.2 (#694975)
+- new %%check section (yay for xvfb-run)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 61a47f6..73c0d8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad6811d32e275df89b3dbcf491d4f3f5  LibVNCServer-0.9.7-clean.tar.xz
+dfed1dcc25cb338c7fdbcda2c3df7f50  LibVNCServer-0.9.8.2.tar.gz