Minor changes

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

@@ -90,7 +90,7 @@ echo "-- Building package"
                 --define "pwre_target $pwre_target" \
                 --buildroot $pkgroot $pkgsrc/pwr.spec > /dev/null 2>&1
 
-mv $pkgroot/rpm/RPMS/i586/*.rpm $pwre_broot/$pwre_target/bld/pkg/.
+mv $pkgroot/rpm/RPMS/i386/*.rpm $pwre_broot/$pwre_target/bld/pkg/.
 rm -r $pkgroot
 
 

src/tools/pkg/rpm/pwr/pwr.spec

@@ -8,13 +8,13 @@
 #
 
 
-Name:		pwr
+Name:		pwr41
 Summary: 	Proview/R development and runtime environment
 Version:        4.1.1
 Release: 	1	
 Copyright:	(c) 2005 SSAB Oxelösund AB, Sweden
 #License:        GPL
-#BuildArch:      i586
+BuildArch:      i386
 Packager: 	robert.karlsson@ssabox.com
 Group: 		Development/Tools/Other
 Url:            http://www.proview.se
@@ -179,4 +179,4 @@ fi
 
 %changelog
 * Fri Dec 23 2005 Robert Karlsson <robert.karlsson@ssabox.com> 4.1.1-1
-- Tested 
\ No newline at end of file
+- Base release 

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

@@ -61,7 +61,7 @@ if [ -e $aroot/db/pwr_projectlist.dat ]; then
   ptst=`eval grep "'\bpwrdemo%{ver}\b'" $aroot/db/pwr_projectlist.dat`
   set -e
   if [ "$ptst" = "" ]; then
-    echo "pwrdemo%{ver} V${pwrver:0:1}.${pwrver:1:1} /usr/pwrp/pwrdemo%{ver} \"\" " >> $aroot/db/pwr_projectlist.dat
+    echo "pwrdemo%{ver} V${pwrver:0:1}.${pwrver:1:1} /usr/pwrp/pwrdemo%{ver} Demos-pwrdemo%{ver} \"\" " >> $aroot/db/pwr_projectlist.dat
   fi
 fi
 
@@ -111,4 +111,4 @@ fi
 
 %changelog
 * Fri Jan 27 2005 Robert Karlsson <robert.karlsson@ssabox.com> 4.1.3-1
-- Tested 
+- Base release 

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

@@ -68,7 +68,7 @@ tar -xf $tarfile
 rm $tarfile
 rm -r $pkgroot/usr/pwrrt/lib/*.a
 rm -r $pkgroot/usr/pwrrt/exe/wb*
-cp $pwr_exe/wb_distr_keepboot.sh $pkgroot/usr/pwrrt/exe
+cp $pwr_eexe/wb_distr_keepboot.sh $pkgroot/usr/pwrrt/exe
 cd $currentdir
 
 # Copy configuration files to cnf
@@ -99,7 +99,7 @@ echo "-- Building package"
                --define "_topdir $pkgroot/rpm" \
                --buildroot $pkgroot $pkgsrc/pwrrt.spec > /dev/null 2>&1
 
-mv $pkgroot/rpm/RPMS/i586/*.rpm $pwre_broot/$pwre_target/bld/pkg/.
+mv $pkgroot/rpm/RPMS/i386/*.rpm $pwre_broot/$pwre_target/bld/pkg/.
 rm -r $pkgroot
 
 

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

@@ -14,7 +14,7 @@ Version:        4.1.1
 Release: 	1	
 Copyright:	(c) 2005 SSAB Oxelösund AB, Sweden
 #License:        GPL
-#BuildArch:      i586
+BuildArch:      i386
 Packager: 	robert.karlsson@ssabox.com
 Group: 		Applications/System
 Url:            http://www.proview.se
@@ -457,5 +457,5 @@ fi
 #%postun
 
 %changelog
-* Fri Dec 30 2005 Robert Karlsson <robert.karlsson@ssabox.com> 4.1.1-1
-- Tested 
\ No newline at end of file
+* Tue Jan 31 2005 Robert Karlsson <robert.karlsson@ssabox.com> 4.1.1-1
+- Base release