X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fgosa.spec;h=a737bfaa875d8bf9ca1ce9b5314cbd52378d1c33;hb=5c7ae73b8318f0e8cd3a721a0f9fe72aa3d3aee9;hp=45b6b77b1675dbc742ad54dc8c9026baf9597f8a;hpb=55278c88fc61c64da9c512e15999a0150264267a;p=gosa.git

diff --git a/contrib/gosa.spec b/contrib/gosa.spec
index 45b6b77b1..a737bfaa8 100644
--- a/contrib/gosa.spec
+++ b/contrib/gosa.spec
@@ -11,7 +11,7 @@
 #
 Summary: 		Web Based LDAP Administration Program 
 Name:			gosa
-Version: 		2.5.10cvs
+Version: 		2.5.99cvs
 Release:		1
 License: 		GPL
 Source: 		ftp://oss.GONICUS.de/pub/gosa/%{sourcename}.tar.bz2
@@ -21,7 +21,7 @@ Vendor:			GONICUS GmbH
 Packager:		Lars Scheiter <lars.scheiter@GONICUS.de>
 Buildarch: 		noarch
 %if %{suse}
-Requires:		apache2,apache2-mod_php4,php4,php4-gd,php4-ldap,php4-mcrypt,php4-mysql,php4-imap,php4-iconv,php4-mbstring,php4-gettext,php4-session,ImageMagick
+Requires:		apache2,apache2-mod_php5,php5,php5-gd,php5-ldap,php5-mcrypt,php5-mysql,php5-imap,php5-iconv,php5-mbstring,php5-gettext,php5-session,ImageMagick
 %else
 Requires: 		httpd,php,php-ldap,php-imap,php-snmp,php-mysql,php-mbstring,ImageMagick
 %endif
@@ -121,7 +121,7 @@ find . -depth -name CVS -type d | xargs rm -rf
 mkdir -p %{buildroot}/usr/share/gosa
 
 # Copy
-DIRS="doc ihtml plugins html include locale"
+DIRS="doc ihtml plugins html include locale setup"
 for i in $DIRS; do \
   cp -ua $i %{buildroot}/usr/share/gosa/$i ; \
 done
@@ -169,7 +169,7 @@ EOF
 
 mkdir -p %{buildroot}/etc/openldap/schema/gosa
 mv contrib/openldap/*.schema %{buildroot}/etc/openldap/schema/gosa
-sed 's§"CONFIG_TEMPLATE_DIR", "../contrib/"§"CONFIG_TEMPLATE_DIR", "%{docdir}/"§g' %{buildroot}/usr/share/gosa/include/functions.inc > %{buildroot}/usr/share/gosa/include/functions.inc.new
+sed 's%"CONFIG_TEMPLATE_DIR", "../contrib/"%"CONFIG_TEMPLATE_DIR", "%{docdir}/"%g' %{buildroot}/usr/share/gosa/include/functions.inc > %{buildroot}/usr/share/gosa/include/functions.inc.new
 mv -f %{buildroot}/usr/share/gosa/include/functions.inc.new %{buildroot}/usr/share/gosa/include/functions.inc
 
 mv -f doc manual
@@ -209,6 +209,7 @@ rm -rf %{buildroot}
 %attr(0744, %{apacheuser}, %{apachegroup}) /usr/share/gosa/ihtml
 %attr(0744, %{apacheuser}, %{apachegroup}) /usr/share/gosa/include
 %attr(0744, %{apacheuser}, %{apachegroup}) /usr/share/gosa/locale
+%attr(0744, %{apacheuser}, %{apachegroup}) /usr/share/gosa/setup
 %attr(0744, %{apacheuser}, %{apachegroup}) /usr/share/gosa/plugins
 %attr(0744, %{apacheuser}, %{apachegroup}) /usr/share/gosa/doc/guide.xml
 
@@ -238,6 +239,9 @@ rm -rf %{buildroot}
 /usr/share/gosa/doc/guide/user/nl
 
 %changelog
+* Mon May 7 2007 Lars Scheiter <lars.scheiter@GONICUS.de> 2.5.99cvs
+- Changed packageversion to reflect CVS status of resulting build
+
 * Wed Apr 11 2007 Lars Scheiter <lars.scheiter@GONICUS.de> 2.5.10
 - New upstream
 - Added new subpackage mkntpasswd