[Fusionforge-commits] r7396 - in branches/Branch_4_8/gforge: . plugins/scmcvs utils

Alexandre Neymann neymanna at libremir.placard.fr.eu.org
Tue Apr 14 11:14:07 CEST 2009


Author: neymanna
Date: 2009-04-14 11:14:07 +0200 (Tue, 14 Apr 2009)
New Revision: 7396

Modified:
   branches/Branch_4_8/gforge/fusionforge.spec
   branches/Branch_4_8/gforge/plugins/scmcvs/fusionforge-plugin-scmcvs.spec
   branches/Branch_4_8/gforge/utils/fusionforge-shell-postgresql.spec
Log:
improve rpm packaging

Modified: branches/Branch_4_8/gforge/fusionforge.spec
===================================================================
--- branches/Branch_4_8/gforge/fusionforge.spec	2009-04-14 08:17:51 UTC (rev 7395)
+++ branches/Branch_4_8/gforge/fusionforge.spec	2009-04-14 09:14:07 UTC (rev 7396)
@@ -22,7 +22,7 @@
 
 Summary: FusionForge Collaborative Development Environment
 Name: fusionforge
-Version: 4.7
+Version: 4.8
 Release: %{release}
 BuildArch: noarch
 License: GPL
@@ -307,6 +307,11 @@
 		mkdir -p $CHROOT
 	fi
 	
+	GROUPS_DIR=`grep '^groupdir=' %{GFORGE_CONF_DIR}/gforge.conf | sed 's/.*=\s*\(.*\)/\1/'`
+	if [ ! -d ${CHROOT}${GROUPS_DIR} ] ; then
+                mkdir -p ${CHROOT}${GROUPS_DIR}
+        fi	
+
 	ln -s %{GFORGE_DIR}/www/env.inc.php %{PLUGINS_LIB_DIR}/env.inc.php
 	
 	#if not the env.inc.php include-path isn't correct //not necessary if no more /usr/lib/gforge

Modified: branches/Branch_4_8/gforge/plugins/scmcvs/fusionforge-plugin-scmcvs.spec
===================================================================
--- branches/Branch_4_8/gforge/plugins/scmcvs/fusionforge-plugin-scmcvs.spec	2009-04-14 08:17:51 UTC (rev 7395)
+++ branches/Branch_4_8/gforge/plugins/scmcvs/fusionforge-plugin-scmcvs.spec	2009-04-14 09:14:07 UTC (rev 7396)
@@ -3,7 +3,7 @@
 
 Summary: CVS Plugin for GForge CDE
 Name: fusionforge-plugin-%{plugin}
-Version: 4.7
+Version: 4.8
 Release: %{release}
 BuildArch: noarch
 License: GPL
@@ -36,8 +36,6 @@
 %define GFORGE_DIR              %{_datadir}/gforge
 %define GFORGE_CONF_DIR         %{_sysconfdir}/gforge
 %define GFORGE_SBIN_DIR         %{_sbindir}
-#%define GFORGE_LIB_DIR          %{GFORGE_DIR}/lib
-#%define GFORGE_DB_DIR           %{GFORGE_DIR}/db
 %define GFORGE_BIN_DIR          %{GFORGE_DIR}/bin
 %define PLUGINS_LIB_DIR         %{GFORGE_DIR}/plugins
 %define PLUGINS_CONF_DIR        %{GFORGE_CONF_DIR}/plugins
@@ -89,13 +87,7 @@
 install -m 664 etc/plugins/%{plugin}/config.php $RPM_BUILD_ROOT/%{PLUGIN_CONF}/
 install -m 664 etc/plugins/%{plugin}/cvsweb.conf $RPM_BUILD_ROOT/%{PLUGIN_CONF}/
 
-# installing installation specific language files
-#install -m 755 -d $RPM_BUILD_ROOT/%{PLUGIN_CONF}/languages
-#if ls rpm-specific/languages/*.tab &> /dev/null; then
-#       cp rpm-specific/languages/*.tab $RPM_BUILD_ROOT/%{PLUGIN_CONF}/languages/
-#fi
 
-
 %pre
 
 %post
@@ -158,17 +150,11 @@
 %doc AUTHORS COPYING README
 %attr(0664, %{httpduser}, %{gfgroup}) %config(noreplace) %{PLUGIN_CONF}/config.php
 %attr(0660, %{httpduser}, %{gfgroup}) %config(noreplace) %{PLUGIN_CONF}/cvsweb.conf
-#%attr(0755,root,root) %{GFORGE_BIN_DIR}/cvsweb
 %{GFORGE_CONF_DIR}/httpd.d
-#%{PLUGIN_CONF}/languages
 %{PLUGIN_CONF}/config.pl
 %{PLUGIN_LIB}/bin
 %{PLUGIN_LIB}/common
 %{PLUGIN_LIB}/sbin
-#%{PLUGIN_LIB}/cgi-bin
-#%{PLUGIN_LIB}/include
-#%{PLUGIN_LIB}/lib
-#%{PLUGIN_LIB}/rpm-specific
 %{PLUGIN_LIB}/www
 %{PLUGIN_LIB}/cronjobs
 %{CROND_DIR}/%{name}

Modified: branches/Branch_4_8/gforge/utils/fusionforge-shell-postgresql.spec
===================================================================
--- branches/Branch_4_8/gforge/utils/fusionforge-shell-postgresql.spec	2009-04-14 08:17:51 UTC (rev 7395)
+++ branches/Branch_4_8/gforge/utils/fusionforge-shell-postgresql.spec	2009-04-14 09:14:07 UTC (rev 7396)
@@ -13,7 +13,7 @@
 Group: Development/Tools
 Source: %{name}-%{version}.tar.bz2
 AutoReqProv: off
-Requires: fusionforge >= 4.7
+Requires: fusionforge >= 4.8
 Requires: libnss-pgsql >= 1.4
 Requires: nscd
 #Requires: perl perl-URI




More information about the Fusionforge-commits mailing list