Merge branch 'master' of pwrcvs:/data1/git/pwr

src/tools/pkg/rpm/pwrdemo/pwrdemo.spec

@@ -79,6 +79,14 @@ cat > $initsh <<EOF
 source $aroot/db/pwr_setup.sh
 source \$pwr_exe/pwrp_env.sh set project pwrdemo%{ver}
 
+if [ ! -e "\$pwrp_db/directory.db" ]; then
+  wb_cmd create volume/directory
+  wb_cmd wb load /load=\"\$pwrp_db/directory.wb_dmp\"
+fi
+if [ ! -e "\$pwrp_db/volpwrdemo.db" ]; then
+  wb_cmd wb load /load=\"\$pwrp_db/volpwrdemo.wb_dmp\"
+fi
+
 wb_cmd @$initpwrc
 EOF
 
@@ -100,7 +108,6 @@ sudo -u pwrp $initsh
 
 rm $initsh
 rm $initpwrc
-ls
 
 %preun
 

src/tools/pkg/rpm/pwrrt/build.sh

@@ -112,7 +112,9 @@ mkdir -p $pkgroot/rpm/SPECS
 mkdir -p $pkgroot/rpm/SOURCES
 mkdir -p $pkgroot/rpm/SRPMS
 mkdir -p $pkgroot/usr/share/doc/pwrrt
-mkdir -p $pkgroot/etc/init.d
+mkdir -p $pkgroot/etc
+# init.d is a symlink on fedora that is owned by with chkconfig and causes conflict
+#mkdir -p $pkgroot/etc/init.d
 
 find $pkgroot -type d | xargs chmod 755
 
@@ -126,8 +128,8 @@ gzip -fq --best $pkgroot/usr/share/doc/pwrrt/changelog
 # Startup files
 cp $pkgsrc/pwrp_profile $pkgroot/etc
 chmod a+x $pkgroot/etc/pwrp_profile
-cp $pkgsrc/pwr $pkgroot/etc/init.d
-chmod a+x $pkgroot/etc/init.d/pwr
+#cp $pkgsrc/pwr $pkgroot/etc/init.d
+#chmod a+x $pkgroot/etc/init.d/pwr
 
 # Man pages
 mkdir -p $pkgroot/usr/share/man/man1
@@ -157,6 +159,7 @@ cd $currentdir
 
 # Copy configuration files to cnf
 cp $pkgsrc/proview.cnf $pkgroot/usr/pwrrt/cnf
+cp $pkgsrc/pwr $pkgroot/usr/pwrrt/cnf
 
 # Copy op to cnf
 mkdir $pkgroot/usr/pwrrt/cnf/op

src/tools/pkg/rpm/pwrrt/pwrrt.spec

@@ -117,7 +117,7 @@ else
   fi
 fi
 
-
+new_user=0
 if getent passwd pwrp > /dev/null; then
   echo "-- user pwrp already exist"
 else
@@ -213,6 +213,9 @@ if [ ! -e /etc/proview.cnf ]; then
   cp /usr/pwrrt/cnf/proview.cnf /etc
   new_cnf=1
 fi
+cp /usr/pwrrt/cnf/pwr /etc/init.d
+chmod a+x /etc/init.d/pwr
+
 
 # Add pwrp_profile to profile
 if ! grep -q "/etc/pwrp_profile\b" /etc/profile; then

src/tools/pkg/rpm/pwrsev/build.sh

@@ -115,7 +115,9 @@ mkdir -p $pkgroot/rpm/SPECS
 mkdir -p $pkgroot/rpm/SOURCES
 mkdir -p $pkgroot/rpm/SRPMS
 mkdir -p $pkgroot/usr/share/doc/pwrsev
-mkdir -p $pkgroot/etc/init.d
+mkdir -p $pkgroot/etc
+# init.d is a symlink on fedora that is owned by with chkconfig and causes conflict
+# mkdir $pkgroot/etc/init.d
 
 find $pkgroot -type d | xargs chmod 755
 
