X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fredhat%2Fgosa.spec;h=cb555cd716c523cdd8bad0442c442108c75eb5f8;hb=47fbcd71058574142e2c43d7062fee2258908b13;hp=4e5202c4aa53225f0a68f32df8895dd6f78c7b79;hpb=732cbb435fc7ea9bbafa7083a6aa98934fb13b56;p=gosa.git

diff --git a/gosa-core/redhat/gosa.spec b/gosa-core/redhat/gosa.spec
index 4e5202c4a..cb555cd71 100644
--- a/gosa-core/redhat/gosa.spec
+++ b/gosa-core/redhat/gosa.spec
@@ -11,7 +11,7 @@
 #
 Summary: 		Web Based LDAP Administration Program 
 Name:			gosa
-Version: 		2.6.1
+Version: 		2.6.8
 Release:		1
 License: 		GPL
 Source: 		ftp://oss.GONICUS.de/pub/gosa/%{sourcename}.tar.bz2
@@ -27,7 +27,7 @@ Patch3:			04_fix_online_help_location.patch
 %if %{suse}
 Requires:		apache2,apache2-mod_php5,php5,php5-gd,php5-ldap,php5-mcrypt,php5-mysql,php5-imap,php5-iconv,php5-hash,php5-posix,php5-mbstring,php5-gettext,ImageMagick,gettext-tools
 %else
-Requires: 		httpd,php,php-ldap,php-imap,php-snmp,php-mysql,php-mbstring,ImageMagick,php-mhash,perl-Crypt-SmbHash
+Requires: 		httpd,php,php-ldap,php-imap,php-snmp,php-mysql,php-mbstring,ImageMagick,perl-Crypt-SmbHash
 %endif
 BuildRoot: 		%{_tmppath}/%{name}-%{version}-root
 BuildArch:		noarch
@@ -257,8 +257,10 @@ do
 done
 
 %if %{suse}
-	sed -i 's#/usr/bin/php#/usr/bin/php5#' %{buildroot}/usr/bin/update-gosa
-	cat <<-EOF >> %{webroot}/gosa-apache.conf
+	sed -i 's#/usr/bin/php#/usr/bin/php5#' %{buildroot}/usr/sbin/update-gosa
+	sed -i 's#/usr/bin/php#/usr/bin/php5#' %{buildroot}/usr/sbin/gosa-encrypt-passwords
+	cat <<-EOF >> %{buildroot}%{webconf}/gosa-apache.conf
+	
 	<Directory /usr/share/gosa/html>
 	    Options None
 	    AllowOverride None
@@ -315,12 +317,12 @@ rm -rf %{buildroot}
 %config(noreplace) %attr(0644,root,root) %{webconf}/gosa-apache.conf
 %attr(0700, %{apacheuser}, %{apachegroup}) /var/spool/gosa
 %attr(0755, root,root) /usr/share/gosa
-%attr(0755, root,root) /usr/share/gosa/html
-%attr(0755, root,root) /usr/share/gosa/ihtml
-%attr(0755, root,root) /usr/share/gosa/include
-%attr(0755, root,root) /usr/share/gosa/locale
-%attr(0755, root,root) /usr/share/gosa/plugins
-%attr(0755, root,root) /usr/share/gosa/setup
+#%attr(0755, root,root) /usr/share/gosa/html
+#%attr(0755, root,root) /usr/share/gosa/ihtml
+#%attr(0755, root,root) /usr/share/gosa/include
+#%attr(0755, root,root) /usr/share/gosa/locale
+#%attr(0755, root,root) /usr/share/gosa/plugins
+#%attr(0755, root,root) /usr/share/gosa/setup
 %attr(0755, root,root) /usr/share/gosa/doc/core/guide.xml
 %attr(0755, root,root) /var/cache/gosa
 %attr(0700, root,root) /etc/gosa/gosa.secrets