rpms/db4o/devel db4o.spec,1.2,1.3 db4o.pc,1.1,NONE

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/extras/rpms/db4o/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20504/devel

Modified Files:
	db4o.spec 
Removed Files:
	db4o.pc 
Log Message:
auto-import db4o-5.5-9 on branch devel from db4o-5.5-9.src.rpm


Index: db4o.spec
===================================================================
RCS file: /cvs/extras/rpms/db4o/devel/db4o.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- db4o.spec	9 Aug 2006 19:14:46 -0000	1.2
+++ db4o.spec	24 Aug 2006 22:30:18 -0000	1.3
@@ -1,16 +1,12 @@
-# nasty hack for mono until the problem is sorted....
-%define monodir %{_prefix}/lib
-
-%define debug_packahe %{nil}
+%define debug_package %{nil}
 
 Summary: A native OODBMS for Java/.NET/Mono - Mono version
 Name: db4o
 Version: 5.5
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: Development/Libraries
 Source: http://213.203.204.172/downloads/db4o-5.5-mono.tar.gz
-Source1: db4o.pc
 URL: http://www.db4o.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: mono-devel
@@ -22,7 +18,7 @@
 
 %package doc
 Summary: Documentation and API for db4o
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Group: Documentation
 
 %description doc
@@ -40,6 +36,7 @@
 %setup -q 
 sed -i 's/\r//' doc/tutorial/vb/index.html
 sed -i 's/\r//' doc/tutorial/index.html
+sed 's!/usr/lib!%{_libdir}!' -i Makefile
 
 %build
 rm -rf %{buildroot}
@@ -48,13 +45,23 @@
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
-mkdir -p %{buildroot}/%{monodir}/pkgconfig
-install -m 0644 %{SOURCE1} %{buildroot}%{monodir}/pkgconfig/db4o.pc
-mkdir -p %{buildroot}/%{monodir}/mono/gac
-gacutil -i dll/db4o.dll -f -package db4o -root %{buildroot}%{monodir}
-mkdir -p %{buildroot}%{monodir}/mono/db4o
-cp %{buildroot}%{monodir}/db4o/* %{buildroot}%{monodir}/mono/db4o
-rm -rf %{buildroot}%{monodir}/db4o
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+mkdir -p %{buildroot}/%{_libdir}/mono/gac
+gacutil -i dll/db4o.dll -f -package db4o -root %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_libdir}/mono/db4o
+cp %{buildroot}%{_libdir}/db4o/* %{buildroot}%{_libdir}/mono/db4o
+rm -rf %{buildroot}%{_libdir}/db4o
+
+cat <<EOF >%{buildroot}/%{_libdir}/pkgconfig/db4o.pc
+prefix=%{_prefix}
+exec_prefix=%{_prefix}
+libdir=%{_libdir}
+
+Name: db4o
+Description: db4o - an object based database system
+Version: 5.5
+Libs: -r:%{_libdir}/mono/db4o/db4o.dll
+EOF
 
 %clean
 rm -rf %{buildroot}
@@ -62,20 +69,23 @@
 %files
 %defattr(-,root,root)
 %doc README.txt
-%{monodir}/mono/db4o/
-%{monodir}/mono/gac/db4o/
+%{_libdir}/mono/db4o/
+%{_libdir}/mono/gac/db4o/
 
 %files doc
 %doc doc/*
 
 %files devel
-%{monodir}/pkgconfig/db4o.pc
+%{_libdir}/pkgconfig/db4o.pc
 
 %changelog
-* Wed Aug 09 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.5-8
-- fixed pkgconfig error
+* Wed Aug 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.5-9
+- Removed monodir hack
+- Added makefile patch
+- Added release requirement for docs subpackage
 
-* Wed Aug 09 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.5-7
+* Wed Aug 09 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 5.5-8
+- Fixed a few other bits
 - Changed from Dev/Doc to just Doc for the doc package
 - Removed debug-package (empty)
 - Added R pkg-config to the devel package


--- db4o.pc DELETED ---