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

diff --git a/contrib/gosa.spec b/contrib/gosa.spec
index cf8208b0e..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.7
+Version: 		2.5.99cvs
 Release:		1
 License: 		GPL
 Source: 		ftp://oss.GONICUS.de/pub/gosa/%{sourcename}.tar.bz2
@@ -21,9 +21,9 @@ 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,perl-Crypt-SmbHash
+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,perl-Crypt-SmbHash >= 0.02,ImageMagick
+Requires: 		httpd,php,php-ldap,php-imap,php-snmp,php-mysql,php-mbstring,ImageMagick
 %endif
 BuildRoot: 		%{_tmppath}/%{name}-%{version}-root
 BuildArch:		noarch
@@ -64,6 +64,19 @@ Obsoletes:		gosa-ldap
 %description schema
 Contains the Schema definition files for the GOSA admin package.
 
+%package mkntpasswd
+Group: 			System/Administration
+Summary: 		Schema Definitions for the GOSA package
+%if %{suse}
+Requires:		perl-Crypt-SmbHash
+%else
+Requires:		perl-Crypt-SmbHash >= 0.02
+%endif
+
+%description mkntpasswd
+Wrapper Script around perl to create Samba Hashes on the fly, added for completeness only.
+If in doubt use sambas "native" mkntpwd tool to generate hashes for GOsa.
+
 %package help-en
 Group: 			System/Administration
 Summary: 		English online manual for GOSA package
@@ -108,10 +121,12 @@ 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
+mkdir %{buildroot}/usr/bin
+cp bin/mkntpasswd %{buildroot}/usr/bin/
 
 # Create files for temporary stuff
 for i in compile config cache; do \
@@ -154,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
@@ -179,7 +194,7 @@ rm -rf %{buildroot}
 
 %postun
 # Remove temporary files, just to be sure
-[ -d /var/spool/gosa ] && rm -rf /var/spool/gosa/ ; exit 0
+[ -d /var/spool/gosa ] && rm -rf /var/spool/gosa/* ; exit 0
 
 %files
 %defattr(-,%{apacheuser},%{apachegroup})
@@ -194,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
 
@@ -202,6 +218,10 @@ rm -rf %{buildroot}
 %doc COPYING AUTHORS README contrib/demo.ldif contrib/openldap
 /etc/openldap/schema/gosa
 
+%files mkntpasswd
+%defattr(-,root,root)
+/usr/bin/mkntpasswd
+
 %files help-en
 %defattr(-,root,root)
 /usr/share/gosa/doc/guide/user/en
@@ -219,6 +239,21 @@ 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
+- Remove perl dependencies off of GOsa main package
+
+* Tue Mar 6 2007 Lars Scheiter <lars.scheiter@GONICUS.de> 2.5.9
+- New upstream
+- fixed typo in updateprocess
+
+* Mon Jan 15 2007 Lars Scheiter <lars.scheiter@GONICUS.de> 2.5.8
+- New upstream release with security fixes
+
 * Wed Dec 20 2006 Lars Scheiter <lars.scheiter@GONICUS.de> 2.5.7
 - New upstream
 - %pre and %postun always end successfully now, even on errors