packages: glassfish/glassfish.spec - package javadb and mq - drop NoSource:...

[pawelz]

Author: pawelz                       Date: Thu Jan  7 13:45:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package javadb and mq
- drop NoSource: 0
- rel 1

---- Files affected:
packages/glassfish:
   glassfish.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/glassfish/glassfish.spec
diff -u packages/glassfish/glassfish.spec:1.4 packages/glassfish/glassfish.spec:1.5
--- packages/glassfish/glassfish.spec:1.4	Mon Dec 28 17:36:25 2009
+++ packages/glassfish/glassfish.spec	Thu Jan  7 14:45:34 2010
@@ -1,9 +1,6 @@
 # $Revision$, $Date$
 # TODO:
 # - check if is it possible to deploy apps into glassfish using rpm
-# - what to do with other top level directories (javadb, mq). Package them as
-#   subpackages? How? Package these applications as separate specs (and use
-#   original sources, not these bundled with glassfish)?
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
@@ -14,15 +11,15 @@
 Summary:	JavaEE 6 aplication server
 Name:		glassfish
 Version:	3
-Release:	0.1
+Release:	1
 License:	GPL
 Group:		Libraries/Java
-# Source0:	http://download.java.net/glassfish/v3/release/glassfish-v3.zip
-Source0:	%{name}-v%{version}.zip
-# NoSource0-md5:	537b1c6574316ebc4dc69ba6dd26e213
-NoSource:	0
+Source0:	http://download.java.net/glassfish/v%{version}/release/%{name}-v%{version}.zip
+# Source0-md5:	537b1c6574316ebc4dc69ba6dd26e213
 Source1:	%{name}
 Source2:	%{name}.init
+Source3:	%{name}-javadb.init
+Patch0:		%{name}-asenv.conf.patch
 URL:		https://glassfish.dev.java.net/
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm >= 4.4.9-56
@@ -35,15 +32,19 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Glassfish is lightweight, flexible, and open-source java application server.
-It is full implementation of JavaEE 6.
+Glassfish is lightweight, flexible, and open-source java application
+server. It is full implementation of JavaEE 6.
 
 %prep
 %setup -q -n %{name}v%{version}
 
+%patch0 -p1
+
+find -name '*.bat' | xargs rm
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name}/{javadb,mq},%{_sbindir}}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},/etc/rc.d/init.d,%{_sbindir}}
 install -d $RPM_BUILD_ROOT{/var/lib/%{name}/domains,/var/log/%{name}}
 
@@ -53,8 +54,12 @@
 mv $RPM_BUILD_ROOT/var/lib/%{name}/domains/domain1/config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/domain1
 mv $RPM_BUILD_ROOT/var/lib/%{name}/domains/domain1/logs $RPM_BUILD_ROOT/var/log/%{name}/domain1
 
+cp -a javadb/lib $RPM_BUILD_ROOT%{_datadir}/%{name}/javadb
+cp -a mq/lib $RPM_BUILD_ROOT%{_datadir}/%{name}/mq
+
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-javadb
 
 sed -i 's, at DATADIR@,%{_datadir},' $RPM_BUILD_ROOT%{_sbindir}/%{name}
 
@@ -78,12 +83,16 @@
 
 %post
 /sbin/chkconfig --add %{name}
+/sbin/chkconfig --add %{name}-javadb
+%service %{name}-javadb restart
 %service %{name} restart
 
 %preun
 if [ "$1" = "0" ]; then
 	%service -q %{name} stop
+	%service -q %{name}-javadb stop
 	/sbin/chkconfig --del %{name}
+	/sbin/chkconfig --del %{name}-javadb
 fi
 
 %files
@@ -94,6 +103,7 @@
 %attr(770,root,glassfish) %dir %{_sysconfdir}/%{name}/*
 %config(noreplace) %attr(660,root,glassfish) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*/*
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{name}-javadb
 %attr(755,root,root) %{_sbindir}/%{name}
 %defattr(660,root,glassfish,770)
 /var/lib/%{name}
@@ -105,6 +115,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/01/07 13:45:34  pawelz
+- package javadb and mq
+- drop NoSource: 0
+- rel 1
+
 Revision 1.4  2009/12/28 16:36:25  pawelz
 - TODO
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glassfish/glassfish.spec?r1=1.4&r2=1.5&f=u