Author: glen Date: Thu Mar 1 21:53:46 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - separated -server
---- Files affected: SPECS: hsqldb.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/hsqldb.spec diff -u SPECS/hsqldb.spec:1.10 SPECS/hsqldb.spec:1.11 --- SPECS/hsqldb.spec:1.10 Thu Mar 1 22:48:10 2007 +++ SPECS/hsqldb.spec Thu Mar 1 22:53:41 2007 @@ -1,8 +1,6 @@ # $Revision$, $Date$ -# # TODO # - make build with java 1.6 -# - separate server # # Conditional build: %bcond_without binary # do not use binary jar, but compile (needs java < 1.6) @@ -12,7 +10,7 @@ Summary(pl.UTF-8): Silnik relacyjnych baz danych SQL napisany w Javie Name: hsqldb Version: 1.8.0.7 -Release: 0.3 +Release: 0.4 License: BSD Style Group: Development/Languages/Java Source0: http://dl.sourceforge.net/hsqldb/%{name}_%{_ver}.zip @@ -31,17 +29,8 @@ BuildRequires: junit BuildRequires: rpmbuild(macros) >= 1.300 BuildRequires: servletapi4 -Requires(postun): /usr/sbin/groupdel -Requires(postun): /usr/sbin/userdel -Requires(pre): /bin/id -Requires(pre): /usr/bin/getgid -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/sbin/useradd -Requires: servletapi4 -Provides: group(hsqldb) -Provides: user(hsqldb) -Buildarch: noarch -Buildroot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description HSQLDB is the leading SQL relational database engine written in Java. @@ -81,6 +70,7 @@ Summary: Javadoc for HSQLDB Summary(pl.UTF-8): Dokumentacja javadoc do HSQLDB Group: Development/Languages/Java +Requires: package-utils %description javadoc Javadoc for HSQLDB. @@ -100,6 +90,24 @@ %description demo -l pl.UTF-8 Programy demonstracyjne i przykładowe dla HSQLDB. +%package server +Summary: HSQLDB server +Group: Applications/Databases +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: servletapi4 +Provides: group(hsqldb) +Provides: user(hsqldb) +Conflicts: %{name} < 1.8.0.7-0.4 + +%description server +HSQLDB server. + %prep %setup -q -n %{name} %patch0 @@ -166,15 +174,15 @@ %clean rm -rf $RPM_BUILD_ROOT -%pre +%pre server %groupadd -g 169 %{name} %useradd -u 169 -g %{name} -s /bin/sh -d %{_localstatedir}/lib/%{name} %{name} -%post +%post server ln -sf $(build-classpath hsqldb) %{_localstatedir}/lib/%{name}/lib/hsqldb.jar ln -sf $(build-classpath servletapi4) %{_localstatedir}/lib/%{name}/lib/servlet.jar -%preun +%preun server if [ "$1" = "0" ]; then rm -f %{_localstatedir}/lib/%{name}/lib/hsqldb.jar rm -f %{_localstatedir}/lib/%{name}/lib/servlet.jar @@ -195,14 +203,6 @@ %defattr(644,root,root,755) %doc doc/hsqldb_lic.txt %{_javadir}/* -%attr(755,root,root) %{_bindir}/* -%attr(754,root,root) /etc/rc.d/init.d/%{name} -%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} -%attr(755,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/data -%{_localstatedir}/lib/%{name}/lib -%{_localstatedir}/lib/%{name}/server.properties -%{_localstatedir}/lib/%{name}/webserver.properties -%attr(600,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/sqltool.rc %files manual %defattr(644,root,root,755) @@ -216,12 +216,26 @@ %defattr(644,root,root,755) %{_datadir}/%{name} +%files server +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/* +%attr(754,root,root) /etc/rc.d/init.d/%{name} +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} +%attr(755,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/data +%{_localstatedir}/lib/%{name}/lib +%{_localstatedir}/lib/%{name}/server.properties +%{_localstatedir}/lib/%{name}/webserver.properties +%attr(600,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/sqltool.rc + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2007/03/01 21:53:41 glen +- separated -server + Revision 1.10 2007/03/01 21:48:10 glen - add binary bcond, can now package on ac ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hsqldb.spec?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
