Changeset 830 in ProjectBuilder for projects/fossology

Timestamp:

Jul 14, 2009, 2:03:50 AM (16 years ago)

Author:

Bruno Cornec

Message:

r3268@localhost: bruno | 2009-07-14 01:54:43 +0200
Prepare fossology 1.1.0-rc5

Location:

projects/fossology/pbconf/tags/1.1.0-rc5

Files:

• . (copied) (copied from projects/fossology/pbconf/tags/1.1.0-rc4 )
• fossology.pb (modified) (1 diff)
• fossology/rpm/fossology.spec (modified) (3 diffs)

projects/fossology/pbconf/tags/1.1.0-rc5/fossology.pb

@@ -93 +93 @@
 # Global version/tag for the project
 #
-projver fossology = 1.1.0-rc4
+projver fossology = 1.1.0-rc5
 projtag fossology = 1
 

projects/fossology/pbconf/tags/1.1.0-rc5/fossology/rpm/fossology.spec

@@ -12 +12 @@
 #PBPATCHSRC
 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 which PBDEP
-BuildRequires:  postgresql-devel libxml2 gcc make perl PBBUILDDEP
+Requires:       postgresql >= 8.1.11 php php-pear php-pgsql libxml2 binutils bzip2 cpio mkisofs poppler-utils rpm tar unzip gzip httpd which PBDEP
+BuildRequires:  postgresql-devel >= 8.1.11 libxml2 gcc make perl PBBUILDDEP
 Summary:        FOSSology is a licenses exploration tool
 Summary(fr):    FOSSology est un outil d'exploration de licenses
@@ -112 +112 @@
 fi
 
+grep -qw allow_call_time_pass_reference /etc/php.ini
+if [ $? -eq 0 ]; then
+    perl -pi -e "s/^[#\s]*allow_call_time_pass_reference.*=.*/allow_call_time_pass_reference = On/" /etc/php.ini
+else
+    echo "allow_call_time_pass_reference = On" >> /etc/php.ini
+fi
+
 # Now restart again postgresql
 # We have do it here in order to let postgresql configure itself correctly 
@@ -121 +128 @@
 /usr/lib/PBPROJ/fo-postinstall
 
-# Adds user httpd to fossy group
+# Adds user httpd to fossy group (is done upstream now it seems)
 #useradd -G fossy httpd
-perl -pi -e 's/^fossy:x:([0-9]+):(.+)/fossy:x:$1:httpd,$2/' /etc/group
-perl -pi -e 's/^fossy:x:([0-9]+):$/fossy:x:$1:httpd/' /etc/group
+#perl -pi -e 's/^fossy:x:([0-9]+):(.+)/fossy:x:$1:httpd,$2/' /etc/group
+#perl -pi -e 's/^fossy:x:([0-9]+):$/fossy:x:$1:httpd/' /etc/group
 
 # httpd is also assumed to run locally