Updated for improvements to standard RPM dist.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@8216 b35dd754-fafc-0310-a699-88a17e54d16e

3_3_1_branch/build/build.xml

@@ -1072,12 +1072,39 @@
         </install4j>
 
     </target>
-    
+
     <!-- installer.rpm ========================================================================= -->
     <property name="target.rpm" value="${work.dir}/rpm" />
     <target name="installer.rpm" depends="init, dist.init" description="Builds a rpm of openfire.">
         <antcall target="dist.src"/>
 
+        <mkdir dir="${target.rpm}/SPECS" />
+        <mkdir dir="${target.rpm}/SOURCES" />
+        <mkdir dir="${target.rpm}/BUILD" />
+        <mkdir dir="${target.rpm}/SRPMS" />
+        <mkdir dir="${target.rpm}/RPMS" />
+
+        <copy todir="${target.rpm}/SPECS" file="${basedir}/build/rpm/openfire.spec" />
+        <copy todir="${target.rpm}/SOURCES" file="${basedir}/build/rpm/jre-dist.tar.gz" />
+        <copy todir="${target.rpm}/SOURCES" file="${release.dest.dir}/${release.fullname.src}.tar.gz" />
+
+        <rpm specFile="openfire.spec"
+             topDir="${target.rpm}"
+             command="-ba"
+             failOnError="true"
+             />
+             
+        <copy todir="${release.dest.dir}" >
+            <fileset dir="${target.rpm}/SRPMS" />
+            <fileset dir="${target.rpm}/RPMS/i386" />
+        </copy>
+    </target>
+    
+    <!-- installer.rpm.old ========================================================================= -->
+    <property name="target.rpm" value="${work.dir}/rpm" />
+    <target name="installer.rpm.old" depends="init, dist.init" description="Builds a rpm of openfire.">
+        <antcall target="dist.src"/>
+
         <antcall target="dist.bin">
             <!-- Don't need package for installer build -->
             <param name="no.package" value="true"/>

3_3_1_branch/build/rpm/openfire.spec

 Summary: Openfire XMPP Server
 Name: openfire
-Version: 3.3.0
+Version: 3.3.1
 Release: 1
 BuildRoot: %{_builddir}/%{name}-root
-Source0: %{name}_src_3_3_0.tar.gz
+Source0: %{name}_src_3_3_1.tar.gz
+Source1: jre-dist.tar.gz
 Group: Applications/Communications
 Vendor: Jive Software
 Packager: Jive Software
 License: GPL
-# May reevaluate this at some point.
-#Requires: jdk >= 1.5.0
 URL: http://www.igniterealtime.org/
 
+%define prefix /opt
+%define homedir %{prefix}/openfire
+
 %description
 Openfire is a leading Open Source, cross-platform IM server based on the
 XMPP (Jabber) protocol. It has great performance, is easy to setup and use,
 and delivers an innovative feature set.
 
+This particular release includes a bundled JRE.
+
 %prep
+%setup -q -n openfire_src
 
 %build
+cd build
+ant openfire
+ant -Dplugin=search plugin
+cd ..
 
 %install
-# There's no need to package this.
-rm $RPM_BUILD_ROOT/opt/openfire/logs/stderr.out
+# Prep the install location.
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{prefix}
+# Copy over the main install tree.
+cp -R target/openfire $RPM_BUILD_ROOT%{homedir}
+# Set up distributed JRE
+pushd $RPM_BUILD_ROOT%{homedir}
+gzip -cd %{SOURCE1} | tar xvf -
+popd
 # Set up the init script.
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
-cp $RPM_BUILD_ROOT/opt/openfire/bin/extra/redhat/openfired $RPM_BUILD_ROOT/etc/init.d/openfired
-chmod 755 $RPM_BUILD_ROOT/etc/init.d/openfired
+cp $RPM_BUILD_ROOT%{homedir}/bin/extra/redhat/openfire $RPM_BUILD_ROOT/etc/init.d/openfire
+chmod 755 $RPM_BUILD_ROOT/etc/init.d/openfire
 # Make the startup script executable.
