Changeset 610 in ProjectBuilder for projects/fossology

Timestamp:

Nov 20, 2008, 2:39:00 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Use of a new macro PBPHPINI for PHP configuration in post-install of fossology
• libmagic-devel is a mandriva dependency only. fedora needs file-devel, rhel file.
• use LIBDIR in make install to deal with 64 bits support.
• Remains only the /etc/default part to handle

Location:

projects/fossology/pbconf/trunk

Files:

• fossology/rpm/fossology.spec (modified) (5 diffs)
• pbfilter/fedora.pbf (modified) (1 diff)
• pbfilter/md.pbf (modified) (1 diff)
• pbfilter/rhel.pbf (modified) (1 diff)
• pbfilter/rpm.pbf (modified) (2 diffs)

projects/fossology/pbconf/trunk/fossology/rpm/fossology.spec

@@ -15 +15 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 Requires:       postgresql php php-pear php-pgsql libxml2 binutils bzip2 cpio mkisofs poppler-utils rpm tar unzip gzip httpd PBDEP
-BuildRequires:  postgresql-devel libxml2 gcc make perl libmagic-devel PBBUILDDEP
+BuildRequires:  postgresql-devel libxml2 gcc make perl PBBUILDDEP
 Summary:        FOSSology is a licenses exploration tool
 Summary(fr):    FOSSology est un outil d'exploration de licenses
@@ -46 +46 @@
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_usr} SYSCONFDIR=%{_sysconfdir} LOCALSTATEDIR=%{_var} install
+make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_usr} SYSCONFDIR=%{_sysconfdir} LOCALSTATEDIR=%{_var} LIBDIR=%{_libdir} install
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
 cat > $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/PBPROJ.conf << EOF
@@ -71 +71 @@
 %dir %{_datadir}/*
 %dir %{_localstatedir}/PBPROJ
-%dir %{_usr}/lib/PBPROJ
+%dir %{_libdir}/PBPROJ
 %dir %{_sysconfdir}/PBPROJ
 %dir %{_datadir}/PBPROJ
@@ -86 +86 @@
 %files devel
 %{_includedir}/*
-%{_libexecdir}/*.a
+%{_libdir}/*.a
 
 %post
@@ -115 +115 @@
 
 # Adjust PHP config (described in detail in section 2.1.5)
-# /etc/php5/php.ini
-# 291   max_execution_time = 90
-#  292   memory_limit = 128M
-#  293   error_reporting  =  E_ALL & E_STRICT
-#  294   display_startup_errors = On
-#  295   log_errors = On
-#  296   log_errors_max_len = 0
-#  297   error_log = /var/log/php5.log
-#  298   post_max_size = 700M
-#  299   upload_max_filesize = 701M
-#  300 In the "[soap]" section add
-#  301   extension=pgsql.so
-# 303 You should also edit /etc/php5/cli/php.ini to include the fossology directory
-#  304 in the php command line interface path:
-#  305   include_path = ".:/usr/local/share/fossology/php:/usr/local/share/fossology/www"
+grep -qw memory_limit PBPHPINI
+if [ $? -eq 0 ]; then
+    perl -pi -e "s/memory_limit.*=.*/memory_limit = 702M/" PBPHPINI
+else
+    echo "memory_limit = 702M" >> PBPHPINI
+fi
+grep -qw post_max_size PBPHPINI
+if [ $? -eq 0 ]; then
+    perl -pi -e "s/post_max_size.*=.*/post_max_size = 702M/" PBPHPINI
+else
+    echo "post_max_size = 702M" >> PBPHPINI
+fi
+grep -qw upload_max_filesize PBPHPINI
+if [ $? -eq 0 ]; then
+    perl -pi -e "s/upload_max_filesize.*=.*/upload_max_filesize = 702M/" PBPHPINI
+else
+    echo "upload_max_filesize = 702M" >> PBPHPINI
+fi
 
 # Add apache config for fossology (described in detail in section 2.1.6) - done in install

projects/fossology/pbconf/trunk/pbfilter/fedora.pbf

@@ -17 +17 @@
 
 # PBBUILDDEP is replaced by the list of build dependencies
-filter PBBUILDDEP = libextractor-devel file-libs
+filter PBBUILDDEP = libextractor-devel file-libs file-devel
 
 # PBSUF is replaced by the package suffix ($pbsuf'} in code)

projects/fossology/pbconf/trunk/pbfilter/md.pbf

@@ -11 +11 @@
 
 # PBBUILDDEP is replaced by the list of build dependencies
-filter PBBUILDDEP = perl-Text-Template subversion libextractor-devel
+filter PBBUILDDEP = perl-Text-Template subversion libextractor-devel libmagic-devel
 
+PBPHPINI = /etc/php.ini

projects/fossology/pbconf/trunk/pbfilter/rhel.pbf

@@ -17 +17 @@
 
 # PBBUILDDEP is replaced by the list of build dependencies
-filter PBBUILDDEP = perl-Text-Template subversion file-libs
+filter PBBUILDDEP = perl-Text-Template subversion file-libs file
 
 # PBSUF is replaced by the package suffix ($pbsuf'} in code)

projects/fossology/pbconf/trunk/pbfilter/rpm.pbf

@@ -15 +15 @@
 
 # PBBUILDDEP is replaced by the list of build dependencies
-filter PBBUILDDEP = postgresql-devel file-libs libxml2
+filter PBBUILDDEP = 
 
 # PBSUF is replaced by the package suffix ($pb->{'suf'} in code)
@@ -23 +23 @@
 #filter PBOBS =
 
+PBPHPINI = /etc/php.ini