Work on rpm package

build/makepack-dolibarr.pl

@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \version      $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.131 2011/08/03 01:43:26 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
 
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.131 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";
 
 
@@ -452,7 +452,6 @@ if ($nboftargetok) {
             $ret=`$cmd`;
 
  			print "Remove other files\n";
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
             $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`;
             $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`;
             $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`;
@@ -491,7 +490,7 @@ if ($nboftargetok) {
             $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`;
 
             $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
+            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`;
             # To remove once stable
             $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
 
@@ -688,7 +687,7 @@ if ($nboftargetok) {
 		    $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`;
 		    $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`;
             # To remove once stable
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
 

build/rpm/dolibarr.spec

@@ -226,8 +226,8 @@ if [ ! -f $config ]
 then 
 	echo Create empty file $config		
 	touch $config
-	chown -R root:$apachegroup $config
-	chmod -R 660 $config
+	%{__chown} -R root:$apachegroup $config
+	%{__chmod} -R 660 $config
 fi
 
 # Create config file for apache $apacheconfig
@@ -241,10 +241,12 @@ fi
 # Create config file for se $seconfig
 if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then
   	 echo Add SE Linux permission from file $sefileorig
-#     cp $sefileorig $seconfig
+	 semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
+	 semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)"
+	 semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock"
      restorecon -R -v /etc/dolibarr
-     restorecon -R -v /var/www/dolibarr
      restorecon -R -v /usr/share/dolibarr
+     restorecon -v /var/www/dolibarr/install.lock
 fi
 
 # Create a config link dolibarr.conf
@@ -255,13 +257,13 @@ fi
 
 # Set permissions
 echo Set permission to $apacheuser:$apachegroup on $targetdir
-chown -R $apacheuser:$apachegroup $targetdir
-chmod -R a-w $targetdir
-chmod u+w $targetdir
+%{__chown} -R $apacheuser:$apachegroup $targetdir
+%{__chmod} -R a-w $targetdir
+%{__chmod} u+w $targetdir
 
 echo Set permission to $apacheuser:$apachegroup on $docdir
-chown -R $apacheuser:$apachegroup $docdir
-chmod -R o-w $docdir
+%{__chown} -R $apacheuser:$apachegroup $docdir
+%{__chmod} -R o-w $docdir
 
 # Restart web server
 echo Restart web server