rpms/libx86/devel libx86-add-pkgconfig.patch, NONE, 1.1 libx86.spec, 1.6, 1.7

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/libx86/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3600

Modified Files:
	libx86.spec 
Added Files:
	libx86-add-pkgconfig.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.1-6
- add pkgconfig support


libx86-add-pkgconfig.patch:
 Makefile  |   15 ++++++++++++---
 x86.pc.in |   11 ++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

--- NEW FILE libx86-add-pkgconfig.patch ---
>From fc4f25c4d16aaff7dcb5dd42cc20b292f4eb2218 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Tue, 4 Aug 2009 13:08:42 +1000
Subject: [PATCH] git add x86.pc

---
 Makefile  |   15 ++++++++++++---
 x86.pc.in |   10 ++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 x86.pc.in

diff --git a/Makefile b/Makefile
index 951b617..953a499 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 OBJECTS = x86-common.o
 CFLAGS ?= -O2 -Wall -DDEBUG -g
 LIBDIR ?= /usr/lib
+INCLUDEDIR ?= /usr/include
 
 ifeq ($(BACKEND),x86emu)
 	OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \
@@ -29,10 +30,18 @@ objclean:
 	rm -f *.o *~
 
 clean: objclean
-	rm -f *.so.1 *.a
+	rm -f *.so.1 *.a x86.pc
 
-install: libx86.so.1
+x86.pc:
+	sed -e's, at prefix@,/usr,' x86.pc.in > x86.pc
+	sed -e's, at exec_prefix@,/usr,' -i x86.pc
+	sed -e's, at libdir@,${LIBDIR},' -i x86.pc
+	sed -e's, at includedir@,${INCLUDEDIR},' -i x86.pc
+	sed -e's, at PACKAGE_VERSION@,1.1,' -i x86.pc
+
+install: libx86.so.1 x86.pc
 	install -D libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so.1
 	install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a
+	install -D x86.pc $(DESTDIR)$(LIBDIR)/pkgconfig/x86.pc
 	ln -sf libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so
-	install -p -m 0644 -D lrmi.h $(DESTDIR)/usr/include/libx86.h
+	install -p -m 0644 -D lrmi.h $(DESTDIR)$(INCLUDEDIR)/libx86.h
diff --git a/x86.pc.in b/x86.pc.in
new file mode 100644
index 0000000..711d90d
--- /dev/null
+++ b/x86.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: x86
+Description: Library providing x86 emulator access
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lx86
-- 
1.5.4.1



Index: libx86.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libx86/devel/libx86.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libx86.spec	25 Jul 2009 08:56:32 -0000	1.6
+++ libx86.spec	4 Aug 2009 03:12:11 -0000	1.7
@@ -1,6 +1,6 @@
-Name:           libx86          
-Version:        1.1    
-Release:        5%{?dist}
+Name:           libx86
+Version:        1.1
+Release:        6%{?dist}
 Summary:        Library for making real-mode x86 calls
 
 Group:          System Environment/Libraries
@@ -12,6 +12,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # and video routing
 ExcludeArch:    ppc ppc64
 
+Patch0: libx86-add-pkgconfig.patch
+
 %description
 A library to provide support for making real-mode x86 calls with an emulated
 x86 processor.
@@ -27,6 +29,7 @@ development of programs that will use li
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -54,8 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_includedir}/*.h
+%{_libdir}/pkgconfig/x86.pc
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.1-6
+- add pkgconfig support
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild