From 8cc0c58b87666c080061d5edee761cf4fada21a0 Mon Sep 17 00:00:00 2001 From: eldy Date: Tue, 27 Sep 2011 23:30:38 +0200 Subject: [PATCH] Work on rpm packaging --- 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 cd16eb72155..a59bd5fc136 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -563,7 +563,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`; @@ -573,7 +573,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 9f0265ef826..dc09e747d7c 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -27,6 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Productivity/Office/Management Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, fonts-ttf-dejavu Requires: mysql-community-server, mysql-community-server-client +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 @@ -118,7 +119,7 @@ done >%{name}.lang #%suse_update_desktop_file dolibarr # Enable this command to allow suse detection of duplicate files and create hardlinks instead -#%fdupes +#%fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs #---- clean