From 0990e2dfc79502eefdd838c1ef2e8c59c7eed44b Mon Sep 17 00:00:00 2001 From: eldy Date: Tue, 27 Sep 2011 23:30:23 +0200 Subject: [PATCH] Work on rpm package --- build/makepack-dolibarr.pl | 4 ++-- build/rpm/dolibarr_opensuse.spec | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 9af50c5f0b8..0f4ac5dd28e 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -569,7 +569,7 @@ if ($nboftargetok) { print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; - print "Move $FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n"; + print "Move $BUILDROOT/$FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n"; $cmd="mv $BUILDROOT/$FILENAMETGZ2.tgz $RPMDIR/SOURCES/$FILENAMETGZ2.tgz"; $ret=`$cmd`; @@ -579,7 +579,7 @@ if ($nboftargetok) { if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; } if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; } - print "Generate file $BUILDROOT/$BUILDFIC\n"; + print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n"; open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error"; open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error"; while () { diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index d2bf88985a2..d00de403d58 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -26,6 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Productivity/Office/Management Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl fonts-ttf-dejavu +BuildRequires: update-desktop-files fdupes # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -104,7 +105,7 @@ cui hai bisogno ed essere facile da usare. #%suse_update_desktop_file dolibarr # Enable this command to allow suse detection of duplicate files and create hardlinks instead -#%fdupes +#%fdupes $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs #---- clean