rpms/db4o/devel db4o-74-make.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 db4o.spec, 1.14, 1.15 import.log, 1.2, 1.3 sources, 1.4, 1.5 db4o-6.1-usesyslibs.patch, 1.1, NONE
Paul F. Johnson
pfj at fedoraproject.org
Wed Jan 20 20:54:59 UTC 2010
Author: pfj
Update of /cvs/pkgs/rpms/db4o/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23451/devel
Modified Files:
.cvsignore db4o.spec import.log sources
Added Files:
db4o-74-make.patch
Removed Files:
db4o-6.1-usesyslibs.patch
Log Message:
Bump to much newer version
Multiple spec file changes
db4o-74-make.patch:
Db4oTool/Db4oTool.Tests/Makefile | 2 +-
Db4oTool/Db4oTool/Makefile | 2 +-
Db4objects.Db4o.Instrumentation/Makefile | 6 +++---
Db4objects.Db4o.Linq.Tests/Makefile | 2 +-
Db4objects.Db4o.Linq/Makefile | 6 +++---
Db4objects.Db4o.NativeQueries/Makefile | 6 +++---
Db4objects.Db4o.Tests/Makefile | 2 +-
Makefile | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
--- NEW FILE db4o-74-make.patch ---
--- db4o-7.4/src/Db4objects.Db4o.Instrumentation/Makefile 2010-01-20 19:57:12.000000000 +0000
+++ db4o-7.4/src/Db4objects.Db4o.Instrumentation/Makefile-new 2010-01-20 19:57:46.000000000 +0000
@@ -1,8 +1,8 @@
-include ../../db4o.net/include.mk
+include ../include.mk
-OUTDIR = ../../db4o.net/bin
+OUTDIR = ../bin
TARGET = library
ASSEMBLY = $(INSTR)
-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
+REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(CECIL) -r:$(FLOWANALYSIS)
--- db4o-7.4/src/Db4objects.Db4o.Linq/Makefile 2010-01-06 19:43:08.000000000 +0000
+++ db4o-7.4/src/Db4objects.Db4o.Linq/Makefile-new 2010-01-20 19:58:33.000000000 +0000
@@ -1,8 +1,8 @@
-include ../../db4o.net/include.mk
+include ../include.mk
-OUTDIR = ../../db4o.net/bin
+OUTDIR = ../bin
TARGET = library
ASSEMBLY = Db4objects.Db4o.Linq.dll
-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
+REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(CECIL) -r:$(FLOWANALYSIS)
--- db4o-7.4/src/Db4objects.Db4o.Linq.Tests/Makefile 2010-01-06 19:43:00.000000000 +0000
+++ db4o-7.4/src/Db4objects.Db4o.Linq.Tests/Makefile-new 2010-01-20 19:59:11.000000000 +0000
@@ -3,5 +3,5 @@
TARGET = exe
ASSEMBLY = $(LINQ_TESTS)
-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT) -r:$(OUTDIR)/$(LINQ) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
+REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT) -r:$(OUTDIR)/$(LINQ) -r:$(CECIL) -r:$(FLOWANALYSIS)
OPT_MCS_FLAGS = -main:Db4objects.Db4o.Linq.Tests.AllTests
--- db4o-7.4/src/Db4objects.Db4o.NativeQueries/Makefile 2010-01-06 19:43:08.000000000 +0000
+++ db4o-7.4/src/Db4objects.Db4o.NativeQueries/Makefile-new 2010-01-20 19:59:51.000000000 +0000
@@ -1,8 +1,8 @@
-include ../../db4o.net/include.mk
+include ../include.mk
-OUTDIR = ../../db4o.net/bin
+OUTDIR = ../bin
TARGET = library
ASSEMBLY = $(NQ)
-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
+REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(CECIL) -r:$(FLOWANALYSIS)
--- db4o-7.4/src/Makefile 2010-01-20 20:05:52.000000000 +0000
+++ db4o-7.4/src/Makefile-new 2010-01-20 20:06:00.000000000 +0000
@@ -20,7 +20,7 @@
prebuild:
[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
- cp $(LIBS)/*.dll $(OUTDIR)
+# cp $(LIBS)/*.dll $(OUTDIR)
build: core nq linq tool tests
--- db4o-7.4/src/Db4oTool/Db4oTool/Makefile 2010-01-06 19:43:02.000000000 +0000
+++ db4o-7.4/src/Db4oTool/Db4oTool/Makefile-new 2010-01-20 20:08:42.000000000 +0000
@@ -5,4 +5,4 @@
TARGET = exe
ASSEMBLY = $(TOOL)
-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS) -r:$(OUTDIR)/$(GETOPTIONS)
+REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(CECIL) -r:$(FLOWANALYSIS) -r:$(GETOPTIONS)
--- db4o-7.4/src/Db4oTool/Db4oTool.Tests/Makefile 2010-01-06 19:43:08.000000000 +0000
+++ db4o-7.4/src/Db4oTool/Db4oTool.Tests/Makefile-new 2010-01-20 20:10:05.000000000 +0000
@@ -9,4 +9,4 @@
TARGET = exe
ASSEMBLY = $(TOOL_TESTS)
-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS) -r:$(OUTDIR)/$(TOOL) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT)
+REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(CECIL) -r:$(FLOWANALYSIS) -r:$(OUTDIR)/$(TOOL) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT)
--- db4o-7.4/src/Db4objects.Db4o.Tests/Makefile 2010-01-06 19:42:58.000000000 +0000
+++ db4o-7.4/src/Db4objects.Db4o.Tests/Makefile-new 2010-01-20 20:13:01.000000000 +0000
@@ -3,5 +3,5 @@
TARGET = exe
ASSEMBLY = $(TESTS)
-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS) -r:System.Drawing
+REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(CECIL) -r:$(FLOWANALYSIS) -r:System.Drawing
OPT_MCS_FLAGS = -main:Db4objects.Db4o.Tests.AllTests
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/db4o/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 7 Mar 2007 00:33:24 -0000 1.4
+++ .cvsignore 20 Jan 2010 20:54:58 -0000 1.5
@@ -1 +1 @@
-db4o-6.1-mono.tar.gz
+db4o-7.4-net2.zip
Index: db4o.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4o/devel/db4o.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- db4o.spec 26 Oct 2009 20:03:44 -0000 1.14
+++ db4o.spec 20 Jan 2010 20:54:59 -0000 1.15
@@ -4,17 +4,17 @@
Summary: A native OODBMS for Java/.NET/Mono - Mono version
Name: db4o
-Version: 6.1
-Release: 8%{?dist}
+Version: 7.4
+Release: 1%{?dist}
License: GPLv2
-Patch0: db4o-6.1-usesyslibs.patch
+Patch0: db4o-74-make.patch
Group: Development/Libraries
-Source: http://213.203.204.172/downloads/%{name}-%{version}-mono.tar.gz
+Source: %{name}-%{version}-net2.zip
URL: http://www.db4o.com/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mono-devel, mono-cecil-flowanalysis-devel
-ExcludeArch: sparc64
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x
%description
Embed db4o's native Java or .NET/Mono open source object database
@@ -39,10 +39,10 @@ Development files for db4o
%prep
%setup -q
-%patch0 -p1 -b .syslibs
+%patch0 -p1 -b .makepatch
#sed -i 's/\r//' doc/tutorial/vb/index.html
#sed -i 's/\r//' doc/tutorial/index.html
-sed 's!/usr/lib!%{_libdir}!' -i Makefile
+sed 's!/usr/lib!%{_libdir}!' -i src/Makefile
rm -rf src/Libs/*
sed -i 's|Mono.Cecil.dll|%{_libdir}/mono/gac/Mono.Cecil/%{cecilver}__%{ceciltoken}/Mono.Cecil.dll|' src/include.mk
sed -i 's|Cecil.FlowAnalysis.dll|%{_libdir}/mono/Cecil.FlowAnalysis/Cecil.FlowAnalysis.dll|' src/include.mk
@@ -50,22 +50,22 @@ sed -i 's|Mono.GetOptions.dll|%{_libdir}
%build
rm -rf %{buildroot}
-make
+cd src
+make
%install
rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
mkdir -p %{buildroot}/%{_libdir}/mono/gac
mkdir -p %{buildroot}/%{_bindir}
-gacutil -i bin/Db4objects.Db4o.dll -f -package db4o -root %{buildroot}%{_libdir}
-gacutil -i bin/Db4objects.Db4o.Tools.dll -f -package db4o -root %{buildroot}%{_libdir}
-gacutil -i bin/Db4oUnit.dll -f -package db4o -root %{buildroot}%{_libdir}
-gacutil -i bin/Db4oUnit.Extensions.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i src/bin/Db4objects.Db4o.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i src/bin/Db4objects.Db4o.Instrumentation.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i src/bin/Db4objects.Db4o.Linq.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i src/bin/Db4objects.Db4o.NativeQueries.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i src/bin/Db4oUnit.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i src/bin/Db4oUnit.Extensions.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
-cp bin/*.exe %{buildroot}%{_libdir}/mono/db4o/
+cp src/bin/* %{buildroot}%{_libdir}/mono/db4o
cat <<EOF >%{buildroot}/%{_libdir}/pkgconfig/db4o.pc
prefix=%{_prefix}
@@ -74,22 +74,40 @@ libdir=%{_libdir}
Name: db4o
Description: db4o - an object based database system
-Version: 6.1
-Libs: -r:%{_libdir}/mono/db4o/Db4objects.Db4o.dll, -r:%{_libdir}/mono/db4o/Db4oUnit, -r:%{_libdir}/mono/db4o/Db4objects.Db4o.Tools, -r:%{_libdir}/mono/db4o/Db4oUnit.Extensions
+Version: 7.4
+Libs: -r:%{_libdir}/mono/db4o/Db4objects.Db4o.dll, -r:%{_libdir}/mono/db4o/Db4oUnit.dll, -r:%{_libdir}/mono/db4o/Db4objects.Db4o.Instrumentation.dll, -r:%{_libdir}/mono/db4o/Db4oUnit.Extensions.dll -r:%{_libdir}/mono/db4o/Db4objects.Db4o.Linq.dll -r:%{_libdir}/mono/db4o/Db4objects.Db4o.NativeQueries.dll
EOF
-cat <<EOF >%{buildroot}/%{_bindir}/Db4oAdmin
+cat <<EOF >%{buildroot}/%{_bindir}/Db4oTool
#!/bin/sh
-env mono %{_libdir}/mono/db4o/Db4oAdmin.exe "$@"
+env mono %{_libdir}/mono/db4o/Db4oTool.exe "$@"
EOF
-cat <<EOF >%{buildroot}/%{_bindir}/Db4object.Db4o.Tests
+cat <<EOF >%{buildroot}/%{_bindir}/Db4oTool-Tests
+#!/bin/sh
+env mono %{_libdir}/mono/db4o/Db4oTool.Tests.exe "$@"
+EOF
+
+cat <<EOF >%{buildroot}/%{_bindir}/Db4o-LinqTests
+#!/bin/sh
+env mono %{_libdir}/mono/db4o/Db4object.Db4o.Linq.Tests.exe "$@"
+EOF
+
+cat <<EOF >%{buildroot}/%{_bindir}/Db4o-LinqInstrumentationTests
+#!/bin/sh
+env mono %{_libdir}/mono/db4o/Db4object.Db4o.Linq.Instrumentation.Tests.exe "$@"
+EOF
+
+cat <<EOF >%{buildroot}/%{_bindir}/Db4oTests
#!/bin/sh
env mono %{_libdir}/mono/db4o/Db4object.Db4o.Tests.exe "$@"
EOF
-chmod 755 %{buildroot}/%{_bindir}/Db4oAdmin
-chmod 755 %{buildroot}/%{_bindir}/Db4object.Db4o.Tests
+chmod 755 %{buildroot}/%{_bindir}/Db4oTool
+chmod 755 %{buildroot}/%{_bindir}/Db4oTool-Tests
+chmod 755 %{buildroot}/%{_bindir}/Db4o-LinqTests
+chmod 755 %{buildroot}/%{_bindir}/Db4o-LinqInstrumentationTests
+chmod 755 %{buildroot}/%{_bindir}/Db4oTests
%clean
rm -rf %{buildroot}
@@ -107,14 +125,10 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/db4o.pc
%changelog
-* Mon Oct 26 2009 Dennis Gilmore <dennis at asuil.us> - 6.1-8
-- ExcludeArch sparc64
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Apr 13 2009 Jesse Keating <jkeating at redhat.com> - 6.1-6
-- Re-enable ppc
+* Wed Jan 20 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 7.4-1
+- Big update
+- Fix URL
+- Lots of spec file fixes
* Fri Apr 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 6.1-5
- Alter excludearch to exclusivearch
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/db4o/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 10 Apr 2009 08:02:17 -0000 1.2
+++ import.log 20 Jan 2010 20:54:59 -0000 1.3
@@ -1,2 +1,3 @@
db4o-6_1-4_1_fc11:HEAD:db4o-6.1-4.1.fc11.src.rpm:1233876352
db4o-6_1-5_fc11:HEAD:db4o-6.1-5.fc11.src.rpm:1239350489
+db4o-7_4-1_fc13:HEAD:db4o-7.4-1.fc13.src.rpm:1264020634
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/db4o/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 7 Mar 2007 00:33:24 -0000 1.4
+++ sources 20 Jan 2010 20:54:59 -0000 1.5
@@ -1 +1 @@
-c39404a66c74315049af613dce2c84a1 db4o-6.1-mono.tar.gz
+c9cb469cb95a44076ddd2cad34e015e8 db4o-7.4-net2.zip
--- db4o-6.1-usesyslibs.patch DELETED ---
More information about the scm-commits
mailing list