gforge-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gforge-commits] gforge gforge.spec,1.8,1.9


From: gsmet
Subject: [Gforge-commits] gforge gforge.spec,1.8,1.9
Date: Tue, 02 Nov 2004 17:13:50 -0600

Update of /cvsroot/gforge/gforge
In directory db.perdue.net:/tmp/cvs-serv31191

Modified Files:
        gforge.spec 
Log Message:
fixed bugs in RPM packaging and cleant it a little bit


Index: gforge.spec
===================================================================
RCS file: /cvsroot/gforge/gforge/gforge.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gforge.spec 1 Nov 2004 19:13:55 -0000       1.8
+++ gforge.spec 2 Nov 2004 23:13:46 -0000       1.9
@@ -23,7 +23,7 @@
 Patch1000: gforge-4.0-deb_rpm.patch
 
 AutoReqProv: off
-Requires: perl
+Requires: perl, perl-DBI, perl-DBD-Pg, perl-HTML-Parser
 Requires: httpd
 Requires: php, php-mbstring, php-pgsql
 Requires: postgresql, postgresql-server
@@ -106,7 +106,7 @@
 %post
 if [ $1 -eq 1 ]; then
        # creating the database
-       service postgresql status | grep 'is running' >/dev/null 2>&1 || 
service postgresql start
+       service postgresql status | grep '(pid' >/dev/null 2>&1 || service 
postgresql start
        su -l postgres -s /bin/sh -c "createdb -E UNICODE %{dbname} >/dev/null 
2>&1"
        su -l postgres -s /bin/sh -c "createlang plpgsql %{dbname} >/dev/null 
2>&1"
 
@@ -120,7 +120,7 @@
        # creating gforge database user
        %randstr GFORGEDATABASE_PASSWORD 8
 
-       (echo "$GFORGEDATABASE_PASSWORD" ; echo "$GFORGEDATABASE_PASSWORD") | 
su -l postgres -s /bin/sh -c "createuser -D -a -P %{dbuser}"
+       su -l postgres -c "psql -c \"CREATE USER %{dbuser} WITH PASSWORD 
'$GFORGEDATABASE_PASSWORD' NOCREATEUSER\" template1"
        
        # updating PostgreSQL configuration
        if ! grep -i '^ *host.*%{dbname}.*' /var/lib/pgsql/data/pg_hba.conf 
>/dev/null 2>&1; then
@@ -128,12 +128,6 @@
                service postgresql reload
        fi
 
-       # creating the database
-       # su -l postgres -s /bin/sh -c "psql -U %{dbuser} %{dbname} < 
%{_datadir}/%{name}/db/%{name}.sql >/tmp/gforge.log 2>&1"
-       # %{_libdir}/gforge/lib/db-upgrade.pl
-       su %{gfuser} -c %{_libdir}/gforge/bin/db-upgrade.pl
-       su -l postgres -c "psql -c 'UPDATE groups SET 
register_time=EXTRACT(EPOCH FROM NOW());' %{dbname}"
-
        # adding "noreply" alias
        for i in /etc/postfix/aliases /etc/mail/aliases /etc/aliases ; do
                if [ -f $i ]; then
@@ -162,6 +156,10 @@
        # initializing configuration
        cd %{_datadir}/gforge && ./setup -confdir %{_sysconfdir}/gforge/ -input 
%{_sysconfdir}/gforge/gforge.conf -noapache
        
+       # creating the database
+       su -l %{gfuser} -c %{_libdir}/gforge/bin/db-upgrade.pl
+       su -l postgres -c "psql -c 'UPDATE groups SET 
register_time=EXTRACT(EPOCH FROM NOW());' %{dbname}"
+
        service httpd graceful
 else
        # Upgrade





reply via email to

[Prev in Thread] Current Thread [Next in Thread]