[libvncserver] 0.9.9-10
Rex Dieter
rdieter at fedoraproject.org
Sat Dec 21 12:02:14 UTC 2013
commit b206bf527ec8f694f10c9db12de36c161af61c4c
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Dec 21 06:02:04 2013 -0600
0.9.9-10
- include additional dependencies for x11vnc (#864947)
- %build: --disable-silent-rules
- cleanup spec, drop support for old rpm (el5)
libvncserver.spec | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/libvncserver.spec b/libvncserver.spec
index f633976..e13d343 100644
--- a/libvncserver.spec
+++ b/libvncserver.spec
@@ -1,18 +1,13 @@
-%if 0%{?fedora} || 0%{?rhel} > 5
-%define system_minilzo 1
-%endif
-
Summary: Library to make writing a vnc server easy
Name: libvncserver
Version: 0.9.9
-Release: 9%{?dist}
+Release: 10%{?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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# workaround there being no x11vnc/ dir in tarball
Patch0: LibVNCServer-0.9.9-no_x11vnc.patch
@@ -28,9 +23,16 @@ Provides: LibVNCServer = %{version}-%{release}
BuildRequires: automake autoconf
BuildRequires: libgcrypt-devel
BuildRequires: libjpeg-devel
-%{?system_minilzo:BuildRequires: lzo-minilzo lzo-devel}
+BuildRequires: lzo-minilzo lzo-devel
BuildRequires: pkgconfig(gnutls)
+BuildRequires: pkgconfig(libcrypto) pkgconfig(libssl)
BuildRequires: pkgconfig(libpng)
+# Additional deps for --with-x11vnc, see https://bugzilla.redhat.com/show_bug.cgi?id=864947
+BuildRequires: pkgconfig(avahi-client)
+BuildRequires: pkgconfig(ice) pkgconfig(x11) pkgconfig(xdamage)
+BuildRequires: pkgconfig(xext) pkgconfig(xfixes) pkgconfig(xi)
+BuildRequires: pkgconfig(xinerama) pkgconfig(xrandr) pkgconfig(xtst)
+
# for %%check
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: xorg-x11-xauth
@@ -45,7 +47,6 @@ compression schemata.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
# libvncserver-config deps
Requires: coreutils
@@ -60,11 +61,9 @@ Provides: LibVNCServer-devel = %{version}-%{release}
%setup -q -n LibVNCServer-%{version}
%patch0 -p1 -b .no_x11vnc
-%if 0%{?system_minilzo}
%patch1 -p1 -b .system_minilzo
#nuke bundled minilzo
rm -f common/lzodefs.h common/lzoconf.h commmon/minilzo.h common/minilzo.c
-%endif
%patch2 -p1 -b .multilib
%patch3 -p1 -b .pkgconfig
@@ -81,20 +80,20 @@ autoreconf
%build
%configure \
+ --disable-silent-rules \
--disable-static \
--without-tightvnc-filetransfer \
--with-gcrypt \
- --with-png
+ --with-png \
+ --with-x11vnc
# hack to omit unused-direct-shlib-dependencies
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-make V=1 %{?_smp_mflags}
+make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-
make install DESTDIR=%{buildroot}
# unpackaged files
@@ -111,21 +110,15 @@ unset DISPLAY
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
%{_libdir}/libvncclient.so.0*
%{_libdir}/libvncserver.so.0*
%files devel
-%defattr(-,root,root,-)
%{_bindir}/libvncserver-config
%{_includedir}/rfb/
%{_libdir}/libvncclient.so
@@ -135,6 +128,11 @@ rm -rf %{buildroot}
%changelog
+* Sat Dec 21 2013 Rex Dieter <rdieter at fedoraproject.org> - 0.9.9-10
+- include additional dependencies for x11vnc (#864947)
+- %%build: --disable-silent-rules
+- cleanup spec, drop support for old rpm (el5)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list