rpms/horde/F-8 .cvsignore, 1.6, 1.7 horde.spec, 1.7, 1.8 sources, 1.6, 1.7

[Nigel Jones (nigelj)]

Author: nigelj

Update of /cvs/pkgs/rpms/horde/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9690/F-8

Modified Files:
	.cvsignore horde.spec sources 
Log Message:
Update to 3.2.1 as in Rawhide for XSS security update (Bug #452539)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/horde/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Mar 2008 16:56:27 -0000	1.6
+++ .cvsignore	24 Jun 2008 04:09:15 -0000	1.7
@@ -1 +1 @@
-horde-3.1.7.tar.gz
+horde-3.2.1.tar.gz


Index: horde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/horde/F-8/horde.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- horde.spec	4 Apr 2008 05:35:13 -0000	1.7
+++ horde.spec	24 Jun 2008 04:09:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		horde
-Version:	3.1.7
-Release:	2%{?dist}
+Version:	3.2.1
+Release:	1%{?dist}
 Summary:	The common Horde Framework for all Horde applications
 
 Source0:	ftp://ftp.horde.org/pub/horde/tarballs/horde-%{version}.tar.gz
@@ -17,7 +17,6 @@
 Requires:	php-pear(File)
 Requires:	php-pear(Log)
 Requires:	php-pear(Mail_Mime)
-Requires:	php-pear(Mail_mimeDecode)
 Requires(post):	/sbin/service
 Requires(postun):	/sbin/service
 
@@ -35,6 +34,35 @@
 
 For additional functionality, also install horde-enhanced
 
+%package enhanced
+Summary:	Adds extra functionality to the horde framework
+Group:		Applications/Internet
+BuildArch:	noarch
+
+Requires:	%{name}
+Requires:	php-mbstring
+Requires:	php-mcrypt
+Requires:	php-pecl(Fileinfo)
+Requires:	php-pear(Auth_SASL)
+Requires:	php-pear(Date)
+Requires:	php-pear(HTTP_Request)
+Requires:	php-pear(Net_Socket)
+Requires:	php-pear(Net_SMTP)
+
+%description enhanced
+A collection of other external packages that extend the horde framework,
+including:
+	php-imap
+	php-mbstring
+	php-mcrypt
+	php-pecl-Fileinfo
+	php-pear-Auth-SASL
+	php-pear-Date
+	php-pear-HTTP-Request
+	php-pear-Mail
+	php-pear-Net-Socket
+	php-pear-Net-SMTP
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -202,58 +230,32 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc docs/ COPYING README README.Fedora
 # Apache horde.conf file
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%{_datadir}/%{name}
 
-%doc docs/
-%doc COPYING
-%doc README
-%doc README.Fedora
 # Mark configuration files with %config and use secure permissions
 # (note that .dist and .xml files are not user-edited and may change each
 #	release, so we don't mark noreplace)
 
-%attr(0770,apache,apache) %config %dir %{_sysconfdir}/%{name}
+%attr(0770,apache,apache) %config %{_sysconfdir}/%{name}
 %attr(0640,apache,apache) %config %{_sysconfdir}/%{name}/*.dist
 %attr(0660,apache,apache) %config(noreplace) %{_sysconfdir}/%{name}/*.php
 %attr(0660,apache,apache) %config %{_sysconfdir}/%{name}/*.xml
 
-%package enhanced
-Summary:	Adds extra functionality to the horde framework
-Group:		Applications/Internet
-BuildArch:	noarch
 
-Requires:	%{name}
-Requires:	php-imap
-Requires:	php-mbstring
-Requires:	php-mcrypt
-Requires:	php-pecl(Fileinfo)
-Requires:	php-pear(Auth_SASL)
-Requires:	php-pear(Date)
-Requires:	php-pear(HTTP_Request)
-Requires:	php-pear(Mail)
-Requires:	php-pear(Net_Socket)
-Requires:	php-pear(Net_SMTP)
-
-%description enhanced
-A collection of other external packages that extend the horde framework,
-including:
-	php-imap
-	php-mbstring
-	php-mcrypt
-	php-pecl-Fileinfo
-	php-pear-Auth-SASL
-	php-pear-Date
-	php-pear-HTTP-Request
-	php-pear-Mail
-	php-pear-Net-Socket
-	php-pear-Net-SMTP
+%{_datadir}/%{name}
 
 %files enhanced
 %doc README.Fedora
 
 %changelog
+* Sun Jun 22 2008 Nigel Jones <dev at nigelj.com> - 3.2.1-1
+- New Upstream (3.2.1) - Security Updates mainly
+
+* Wed May 28 2008 Nigel Jones <dev at nigelj.com> - 3.2-1
+- New Upstream (3.2) & Spec file cleanups
+
 * Thu Apr  3 2008 Brandon Holbrook <fedora at theholbrooks.org> 3.1.7-2
 - Now requires php-pear-Mail-mimeDecode
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/horde/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Mar 2008 16:56:27 -0000	1.6
+++ sources	24 Jun 2008 04:09:15 -0000	1.7
@@ -1 +1 @@
-c0e693f88d95e395671abbff2ab6df53  horde-3.1.7.tar.gz
+61f483867548004e539b54d04973292b  horde-3.2.1.tar.gz