rpms/qof/devel qofla-dir-32.h, NONE, 1.1 qofla-dir-64.h, NONE, 1.1 qofla-dir.h, NONE, 1.1 qof.spec, 1.20, 1.21

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/pkgs/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15608

Modified Files:
	qof.spec 
Added Files:
	qofla-dir-32.h qofla-dir-64.h qofla-dir.h 
Log Message:
Fix multilib conflict, BZ 343011.



--- NEW FILE qofla-dir-32.h ---
/***************************************************************************
 *            qofla-dir.h.in
 *
 *  Mon Dec 20 20:27:48 2004
 *  Copyright  2004  Neil Williams
 *  linux at codehelp.co.uk
 ****************************************************************************/

/*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

#define QOF_LIB_DIR "/usr/lib"



--- NEW FILE qofla-dir-64.h ---
/***************************************************************************
 *            qofla-dir.h.in
 *
 *  Mon Dec 20 20:27:48 2004
 *  Copyright  2004  Neil Williams
 *  linux at codehelp.co.uk
 ****************************************************************************/

/*
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

#define QOF_LIB_DIR "/usr/lib64"



--- NEW FILE qofla-dir.h ---
#include <bits/wordsize.h>

#if __WORDSIZE == 32
#include "qofla-dir-32.h"
#elif __WORDSIZE == 64
#include "qofla-dir-64.h"
#else
#error "Unknown word size"
#endif


Index: qof.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qof/devel/qof.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qof.spec	14 Feb 2008 01:52:19 -0000	1.20
+++ qof.spec	2 Apr 2008 16:25:24 -0000	1.21
@@ -1,12 +1,15 @@
 Name:           qof
 Version:        0.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://qof.sf.net
 Source0:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.gz
+Source1:        qofla-dir-32.h
+Source2:        qofla-dir-64.h
+Source3:        qofla-dir.h
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -78,6 +81,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT/usr/share/doc/qof/html .
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/qof
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/qof
+rm $RPM_BUILD_ROOT%{_includedir}/qof/qofla-dir.h
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/qof
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
@@ -111,6 +118,9 @@
 %doc html
 
 %changelog
+* Wed Apr 02 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.5-2
+- Fix multilib conflict, BZ 343011.
+
 * Fri Feb 8 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.7.5-1
 - Upgrade to upstream 0.7.5.
 - Rebuild for new gcc.