-chmod 755 $RPM_BUILD_ROOT/opt/openfire/bin/openfire.sh
+chmod 755 $RPM_BUILD_ROOT%{homedir}/bin/openfire.sh
 # Set up the sysconfig file.
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-cp $RPM_BUILD_ROOT/opt/openfire/bin/extra/redhat/openfire-sysconfig $RPM_BUILD_ROOT/etc/sysconfig/openfire
+cp $RPM_BUILD_ROOT%{homedir}/bin/extra/redhat/openfire-sysconfig $RPM_BUILD_ROOT/etc/sysconfig/openfire
+# Copy over the documentation
+cp -R documentation $RPM_BUILD_ROOT%{homedir}/documentation
+cp changelog.html $RPM_BUILD_ROOT%{homedir}/
+cp LICENSE.html $RPM_BUILD_ROOT%{homedir}/
+cp README.html $RPM_BUILD_ROOT%{homedir}/
+# Copy over the i18n files
+cp -R resources/i18n $RPM_BUILD_ROOT%{homedir}/resources/i18n
+# Make sure scripts are executable
+chmod 755 $RPM_BUILD_ROOT%{homedir}/bin/extra/openfired
+chmod 755 $RPM_BUILD_ROOT%{homedir}/bin/extra/redhat-postinstall.sh
+# Move over the embedded db viewer pieces
+mv $RPM_BUILD_ROOT%{homedir}/bin/extra/embedded-db.rc $RPM_BUILD_ROOT%{homedir}/bin
+mv $RPM_BUILD_ROOT%{homedir}/bin/extra/embedded-db-viewer.sh $RPM_BUILD_ROOT%{homedir}/bin
+# We don't really need any of these things.
+rm -rf $RPM_BUILD_ROOT%{homedir}/bin/extra
+rm -f $RPM_BUILD_ROOT%{homedir}/bin/*.bat
+rm -rf $RPM_BUILD_ROOT%{homedir}/resources/nativeAuth/osx-ppc
+rm -rf $RPM_BUILD_ROOT%{homedir}/resources/nativeAuth/solaris-sparc
+rm -rf $RPM_BUILD_ROOT%{homedir}/resources/nativeAuth/win32-x86
+rm -f $RPM_BUILD_ROOT%{homedir}/lib/*.dll
+rm -rf $RPM_BUILD_ROOT%{homedir}/resources/spank
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %preun
-[ -x "/etc/init.d/openfired" ] && /etc/init.d/openfired stop
-/sbin/chkconfig --del openfired
+[ -x "/etc/init.d/openfire" ] && /etc/init.d/openfire stop
+/sbin/chkconfig --del openfire
 
 %post
-/sbin/chkconfig --add openfired
+/sbin/chkconfig --add openfire
 
 %files
 %defattr(-,daemon,daemon)
-%dir /opt/openfire
-/opt/openfire/bin
-%dir /opt/openfire/conf
-%config(noreplace) /opt/openfire/conf/openfire.xml
-/opt/openfire/lib
-%dir /opt/openfire/logs
-/opt/openfire/plugins
-%dir /opt/openfire/resources
-/opt/openfire/resources/database
-/opt/openfire/resources/i18n
-/opt/openfire/resources/nativeAuth
-/opt/openfire/resources/spank
-%dir /opt/openfire/resources/security
-%config(noreplace) /opt/openfire/resources/security/keystore
-%config(noreplace) /opt/openfire/resources/security/truststore
-%doc /opt/openfire/documentation
-%doc /opt/openfire/LICENSE.html 
-%doc /opt/openfire/README.html 
-%doc /opt/openfire/changelog.html
-/etc/init.d/openfired
-%config(noreplace) /etc/sysconfig/openfire
+%dir %{homedir}
+%dir %{homedir}/bin
+%{homedir}/bin/openfire.sh
+%config(noreplace) %{homedir}/bin/embedded-db.rc
+%{homedir}/bin/embedded-db-viewer.sh
+%dir %{homedir}/conf
+%config(noreplace) %{homedir}/conf/openfire.xml
+%dir %{homedir}/lib
+%{homedir}/lib/*.jar
+%dir %{homedir}/logs
+%dir %{homedir}/plugins
+%{homedir}/plugins/search.jar
+%dir %{homedir}/plugins/admin
+%{homedir}/plugins/admin/*
+%dir %{homedir}/resources
+%dir %{homedir}/resources/database
+%{homedir}/resources/database/*.sql
+%dir %{homedir}/resources/database/upgrade
+%dir %{homedir}/resources/database/upgrade/*
+%{homedir}/resources/database/upgrade/*/*
+%dir %{homedir}/resources/i18n
+%{homedir}/resources/i18n/*
+%dir %{homedir}/resources/nativeAuth
+%dir %{homedir}/resources/nativeAuth/linux-i386
+%{homedir}/resources/nativeAuth/linux-i386/*
+%{homedir}/resources/security
+%doc %{homedir}/documentation
+%doc %{homedir}/LICENSE.html 
+%doc %{homedir}/README.html 
+%doc %{homedir}/changelog.html
+%{_sysconfdir}/init.d/openfire
+%config(noreplace) %{_sysconfdir}/sysconfig/openfire
+%{homedir}/jre
 
 %changelog
-* Sun Apr 12 2007 Jive Software <nobody@jivesoftware.com>
-- Openfire 3.3.0 build.
+* Mon Apr 30 2007 Daniel Henninger <jadestorm@nc.rr.com> 3.3.1-1
+- Initial RPM creation.