On Sat, 2008-02-23 at 09:57 -0500, Christopher Tarricone wrote:
> (All one line - my email client is wrapping lines)
> export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/lib64/pkgconfig:
> $prefix/lib64/pkgconfig:/usr/local/lib64/pkgconfig

Since the relevant .pc files on my F8 x86_64 machine are in the expected
places, I just removed that line.  Seems to work.  Specifying
PKG_CONFIG_PATH to only see the lib and not lib64 directory means it
will use the non-64-bit version of opensync-1.0.pc which
returns /usr/lib/... for the PLUGINDIR.

My patch is attached.  Includes a couple other minor fixes to allow me
to build RPMs easily from the "make dist" tarball.  This is against CVS
from earlier this evening.  YMMV.

Paul
-- 
Paul Dugas, Computer Engineer                Dugas Enterprises, LLC
[EMAIL PROTECTED]        phone: 404-932-1355     522 Black Canyon Park
http://dugas.cc        fax: 866-751-6494     Canton, GA 30114 USA
? INSTALL
? Makefile
? Makefile.in
? aclocal.m4
? autom4te.cache
? barry-0.12.tar.gz
? barry.patch
? config.guess
? config.h
? config.h.in
? config.log
? config.status
? config.sub
? configure
? depcomp
? install-sh
? libbarry-0.pc
? libtool
? ltmain.sh
? missing
? stamp-h1
? examples/.deps
? examples/.libs
? examples/Makefile
? examples/Makefile.in
? examples/addcalendar
? examples/addcontact
? gui/INSTALL
? gui/Makefile
? gui/Makefile.in
? gui/aclocal.m4
? gui/autom4te.cache
? gui/config.guess
? gui/config.h
? gui/config.h.in
? gui/config.log
? gui/config.status
? gui/config.sub
? gui/configure
? gui/depcomp
? gui/install-sh
? gui/libtool
? gui/ltmain.sh
? gui/missing
? gui/stamp-h1
? gui/src/.deps
? gui/src/.libs
? gui/src/Makefile
? gui/src/Makefile.in
? gui/src/barrybackup
? man/Makefile
? man/Makefile.in
? opensync-plugin/Makefile
? opensync-plugin/Makefile.in
? opensync-plugin/aclocal.m4
? opensync-plugin/autom4te.cache
? opensync-plugin/config.guess
? opensync-plugin/config.h
? opensync-plugin/config.h.in
? opensync-plugin/config.log
? opensync-plugin/config.status
? opensync-plugin/config.sub
? opensync-plugin/configure
? opensync-plugin/depcomp
? opensync-plugin/env.pre-pkg-config
? opensync-plugin/install-sh
? opensync-plugin/libtool
? opensync-plugin/ltmain.sh
? opensync-plugin/missing
? opensync-plugin/stamp-h1
? opensync-plugin/src/.deps
? opensync-plugin/src/Makefile
? opensync-plugin/src/Makefile.in
? src/.deps
? src/.libs
? src/Makefile
? src/Makefile.in
? src/base64.lo
? src/common.lo
? src/controller.lo
? src/data.lo
? src/error.lo
? src/ldif.lo
? src/libbarry.la
? src/packet.lo
? src/parser.lo
? src/probe.lo
? src/protocol.lo
? src/r_calendar.lo
? src/r_contact.lo
? src/r_folder.lo
? src/r_memo.lo
? src/r_message.lo
? src/r_pin_message.lo
? src/r_saved_message.lo
? src/r_servicebook.lo
? src/r_task.lo
? src/record.lo
? src/socket.lo
? src/time.lo
? src/usbwrap.lo
? src/version.lo
? tools/.deps
? tools/.libs
? tools/Makefile
? tools/Makefile.in
? tools/bcharge
? tools/bidentify
? tools/bktrans
? tools/breset
? tools/btool
? tools/btranslate
? tools/pppob
? tools/upldif
Index: Makefile.am
===================================================================
RCS file: /cvsroot/barry/barry/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- Makefile.am	5 Sep 2007 21:25:00 -0000	1.6
+++ Makefile.am	25 Feb 2008 05:00:15 -0000
@@ -6,7 +6,8 @@
 	hotplug \
 	maintainer \
 	rpm \
-	udev
+	udev \
+	modprobe
 
 SUBDIRS = . src tools examples man
 # conditionally configured nested subdirectories are listed in $(subdirs)
Index: opensync-plugin/configure.ac
===================================================================
RCS file: /cvsroot/barry/barry/opensync-plugin/configure.ac,v
retrieving revision 1.3
diff -u -r1.3 configure.ac
--- opensync-plugin/configure.ac	22 Sep 2007 02:23:06 -0000	1.3
+++ opensync-plugin/configure.ac	25 Feb 2008 05:00:16 -0000
@@ -6,7 +6,6 @@
 AC_CONFIG_SRCDIR(src/barry_sync.cc)
 AC_CONFIG_HEADER(config.h)
 
-export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/lib/pkgconfig:$prefix/lib/pkgconfig:/usr/local/lib/pkgconfig
 pkg_modules="opensync-1.0 glib-2.0"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
Index: rpm/barry.spec
===================================================================
RCS file: /cvsroot/barry/barry/rpm/barry.spec,v
retrieving revision 1.23
diff -u -r1.23 barry.spec
--- rpm/barry.spec	23 Feb 2008 04:30:26 -0000	1.23
+++ rpm/barry.spec	25 Feb 2008 05:00:16 -0000
@@ -25,7 +25,7 @@
 Release: 1
 Group: Applications/Productivity
 License: GPL
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.gz
 URL: http://www.netdirect.ca/downloads/barry
 Vendor: Net Direct Inc.
 BuildRoot: %{_tmppath}/%{name}-%{release}-%{version}-root

Attachment: signature.asc
Description: This is a digitally signed message part

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Barry-devel mailing list
Barry-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/barry-devel

Reply via email to