Reverted template changes

[gosa.git] / contrib / gosa.spec

diff --git a/contrib/gosa.spec b/contrib/gosa.spec
index d05d2f96be875187f15081575c1988408ab98009..4b71e901d70396f0cc3e8f277c9e4e49617be31c 100644 (file)
--- a/contrib/gosa.spec
+++ b/contrib/gosa.spec
@@ -11,8 +11,8 @@
 #
 Summary:               Web Based LDAP Administration Program 
 Name:                  gosa
-Version:               2.4beta1
-Release:               1
+Version:               2.4
+Release:               2
 License:               GPL
 Source:                ftp://oss.GONICUS.de/pub/gosa/beta/%{sourcename}.tar.bz2
 URL:                   http://oss.GONICUS.de/project/?group_id=6
@@ -21,7 +21,7 @@ Vendor:                       GONICUS GmbH
 Packager:              Lars Scheiter <lars.scheiter@GONICUS.de>
 Buildarch:             noarch
 %if %{suse}
-Requires:              apache2,php4,php4-gd,php4-ldap,php4-mcrypt,php4-imap,php4-iconv,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-posix,ImageMagick,perl-Crypt-SmbHash
 %else
 Requires:              httpd,php,php-ldap,php-imap,perl-Crypt-SmbHash >= 0.02,ImageMagick
 %endif
@@ -35,11 +35,13 @@ BuildArch:          noarch
        %define apacheuser wwwrun
        %define apachegroup root
        %define webconf /etc/apache2/conf.d/
+       %define docdir /usr/share/doc/packages/gosa
 %else
        %{echo:Building other rpm}
        %define apacheuser apache 
        %define apachegroup apache 
        %define webconf /etc/httpd/conf.d/      
+       %define docdir /usr/share/doc/gosa-%{version}
 %endif
 
 %description
@@ -99,7 +101,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", "/usr/share/doc/gosa-%{version}/"§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
 mkdir -p %{buildroot}/etc/gosa/vacation
@@ -119,10 +121,10 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,%{apacheuser},%{apachegroup})
-%doc %attr(-,root,root) AUTHORS TODO README manual/README.openxchange README.safemode Changelog COPYING INSTALL FAQ
+%doc %attr(-,root,root) AUTHORS TODO README manual/* README.safemode Changelog COPYING INSTALL FAQ
 %doc %attr(-,root,root) manual 
 %doc %attr(-,root,root) contrib/altlinux contrib/fix_config.sh contrib/gosa.conf contrib/mysql contrib/opensides
-%doc %attr(-,root,root) contrib/patches contrib/postgresql contrib/scripts contrib/vacation_example.txt
+%doc %attr(-,root,root) contrib/patches contrib/scripts contrib/vacation_example.txt
 
 %config(noreplace) %attr(0600,%{apacheuser},%{apachegroup}) %{webconf}/gosa_include.conf
 %config(noreplace) %attr(0700,%{apacheuser},%{apachegroup}) /etc/gosa
@@ -131,15 +133,23 @@ rm -rf %{buildroot}
 
 %files schema
 %defattr(-,root,root)
-%doc COPYING AUTHORS README contrib/iplanet contrib/demo.ldif contrib/openldap
+%doc COPYING AUTHORS README contrib/demo.ldif contrib/openldap
 /etc/openldap/schema/gosa
 
 %changelog
-* Mon May 24 2005 Lars Scheiter <lars.scheiter@GONICUS.de> 2.4beta1
+* Mon Dec 19 2005 Lars Scheiter <lars.scheiter@GONICUS.de> 2.4-2
+- Updated SuSE dependencies to php5
+
+* Mon Nov 21 2005 Lars Scheiter <lars.scheiter@GONICUS.de> 2.4
+- New upstream version
+- Removed %doc for postgresql and openexchange
+
+* Wed Jun 01 2005 Lars Scheiter <lars.scheiter@GONICUS.de> 2.4beta1
 - New upstream version
 - Added gosa.conf to contrib dir
 - Rearranged documentation stuff
 - Updated dependencies
+- compress some files
 
 * Mon Feb 21 2005 Lars Scheiter <lars.scheiter@GONICUS.de> 2.3
 - Update version to 2.3 (upstream)