chore(pb): corrections on the project builder rpm build

sandipbhuyan · Dec 19, 2017 · 33431fa · 33431fa
1 parent 3b73c0f
commit 33431fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/pbconf/Vagrantfile b/pbconf/Vagrantfile
@@ -40,19 +40,16 @@ wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 rpm -Uvh epel-release-latest-7.noarch.rpm
 
 # install projectbuilder
-wget http://ftp.project-builder.org/centos/7/x86_64/pb.repo
-cp pb.repo /etc/yum.repos.d/
+wget http://ftp.project-builder.org/test/centos/7/x86_64/pb-test.repo
+cp pb-test.repo /etc/yum.repos.d/
 
 # not using gpg checking is not recommended
 # yum update -y --nogpgcheck
 # yum install -y project-builder --nogpgcheck
 yum update -y
 
 # installs for projectbuilder
-yum install -y project-builder
-yum install -y subversion
-yum install -y perl-ExtUtils-MakeMaker
-yum install -y createrepo
+yum install -y project-builder subversion perl-ExtUtils-MakeMaker createrepo 
 
 # Fix a Fedora-26 issue
 cat >> /etc/pb/pb.conf << EOF
@@ -83,7 +80,7 @@ systemctl start docker
 # cd /home/vagrant/prj/fossology
 mkdir -p /home/vagrant/composer/
 /home/vagrant/prj/fossology/utils/install_composer.sh /home/vagrant/composer/
-mkdir /home/vagrant/prj/fossology/src/vendor
+mkdir -p /home/vagrant/prj/fossology/src/vendor
 chown vagrant:vagrant /home/vagrant/prj/fossology/src/vendor
 
 # preparing the transfer of the packages by ssh

diff --git a/pbconf/fossology.pb b/pbconf/fossology.pb
@@ -61,7 +61,7 @@ testver fossology = true
 #
 #addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/5/pb.repo
 #addrepo centos-4-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el4.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/4/pb.repo
-addrepo centos-7-x86_64 = http://ftp.project-builder.org/centos/7/x86_64/pb.repo,https://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm
+addrepo centos-7-x86_64 = http://ftp.project-builder.org/centos/7/x86_64/pb.repo,https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 
 #
 # Adapt to your needs:

diff --git a/pbconf/fossology/rpm/fossology.spec b/pbconf/fossology/rpm/fossology.spec
@@ -20,7 +20,7 @@ Url:            PBURL
 Source:         PBSRC
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 Requires:       fossology-web fossology-scheduler fossology-ununpack fossology-copyright fossology-buckets fossology-mimetype fossology-delagent fossology-wgetagent fossology-decider fossology-spdx2 fossology-reuser
-#Recommends:		fossology-decider, fossology-spdx2, fossology-reuse,fossology-ninka
+#Recommends:		fossology-decider, fossology-spdx2, fossology-reuser, fossology-ninka
 BuildRequires:  postgresql-devel >= 8.1.11,glib2-devel,libxml2,gcc,make,perl,rpm-devel,pcre-devel,openssl-devel,gcc-c++,php,boost-devel,php-phar,php-mbstring,php-xml,curl,PBBUILDDEP
 Summary:        FOSSology is a license compliance analysis  tool
 
@@ -236,6 +236,7 @@ utils/install_composer.sh $RPM_BUILD_DIR/composer/
 #
 
 %build
+COMPOSER_PHAR=/home/vagrant/composer/composer 
 make SYSCONFDIR=%{_sysconfdir}/fossology PREFIX=%{_usr} LOCALSTATEDIR=%{_var}
 #make %{?_smp_mflags} SYSCONFDIR=%{_sysconfdir}
 make SYSCONFDIR=%{_sysconfdir}/fossology PREFIX=%{_usr} LOCALSTATEDIR=%{_var} -C src/nomos/agent/ -f Makefile.sa
@@ -274,6 +275,7 @@ cp install/scripts/php-conf-fix.sh $RPM_BUILD_ROOT/%{_usr}/lib/PBPROJ/
 
 # manually add the version file
 cp VERSION $RPM_BUILD_ROOT%{_sysconfdir}/PBPROJ/
+#cp $RPM_BUILD_ROOT%{_usr}/share/PBPROJ/VERSION $RPM_BUILD_ROOT%{_sysconfdir}/PBPROJ/
 
 #rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/default/PBPROJ