From 163a0c5db2a349e7f0e806496d15d13b60a60cfe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 13 Nov 2011 12:29:33 +0100 Subject: [PATCH] Fix: restore rpm packaging --- build/rpm/dolibarr-forrpm.patch | 20 ++++++++++---------- build/rpm/dolibarr_fedora.spec | 2 -- build/rpm/dolibarr_generic.spec | 2 -- build/rpm/dolibarr_mandriva.spec | 2 -- build/rpm/dolibarr_opensuse.spec | 2 -- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/build/rpm/dolibarr-forrpm.patch b/build/rpm/dolibarr-forrpm.patch index d7b0037d59d..f1627beb897 100755 --- a/build/rpm/dolibarr-forrpm.patch +++ b/build/rpm/dolibarr-forrpm.patch @@ -1,12 +1,12 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php --- htdocs/filefunc.inc.php.patch 2011-09-03 02:32:48.666952000 +0200 +++ htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200 -@@ -65,8 +65,8 @@ $conffiletoshowshort = "conf.php"; +@@ -64,8 +64,8 @@ $conffiletoshowshort = "conf.php"; $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; - # For debian/redhat like systems --#$conffile = "/etc/dolibarr/conf.php"; --#$conffiletoshow = "/etc/dolibarr/conf.php"; + // For debian/redhat like systems +-//$conffile = "/etc/dolibarr/conf.php"; +-//$conffiletoshow = "/etc/dolibarr/conf.php"; +$conffile = "/etc/dolibarr/conf.php"; +$conffiletoshow = "/etc/dolibarr/conf.php"; @@ -18,9 +18,9 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php @@ -75,8 +75,8 @@ $conffiletoshowshort = "conf.php"; $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; - # For debian/redhat like systems --#$conffile = "/etc/dolibarr/conf.php"; --#$conffiletoshow = "/etc/dolibarr/conf.php"; + // For debian/redhat like systems +-//$conffile = "/etc/dolibarr/conf.php"; +-//$conffiletoshow = "/etc/dolibarr/conf.php"; +$conffile = "/etc/dolibarr/conf.php"; +$conffiletoshow = "/etc/dolibarr/conf.php"; @@ -32,9 +32,9 @@ diff -up htdocs/support/inc.php.patch htdocs/support/inc.php @@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php"; $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; - # For debian/redhat like systems --#$conffile = "/etc/dolibarr/conf.php"; --#$conffiletoshow = "/etc/dolibarr/conf.php"; + // For debian/redhat like systems +-//$conffile = "/etc/dolibarr/conf.php"; +-//$conffiletoshow = "/etc/dolibarr/conf.php"; +$conffile = "/etc/dolibarr/conf.php"; +$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 8675c86881f..1a004cd4b45 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -173,9 +173,7 @@ done >%{name}.lang %_datadir/dolibarr/htdocs/includes %_datadir/dolibarr/htdocs/install %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt -%_datadir/dolibarr/htdocs/lib %_datadir/dolibarr/htdocs/livraison -%_datadir/dolibarr/htdocs/mantis %_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paypal %_datadir/dolibarr/htdocs/product diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 20fb13e5a26..12afc21fb5e 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -170,9 +170,7 @@ done >%{name}.lang %_datadir/dolibarr/htdocs/includes %_datadir/dolibarr/htdocs/install %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt -%_datadir/dolibarr/htdocs/lib %_datadir/dolibarr/htdocs/livraison -%_datadir/dolibarr/htdocs/mantis %_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paypal %_datadir/dolibarr/htdocs/product diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 2f7e36bb808..7f6ebb5b594 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -170,9 +170,7 @@ done >%{name}.lang %_datadir/dolibarr/htdocs/includes %_datadir/dolibarr/htdocs/install %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt -%_datadir/dolibarr/htdocs/lib %_datadir/dolibarr/htdocs/livraison -%_datadir/dolibarr/htdocs/mantis %_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paypal %_datadir/dolibarr/htdocs/product diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index c120e566e80..95d44fe917e 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -175,9 +175,7 @@ done >%{name}.lang %_datadir/dolibarr/htdocs/includes %_datadir/dolibarr/htdocs/install %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt -%_datadir/dolibarr/htdocs/lib %_datadir/dolibarr/htdocs/livraison -%_datadir/dolibarr/htdocs/mantis %_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paypal %_datadir/dolibarr/htdocs/product