@@ -129,8 +131,8 @@ gzip -fq --best $pkgroot/usr/share/doc/pwrsev/changelog
 # Startup files
 cp $pkgsrc/pwrp_profile $pkgroot/etc
 chmod a+x $pkgroot/etc/pwrp_profile
-cp $pkgsrc/pwrsev $pkgroot/etc/init.d
-chmod a+x $pkgroot/etc/init.d/pwrsev
+#cp $pkgsrc/pwrsev $pkgroot/etc/init.d
+#chmod a+x $pkgroot/etc/init.d/pwrsev
 
 # Man pages
 mkdir -p $pkgroot/usr/share/man/man1
@@ -157,6 +159,7 @@ cd $currentdir
 
 # Copy configuration files to cnf
 cp $pkgsrc/proview.cnf $pkgroot/usr/pwrsev/cnf
+cp $pkgsrc/pwrsev $pkgroot/usr/pwrsev/cnf
 
 # Copy op to cnf
 mkdir $pkgroot/usr/pwrsev/cnf/op

src/tools/pkg/rpm/pwrsev/pwrsev.spec

@@ -114,7 +114,7 @@ else
   fi
 fi
 
-
+new_user=0
 if getent passwd pwrp > /dev/null; then
   echo "-- user pwrp already exist"
 else
@@ -203,6 +203,8 @@ if [ ! -e /etc/proview.cnf ]; then
   cp /usr/pwrsev/cnf/proview.cnf /etc
   new_cnf=1
 fi
+cp /usr/pwrsev/cnf/pwrsev /etc/init.d
+chmod a+x /etc/init.d/pwrsev
 
 # Add pwrp_profile to profile
 if ! grep -q "/etc/pwrp_profile\b" /etc/profile; then
@@ -391,14 +393,14 @@ fi
 # Remove startup
 
 if [ -e /etc/init.d/rc2.d ]; then
-  checklink=`eval ls /etc/init.d/rc2.d/S90pwr 2>/dev/null`
+  checklink=`eval ls /etc/init.d/rc2.d/S90pwrsev 2>/dev/null`
   if [ "$checklink" != "" ]; then
-    rm /etc/init.d/rc2.d/S90pwr
+    rm /etc/init.d/rc2.d/S90pwrsev
   fi
 elif [ -e /etc/rc2.d ]; then
-  checklink=`eval ls /etc/rc2.d/S90pwr 2>/dev/null`
+  checklink=`eval ls /etc/rc2.d/S90pwrsev 2>/dev/null`
   if [ "$checklink" != "" ]; then
-    rm /etc/rc2.d/S90pwr
+    rm /etc/rc2.d/S90pwrsev
   fi
 fi
 

wb/exe/wb/motif/os_linux/link_rule.mk

@@ -11,7 +11,7 @@ ifeq ($(export_type),exp)
 	-lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow -lpwr_co_motif -lpwr_co \
 	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
         -lXmu -lSM -lICE\
-	-lrpcsvc -lpthread -lm -ldb_cxx -lz $(linkmysql)
+	-lrpcsvc -lpthread -lm -ldb_cxx -lz -lcrypt $(linkmysql)
 else
   link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_motif \
 	$(bld_dir)/wb_motif.o $(bld_dir)/wb_main.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
@@ -22,6 +22,6 @@ else
 	-lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow -lpwr_co_motif -lpwr_co \
 	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
         -lXmu -lSM -lICE\
-	-lrpcsvc -lpthread -lm -ldb_cxx -lz $(linkmysql)
+	-lrpcsvc -lpthread -lm -ldb_cxx -lz -lcrypt $(linkmysql)
 endif
 endif

xtt/lib/glow/motif/glow_draw_xlib.cpp

@@ -1692,7 +1692,7 @@ int GlowDrawXLib::text_cursor( GlowWind *wind, int x, int y, char *text, int len
 
   int width, height, descent;
   get_text_extent( text, pos, gc_type, idx, font_idx,
-			&width, &height, &descent);
+			&width, &height, &descent, size);
 
   if ( w->clip_on)
     set_clip( w, get_gc( this, gc_type, idx));