[jboss-svn-commits] JBL Code SVN: r13679 - in labs/jbosslabs/trunk/rpm: SPECS and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2007-07-20 12:40:04 -0400 (Fri, 20 Jul 2007)
New Revision: 13679

Modified:
   labs/jbosslabs/trunk/rpm/README
   labs/jbosslabs/trunk/rpm/SPECS/labs-2.1.spec
Log:
Some docs

Modified: labs/jbosslabs/trunk/rpm/README
===================================================================
--- labs/jbosslabs/trunk/rpm/README	2007-07-20 15:51:55 UTC (rev 13678)
+++ labs/jbosslabs/trunk/rpm/README	2007-07-20 16:40:04 UTC (rev 13679)
@@ -2,25 +2,33 @@
 --------------------
 
 1. Create a file ~/.rpmmacro with the following content:
-%_topdir        <directory where rpm scripts are checked out>
+%_topdir        <directory where rpm scripts (and this README file) are checked out>
 %_tmppath       <any temporary directory you like>
 
-2. Check out to BUILD/labs-x.y/portal-extensions the source (from svn), using the branch you want to include in the RPM (as this is a lengthy process, and doing it every time in the RPM build script would take a long time, it's not included there).
+2. Pick a version number of labs (called x.y from here on).
 
-3. Go to SOURCES/labs-x.y/conf-template and copy that directory to SOURCES/labs-x.y/conf
+3. Edit SPECS/labs-x.y.spec. Set the version number and check that variables rpm_inst_dir and rpm_inst_dir_esc are set to proper values (that should be the path on the target machine where Labs should be installed; NOTE: no symlinks allowed!). Also, set the default user and group of all installed files (bottom of the specs file, %defattr directive).
 
-4. Content of that directory will be copied to BUILD/labs-x.y/portal-extensions. Fill in any missing values in the configuration files 
+4. Check out to BUILD/labs-x.y/portal-extensions the source (from svn), using the branch you want to include in the RPM (as this is a lengthy process, and doing it every time in the RPM build script would take a long time, it's not included there).
+
+5. Go to SOURCES/labs-x.y/conf-template and copy that directory to SOURCES/labs-x.y/conf
+
+6. Content of that directory will be copied to BUILD/labs-x.y/portal-extensions. Fill in any missing values in the configuration files 
 (especially in:
 - build.properties
 - shotoku/build.properties
 - shotoku/shotoku-base/src/etc/shotoku.properties).
 Values which are already filled in normally don't need to be changed. Also, DO NOT change any values that are filled and use variables (like ${env.RPM_BUILD_ROOT} and ${RPM_INST_DIR}).
 
-5. Build the RPM using:
+7. Build the RPM using:
 rpmbuild -bb SPECS/labs-x.y.spec
 
-6. Install it using:
+8. Install it using:
 rpm -Uvh RPMS/i386/labs-x.y-z.i386.rpm --nodeps
 (the --nodeps is required as the rpm requires for some reason the parent directory of the installation to exist, I don't know yet how to turn this off.)
 
-7. The RPM, when installed, creates a directory named "content". Check out the content of the, from svn, there, unless it isn't already checked out. Also check if all database configuration is done.
+9. The RPM, when installed, creates a directory named "content". Check out the content from svn there, unless it is already checked out. 
+
+10. Check if all database configuration is done. It is normally good to drop all tables of the jboss portal DB except the user, roles and forums ones.
+
+11. The RPM also creates a directory named "wiki". Place your wiki files there.

Modified: labs/jbosslabs/trunk/rpm/SPECS/labs-2.1.spec
===================================================================
--- labs/jbosslabs/trunk/rpm/SPECS/labs-2.1.spec	2007-07-20 15:51:55 UTC (rev 13678)
+++ labs/jbosslabs/trunk/rpm/SPECS/labs-2.1.spec	2007-07-20 16:40:04 UTC (rev 13679)
@@ -16,7 +16,7 @@
 # Where Labs should be installed
 %define rpm_inst_dir /services/jbossorg/prod
 #%define rpm_inst_dir /home/adamw/data/jboss/rpm/tmp/test-inst
-# An special characters-escaped version of the above
+# A special characters-escaped version of the above
 %define rpm_inst_dir_esc \\/services\\/jbossorg\\/prod
 #%define rpm_inst_dir_esc \\/home\\/adamw\\/data\\/jboss\\/rpm\\/tmp\\/test-inst