[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/geronimo-specs/devel .cvsignore, 1.3, 1.4 geronimo-specs.spec, 1.4, 1.5



Author: gbenson

Update of /cvs/dist/rpms/geronimo-specs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27233

Modified Files:
	.cvsignore geronimo-specs.spec 
Log Message:
Nativify


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/geronimo-specs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jun 2005 12:25:24 -0000	1.3
+++ .cvsignore	27 Jun 2005 13:38:51 -0000	1.4
@@ -1,4 +1,4 @@
 geronimo-1.0-M2-src.tar.gz
 geronimo-1.0-M2
-noarch
+i386
 *.src.rpm


Index: geronimo-specs.spec
===================================================================
RCS file: /cvs/dist/rpms/geronimo-specs/devel/geronimo-specs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geronimo-specs.spec	15 Jun 2005 17:01:31 -0000	1.4
+++ geronimo-specs.spec	27 Jun 2005 13:38:51 -0000	1.5
@@ -2,7 +2,7 @@
 %define name            geronimo-specs
 %define version         1.0
 %define mstone		M2
-%define release         0.%{mstone}.2jpp_1fc
+%define release         0.%{mstone}.2jpp_2fc
 %define section         free
 
 Summary:        Geronimo J2EE server J2EE specifications
@@ -15,7 +15,6 @@
 Epoch:          0
 License:        Apache Software License 2
 Group:          Development/Libraries/Java
-BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  mx4j >= 0:2.0.1
 BuildRequires:	servletapi5
@@ -23,6 +22,11 @@
 Requires:	mx4j >= 0:2.0.1
 Requires:	servletapi5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+# libgcj aot-compiled native libraries
+BuildRequires:         gcc-java >= 4.0.0-0.43
+BuildRequires:         java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
+Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
+ExclusiveArch:         %{ix86} x86_64 ppc alpha
 
 %description
 Geronimo is Apache's ASF-licenced J2EE server project.
@@ -78,6 +82,19 @@
     jar cf $jarfile -C $classdir .
 done
 
+gcj-dbtool -n build/lib/%{name}-%{version}.db 512
+for jar in build/lib/*.jar; do
+    jar=`basename $jar .jar`
+    aot-compile \
+        build/lib/$jar.jar \
+        build/lib/lib$jar-%{version}.jar.so \
+        "$RPM_OPT_FLAGS -fPIC"
+    gcj-dbtool -f \
+        build/lib/%{name}-%{version}.db \
+        build/lib/$jar.jar \
+        %{_libdir}/lib$jar-%{version}.jar.so
+done
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,19 +109,37 @@
     ln -s %{bname}/$base.jar $RPM_BUILD_ROOT%{_javadir}/$compat.jar
 done
 
+install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
+install -m 755 build/lib/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
+
+gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
+install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
+install -m 644 build/lib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/usr/bin/rebuild-gcj-db %{_libdir}
+
+%postun
+/usr/bin/rebuild-gcj-db %{_libdir}
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
 %{_javadir}/%{bname}
+%attr(0755,root,root) %{_libdir}/*.so
+%{_libdir}/*/*/*.db
 
 %files compat
 %defattr(-,root,root,-)
 %{_javadir}/*.jar
 
 %changelog
+* Mon Jun 27 2005 Gary Benson <gbenson at redhat.com> 0:1.0-0.M2.2jpp_2fc
+- BC-compile.
+
 * Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:1.0-0.M2.2jpp_1fc
 - Build into Fedora.
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]