From 624239a17f64b4be8c527cb464cecbfb13d6c79f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 14 2013 16:48:52 +0000 Subject: pkgconfig love (#854111) --- diff --git a/LibVNCServer-0.9.9-pkgconfig.patch b/LibVNCServer-0.9.9-pkgconfig.patch new file mode 100644 index 0000000..a0425e6 --- /dev/null +++ b/LibVNCServer-0.9.9-pkgconfig.patch @@ -0,0 +1,26 @@ +diff -up LibVNCServer-0.9.9/libvncclient.pc.in.pkgconfig LibVNCServer-0.9.9/libvncclient.pc.in +--- LibVNCServer-0.9.9/libvncclient.pc.in.pkgconfig 2012-05-04 09:19:00.000000000 -0500 ++++ LibVNCServer-0.9.9/libvncclient.pc.in 2013-02-14 10:45:18.902001014 -0600 +@@ -7,6 +7,8 @@ Name: LibVNCClient + Description: A library for easy implementation of a VNC client. + Version: @VERSION@ + Requires: +-Libs: -L${libdir} -lvncclient @LIBS@ @WSOCKLIB@ ++Requires.private: zlib ++Libs: -L${libdir} -lvncclient ++Libs.private: @LIBS@ @WSOCKLIB@ + Cflags: -I${includedir} + +diff -up LibVNCServer-0.9.9/libvncserver.pc.in.pkgconfig LibVNCServer-0.9.9/libvncserver.pc.in +--- LibVNCServer-0.9.9/libvncserver.pc.in.pkgconfig 2012-05-04 09:19:00.000000000 -0500 ++++ LibVNCServer-0.9.9/libvncserver.pc.in 2013-02-14 10:44:49.727365748 -0600 +@@ -7,6 +7,8 @@ Name: LibVNCServer + Description: A library for easy implementation of a VNC server. + Version: @VERSION@ + Requires: +-Libs: -L${libdir} -lvncserver @LIBS@ @WSOCKLIB@ ++Requires.private: zlib ++Libs: -L${libdir} -lvncserver ++Libs.private: @LIBS@ @WSOCKLIB@ + Cflags: -I${includedir} + diff --git a/libvncserver.spec b/libvncserver.spec index e2155d2..71e7f4f 100644 --- a/libvncserver.spec +++ b/libvncserver.spec @@ -1,6 +1,4 @@ -# Fedora pkg review: http://bugzilla.redhat.com/429749 - %if 0%{?fedora} || 0%{?rhel} > 5 %define system_minilzo 1 %endif @@ -8,7 +6,7 @@ Summary: Library to make writing a vnc server easy Name: libvncserver Version: 0.9.9 -Release: 6%{?dist} +Release: 7%{?dist} # NOTE: --with-tightvnc-filetransfer => GPLv2 License: GPLv2+ Group: System Environment/Libraries @@ -20,6 +18,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: LibVNCServer-0.9.9-no_x11vnc.patch Patch1: LibVNCServer-0.9.9-system_minilzo.patch Patch2: libvncserver-0.9.1-multilib.patch +# pkgconfig love (upstreamable) +Patch3: LibVNCServer-0.9.9-pkgconfig.patch # upstream name Obsoletes: LibVNCServer < 0.9.1 @@ -63,8 +63,8 @@ Provides: LibVNCServer-devel = %{version}-%{release} #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 # fix encoding for file in AUTHORS ChangeLog ; do @@ -131,6 +131,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 14 2013 Rex Dieter 0.9.9-7 +- pkgconfig love (#854111) + * Thu Feb 14 2013 Fedora Release Engineering - 0.9.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild