From: scheiter <scheiter@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 11 Apr 2007 08:53:17 +0000 (+0000)
Subject: Resynced gosa specfile
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=55278c88fc61c64da9c512e15999a0150264267a;p=gosa.git

Resynced gosa specfile


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6007 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/contrib/gosa.spec b/contrib/gosa.spec
index f67775009..45b6b77b1 100644
--- a/contrib/gosa.spec
+++ b/contrib/gosa.spec
@@ -11,7 +11,7 @@
 #
 Summary: 		Web Based LDAP Administration Program 
 Name:			gosa
-Version: 		2.5.8
+Version: 		2.5.10cvs
 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_php4,php4,php4-gd,php4-ldap,php4-mcrypt,php4-mysql,php4-imap,php4-iconv,php4-mbstring,php4-gettext,php4-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
@@ -112,6 +125,8 @@ DIRS="doc ihtml plugins html include locale"
 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 \
@@ -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})
@@ -202,6 +217,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 +238,15 @@ rm -rf %{buildroot}
 /usr/share/gosa/doc/guide/user/nl
 
 %changelog
+* 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