rpms/howl-logger/devel howl-logger.spec,1.4,1.5

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jul 29 09:14:49 UTC 2005


Author: gbenson

Update of /cvs/dist/rpms/howl-logger/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18050

Modified Files:
	howl-logger.spec 
Log Message:
Switch to aot-compile-rpm and build on ia64, ppc64, s390 and s390x


Index: howl-logger.spec
===================================================================
RCS file: /cvs/dist/rpms/howl-logger/devel/howl-logger.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- howl-logger.spec	28 Jun 2005 11:32:57 -0000	1.4
+++ howl-logger.spec	29 Jul 2005 09:14:45 -0000	1.5
@@ -1,6 +1,6 @@
 %define name		howl-logger
 %define version		0.1.8
-%define release		1jpp_2fc
+%define release		1jpp_3fc
 %define	section		free
 
 
@@ -22,10 +22,9 @@
 BuildRequires:	ant-junit
 BuildRoot:	%{_tmppath}/%{name}-%{version}-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
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 
 %description
 HOWL is a logger implementation providing features 
@@ -50,16 +49,6 @@
 %build
 ant compile-all jdoc-all
 
-gcj-dbtool -n bin/%{name}-%{version}.db 64
-aot-compile \
-    bin/howl.jar \
-    bin/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
-gcj-dbtool -f \
-    bin/%{name}-%{version}.db \
-    bin/howl.jar \
-    %{_libdir}/lib%{name}-%{version}.jar.so
-
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -67,35 +56,27 @@
         $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 bin/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
-install -m 644 bin/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
-
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr doc/jdoc/public/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
+aot-compile-rpm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
 
 %files
 %defattr(-,root,root)
 %doc LICENSE.txt
 %{_javadir}/*
-%attr(0755,root,root) %{_libdir}/lib*.jar.so
-%{_libdir}/*/*/%{name}-%{version}.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(-,root,root)
@@ -103,6 +84,10 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jul 29 2005 Gary Benson <gbenson at redhat.com> 0:0.1.8-1jpp_3fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
 * Tue Jun 28 2005 Gary Benson <gbenson at redhat.com> 0:0.1.8-1jpp_2fc
 - BC-compile.
 




More information about the fedora-cvs-commits mailing list