rpms/linphone/FC-3 linphone-0.12.2-pkgconfig.patch, NONE, 1.1 linphone.spec, 1.5, 1.6

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/rpms/linphone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018

Modified Files:
	linphone.spec 
Added Files:
	linphone-0.12.2-pkgconfig.patch 
Log Message:
pkgconfig and -devel fixes

linphone-0.12.2-pkgconfig.patch:

--- NEW FILE linphone-0.12.2-pkgconfig.patch ---
--- linphone-0.12.2/share/Makefile.in.orig	2005-03-23 16:26:52.922690626 -0500
+++ linphone-0.12.2/share/Makefile.in	2005-03-23 16:27:13.949932428 -0500
@@ -184,7 +184,7 @@
 confexdir = $(datadir)/linphonec
 confex_DATA = linphonec
 
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = linphone.pc
 
 EXTRA_DIST = $(LINPHONE_SOUNDS) \
--- linphone-0.12.2/share/linphone.pc.in.orig	2005-03-23 21:10:49.392763407 -0500
+++ linphone-0.12.2/share/linphone.pc.in	2005-03-23 21:11:21.983938389 -0500
@@ -1,7 +1,7 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 
 Name: liblinphone


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-3/linphone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linphone.spec	19 Mar 2005 17:52:45 -0000	1.5
+++ linphone.spec	24 Mar 2005 12:40:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        0.12.2
-Release:        5
+Release:        7
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://simon.morlat.free.fr/download/0.12.2/source/linphone-0.12.2.tar.gz
 Patch:          linphone-0.12.2-docs.patch
 Patch1:         linphone-0.12.2-speex.patch
+Patch2:         linphone-0.12.2-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@@ -33,7 +34,7 @@
 %package devel
 Summary:        Development libraries for linphone
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release} glib2-devel
 
 %description    devel
 Libraries required to develop software with linphone
@@ -42,6 +43,7 @@
 %setup -q
 %patch -p 1 -b .docs
 %patch1 -p 1 -b .speex
+%patch2 -p 1 -b .pkgconfig
 rm -r $RPM_BUILD_DIR/linphone-0.12.2/oRTP/docs
 rm -r $RPM_BUILD_DIR/linphone-0.12.2/speex
 
@@ -85,6 +87,12 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-7
+- pkgconfig and -devel fixes
+
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-6
+- Fix build on x86_64
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.12.2-5
 - %%