rpms/hsqldb/devel .cvsignore,1.5,1.6 hsqldb.spec,1.6,1.7
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Aug 4 10:44:02 UTC 2005
Author: gbenson
Update of /cvs/dist/rpms/hsqldb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5665
Modified Files:
.cvsignore hsqldb.spec
Log Message:
BC-compile
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 4 Aug 2005 09:09:58 -0000 1.5
+++ .cvsignore 4 Aug 2005 10:43:59 -0000 1.6
@@ -1,4 +1,4 @@
hsqldb_1_8_0_1-RHCLEAN.zip
hsqldb
-noarch
+i386
*.src.rpm
Index: hsqldb.spec
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hsqldb.spec 4 Aug 2005 09:09:58 -0000 1.6
+++ hsqldb.spec 4 Aug 2005 10:43:59 -0000 1.7
@@ -3,7 +3,7 @@
%define name hsqldb
%define version 1.80.1
%define cvs_version 1_8_0_1
-%define release 1jpp_0fc
+%define release 1jpp_1fc
Name: %{name}
Version: %{version}
@@ -24,8 +24,11 @@
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: servletapi5
Group: Development/Java
-Buildarch: noarch
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+# libgcj aot-compiled native libraries
+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
HSQLdb is a relational database engine written in JavaTM , with a JDBC
@@ -133,6 +136,8 @@
cp -r doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp index.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+aot-compile-rpm
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -150,6 +155,7 @@
ln -s $(build-classpath hsqldb) hsqldb.jar
ln -s $(build-classpath servletapi5) servlet.jar
)
+%{_bindir}/rebuild-gcj-db
%preun
if [ "$1" = "0" ]; then
@@ -159,6 +165,9 @@
%{_sbindir}/groupdel %{name} >> /dev/null 2>&1 || :
fi
+%postun
+%{_bindir}/rebuild-gcj-db
+
%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -180,6 +189,7 @@
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/server.properties
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/webserver.properties
%attr(0600,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/sqltool.rc
+%attr(-,root,root) %{_libdir}/gcj/%{name}
%files manual
%defattr(0644,root,root,0755)
@@ -194,6 +204,9 @@
%{_datadir}/%{name}
%changelog
+* Thu Aug 4 2005 Gary Benson <gbenson at redhat.com> 0:1.80.1-1jpp_1fc
+- BC-compile.
+
* Wed Aug 3 2005 Gary Benson <gbenson at redhat.com>
- Upgrade to 1.8.0.1 (#164072).
More information about the fedora-cvs-commits
mailing list