Author: pawelz Date: Tue Oct 6 09:46:30 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.8.1.1 - deps are case sensitive for rpm (but not for rpmbuild (?)) - fixed link to servlet.jar - more TODO
---- Files affected: packages/hsqldb: hsqldb.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: packages/hsqldb/hsqldb.spec diff -u packages/hsqldb/hsqldb.spec:1.26 packages/hsqldb/hsqldb.spec:1.27 --- packages/hsqldb/hsqldb.spec:1.26 Tue Oct 6 10:04:59 2009 +++ packages/hsqldb/hsqldb.spec Tue Oct 6 11:46:25 2009 @@ -1,6 +1,9 @@ # $Revision$, $Date$ # TODO # - make build with java 1.6 +# - init script for webserver +# - pldized init script +# - set value for Xmx in sysconfig. Default is too low to run hsqldb server. # # Conditional build: %bcond_with binary # use binary jar instead of compiling (which needs java < 1.6) @@ -15,12 +18,12 @@ Summary: SQL relational database engine written in Java Summary(pl.UTF-8): Silnik relacyjnych baz danych SQL napisany w Javie Name: hsqldb -Version: 1.8.0.9 -Release: 2 +Version: 1.8.1.1 +Release: 1 License: BSD-like Group: Development/Languages/Java Source0: http://dl.sourceforge.net/hsqldb/%{name}_%{ver}.zip -# Source0-md5: c3f8010e3e2c73143eb702b7f28f0c8e +# Source0-md5: 4114ba2e6aba58e6bfd3fa283d7dbc37 Source1: %{name}-standard.cfg Source2: %{name}-standard-server.properties Source3: %{name}-standard-webserver.properties @@ -37,7 +40,7 @@ %if %{without binary} BuildRequires: jdk < 1.6 BuildRequires: java-junit -BuildRequires: java(servlet) +BuildRequires: java(Servlet) %endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -113,7 +116,7 @@ Requires(pre): /usr/sbin/useradd Requires: %{name} = %{version}-%{release} Requires: rc-scripts -Requires: java(servlet) +Requires: java(Servlet) Provides: group(hsqldb) Provides: user(hsqldb) @@ -147,7 +150,7 @@ jsse/jcert \ java/jdbc-stdext \ junit \ - servlet \ + servlet-api \ " CLASSPATH=$(build-classpath $required_jars) %endif @@ -182,7 +185,7 @@ # lib install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/lib install lib/functions $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/lib -ln -sf %{_javadir}/servlet.jar $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/lib/servlet.jar +ln -sf %{_javadir}/servlet-api.jar $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/lib/servlet.jar # data install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data # demo @@ -257,6 +260,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.27 2009/10/06 09:46:25 pawelz +- up to 1.8.1.1 +- deps are case sensitive for rpm (but not for rpmbuild (?)) +- fixed link to servlet.jar +- more TODO + Revision 1.26 2009/10/06 08:04:59 pawelz - reverted last commit. It's to early for development :/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hsqldb/hsqldb.spec?r1=1.26&r2=1.27&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
