From 90ce3e180f433e49d80514cf167d3de0b19a5986 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 21 Aug 2011 17:53:22 +0000
Subject: [PATCH] Work on rpm and deb package

---
 build/rpm/dolibarr_fedora.spec   |  7 +++----
 build/rpm/dolibarr_generic.spec  | 24 ++++++++++++------------
 build/rpm/dolibarr_mandriva.spec |  2 +-
 build/rpm/dolibarr_opensuse.spec |  2 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 0a69fdfc205..b954c518463 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -119,7 +119,6 @@ cui hai bisogno ed essere facile da usare.
 %_datadir/dolibarr/scripts/*
 
 %defattr(-, root, root, 0755)
-%exclude %_datadir/dolibarr/htdocs/langs/*/*.lang
 %doc %_datadir/doc/dolibarr
 %dir %_datadir/dolibarr/build/rpm
 %dir %_datadir/dolibarr/build/tgz
@@ -147,7 +146,7 @@ export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
 export apacheuser='apache';
 export apachegroup='apache';
 
-# Remove lock file
+# Remove dolibarr install/upgrade lock file if it exists
 %{__rm} -f $docdir/install.lock
 
 # Create empty directory for uploaded files and generated documents 
@@ -213,7 +212,7 @@ export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
 # Remove apache link
 if [ -L $apachelink ] ;
 then
-    echo Delete apache config link for Dolibarr ($apachelink)
+    echo "Delete apache config link for Dolibarr ($apachelink)"
     %{__rm} -f $apachelink
     status=purge
 fi
@@ -234,5 +233,5 @@ fi
 
 
 %changelog
-* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
+* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 5eafa7ec4f0..977805491c9 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -130,8 +130,14 @@ cui hai bisogno ed essere facile da usare.
 %_datadir/dolibarr/build/tgz/*
 %_datadir/dolibarr/htdocs/*
 
+%defattr(0664, -, -)
+%config(noreplace) %{_sysconfdir}/dolibarr/conf.php
+%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
+%config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
+%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
+
 #lang(ar_SA) %_datadir/dolibarr/htdocs/langs/ar_SA
-#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES
+#lang(ca_ES) %_datadir/dolibarr/htdocs/langs/ca_ES/*.lang
 #lang(da_DK) %_datadir/dolibarr/htdocs/langs/da_DK
 #lang(de_AT) %_datadir/dolibarr/htdocs/langs/de_AT
 #lang(de_DE) %_datadir/dolibarr/htdocs/langs/de_DE
@@ -140,24 +146,18 @@ cui hai bisogno ed essere facile da usare.
 #lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB
 #lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN
 #lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ
-#lang(en) %_datadir/dolibarr/htdocs/langs/en_US
+#lang(en)    %_datadir/dolibarr/htdocs/langs/en_US
 #lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR
-#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES
+#lang(es)    %_datadir/dolibarr/htdocs/langs/es_ES
 #lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN
 #lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX
 #lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR
 #lang(fa_IR) %_datadir/dolibarr/htdocs/langs/fa_IR
-#lang(fi_FI) %_datadir/dolibarr/htdocs/langs/fi_FI
+#lang(fi)    %_datadir/dolibarr/htdocs/langs/fi_FI
 #lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE
 #lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA
 #lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH
-#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR
-
-%defattr(0664, -, -)
-%config(noreplace) %{_sysconfdir}/dolibarr/conf.php
-%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
-%config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
-%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
+#lang(fr)    %_datadir/dolibarr/htdocs/langs/fr_FR
 
 
 
@@ -294,7 +294,7 @@ fi
 # Remove apache link
 if [ -L $apachelink ] ;
 then
-    echo Delete apache config link for Dolibarr ($apachelink)
+    echo "Delete apache config link for Dolibarr ($apachelink)"
     %{__rm} -f $apachelink
     status=purge
 fi
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 18b238ce737..cc8b3d2b7b6 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -202,7 +202,7 @@ export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
 # Remove apache link
 if [ -L $apachelink ] ;
 then
-    echo Delete apache config link for Dolibarr ($apachelink)
+    echo "Delete apache config link for Dolibarr ($apachelink)"
     %{__rm} -f $apachelink
     status=purge
 fi
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 7f122ce846d..eedefe7982e 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -206,7 +206,7 @@ export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
 # Remove apache link
 if [ -L $apachelink ] ;
 then
-    echo Delete apache config link for Dolibarr ($apachelink)
+    echo "Delete apache config link for Dolibarr ($apachelink)"
     %{__rm} -f $apachelink
     status=purge
 fi