rpms/horde/devel horde.spec,1.7,1.8
Nigel Jones (nigelj)
fedora-extras-commits at redhat.com
Sun Jun 22 03:45:02 UTC 2008
Author: nigelj
Update of /cvs/pkgs/rpms/horde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13398/horde/devel
Modified Files:
horde.spec
Log Message:
Rawhide Horde Updates
Index: horde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/horde/devel/horde.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- horde.spec 4 Apr 2008 05:22:46 -0000 1.7
+++ horde.spec 22 Jun 2008 03:42:34 -0000 1.8
@@ -1,6 +1,6 @@
Name: horde
-Version: 3.1.7
-Release: 2%{?dist}
+Version: 3.2
+Release: 1%{?dist}
Summary: The common Horde Framework for all Horde applications
Source0: ftp://ftp.horde.org/pub/horde/tarballs/horde-%{version}.tar.gz
@@ -35,6 +35,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 +231,29 @@
%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
+* 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
More information about the scm-commits
mailing list