diff --git a/contrib/gosa.spec b/contrib/gosa.spec
index 287118113c2a9132e5c049c4f7ab7fea21a7e639..6ee8f5459c7af4b77da5d3e1456d5981f6fbbecb 100644 (file)
--- a/contrib/gosa.spec
+++ b/contrib/gosa.spec
#
Summary: Web Based LDAP Administration Program
Name: gosa
-Version: 2.5.6
+Version: 2.5.10
Release: 1
License: GPL
Source: ftp://oss.GONICUS.de/pub/gosa/%{sourcename}.tar.bz2
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
Group: System/Administration
Summary: Schema Definitions for the GOSA package
%if %{suse}
-Requires: openldap2 >= 2.2.6
+Requires: openldap2 >= 2.1.22
%else
Requires: openldap-servers >= 2.2.0
%endif
%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
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 \
/bin/cp /etc/shells /etc/gosa
%pre
-# Cleanup compile dir on updates
-[ -d /var/spool/gosa ] && rm -rf /var/spool/gosa/*
+# Cleanup compile dir on updates, always exit cleanly even on errors
+[ -d /var/spool/gosa ] && rm -rf /var/spool/gosa/* ; exit 0
%postun
# Remove temporary files, just to be sure
-rm -rf /var/spool/gosa/
+[ -d /var/spool/gosa ] && rm -rf /var/spool/gosa/* ; exit 0
%files
%defattr(-,%{apacheuser},%{apachegroup})
%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
/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
+
+* 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
+
* Fri Nov 17 2006 Lars Scheiter <lars.scheiter@GONICUS.de> 2.5.6
- New upstream
- Cleanup temporary dir after package removal