packages: openfire/openfire.spec - unify, update todo

[glen]

Author: glen                         Date: Sat May 23 16:41:06 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify, update todo

---- Files affected:
packages/openfire:
   openfire.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/openfire/openfire.spec
diff -u packages/openfire/openfire.spec:1.18 packages/openfire/openfire.spec:1.19
--- packages/openfire/openfire.spec:1.18	Fri May 22 19:00:00 2009
+++ packages/openfire/openfire.spec	Sat May 23 18:41:01 2009
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
-#
 # TODO:
-# - PLDize at all...
+# - noarch or no noarch? PASZCUZZ!
+# - FHS (configs in /etc, executables in /usr/(s)bin, discard the symlinks)
 #
 %define		ver	%(echo %{version} | tr . _)
 Summary:	Openfire XMPP Server
 Name:		openfire
 Version:	3.6.4
 Release:	1
-# Source0 URL: http://www.igniterealtime.org/downloads/download-landing.jsp?file=openfire/openfire_src_3_6_4.tar.gz
+# Source0Download: http://www.igniterealtime.org/downloads/download-landing.jsp?file=openfire/openfire_src_3_6_4.tar.gz
 Source0:	%{name}_src_%{ver}.tar.gz
 # Source0-md5:	0b5417368355045afbbfac4155efd988
 Source1:	%{name}.sysconfig
@@ -46,31 +46,31 @@
 %endif
 
 %build
-required_jars="ant commons-httpclient commons-el commons-lang commons-logging jasper-compiler jasper-runtime jdom jsp-api mail servletapi5 qdox"
 cd build
+required_jars="ant commons-httpclient commons-el commons-lang commons-logging jasper-compiler jasper-runtime jdom jsp-api mail servletapi5 qdox"
 CLASSPATH=lib/ant-jive-edition.jar:lib/ant-contrib.jar:lib/ant-subdirtask.jar:lib/xmltask.jar:lib/pack200task.jar:lib/merge/mina-core.jar:lib/merge/mina-filter-compression.jar:lib/merge/mina-filter-ssl.jar:lib/merge/dom4j.jar:lib/merge/xpp3.jar:lib/merge/proxool.jar:lib/merge/stringprep.jar:lib/merge/jetty.jar:lib/merge/jetty-util.jar:lib/merge/jetty-sslengine.jar:lib/merge/jzlib.jar:lib/merge/jstun-0.6.1.jar:lib/merge/shaj.jar:lib/dist/jdic.jar:lib/i4jruntime.jar:lib/merge/jmdns.jar:lib/dist/bouncycastle.jar:lib/merge/rome.jar:lib/merge/rome-fetcher.jar:lib/merge/jstl.jar:lib/merge/dbutil.jar:lib/merge/standard.jar:$(build-classpath $required_jars)
 
 export LC_ALL=en_US
 
-%ant -Dbuild.sysclasspath=only -Dno.jspc=true openfire
+%ant openfire \
+	-Dbuild.sysclasspath=only \
+	-Dno.jspc=true
 %ant jspc
-%ant -Dplugin=search plugin
-cd ..
+%ant plugin \
+	-Dplugin=search
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# Prep the install location.
-rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/rc.d/init.d,%{_sysconfdir}/%{name},/etc/sysconfig,%{_datadir}/%{name},/var/log/%{name}}
 # Copy over the main install tree.
-cp -R target/openfire $RPM_BUILD_ROOT%{_datadir}
+cp -a target/openfire $RPM_BUILD_ROOT%{_datadir}
 rm -rf  $RPM_BUILD_ROOT%{_datadir}/openfire/logs
 # Set up the init script.
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/openfire
 # Set up the sysconfig file.
 install openfire.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/openfire
 # Copy over the i18n files
-cp -R resources/i18n $RPM_BUILD_ROOT%{_datadir}/openfire/resources/i18n
+cp -a resources/i18n $RPM_BUILD_ROOT%{_datadir}/openfire/resources/i18n
 # Make sure scripts are executable
 chmod 755 $RPM_BUILD_ROOT%{_datadir}/openfire/bin/extra/openfired
 chmod 755 $RPM_BUILD_ROOT%{_datadir}/openfire/bin/extra/redhat-postinstall.sh
@@ -99,8 +99,8 @@
 
 %preun
 if [ "$1" = "0" ]; then
-       %service -q %{name} stop
-       /sbin/chkconfig --del %{name}
+	%service -q %{name} stop
+	/sbin/chkconfig --del %{name}
 fi
 
 %post
@@ -109,7 +109,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README.html LICENSE.html changelog.html documentation/
+%doc README.html LICENSE.html changelog.html documentation
 %attr(750, daemon, daemon) %dir %{_datadir}/openfire
 %dir %{_datadir}/openfire/bin
 %attr(755,root,root) %{_datadir}/openfire/bin/openfire.sh
@@ -157,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2009/05/23 16:41:01  glen
+- unify, update todo
+
 Revision 1.18  2009/05/22 17:00:00  paszczus
 - added missing service restart (TODO removed)
 - everything now works fine, rel 1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openfire/openfire.spec?r1=1.18&r2=1.19&f=u