rpms/turba/devel turba.spec,1.5,1.6

[Nigel Jones (nigelj)]

Author: nigelj

Update of /cvs/pkgs/rpms/turba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13398/turba/devel

Modified Files:
	turba.spec 
Log Message:
Rawhide Horde Updates


Index: turba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/turba/devel/turba.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- turba.spec	26 Feb 2008 09:08:51 -0000	1.5
+++ turba.spec	22 Jun 2008 03:44:30 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		turba
-Version:	2.1.7
+Version:	2.2
 Release:	1%{?dist}
 Summary:	The Horde contact management application
 
@@ -71,23 +71,18 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-# Include top level with %dir so not all files are sucked in
-%{_datadir}/horde/%{name}
-
-# Mark documentation files with %doc and %docdir
-%doc docs/
-%doc LICENSE
-%doc README
-
-# 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}/horde/%{name}
+%doc docs/ LICENSE README
+%attr(0770,apache,apache) %config %{_sysconfdir}/horde/%{name}
 %attr(0640,apache,apache) %config %{_sysconfdir}/horde/%{name}/*.dist
 %attr(0660,apache,apache) %config(noreplace) %{_sysconfdir}/horde/%{name}/*.php
 %attr(0660,apache,apache) %config %{_sysconfdir}/horde/%{name}/*.xml
 
+%{_datadir}/horde/%{name}
+
 %changelog
+* Wed May 28 2008 Nigel Jones <dev at nigelj.com> - 2.2-1
+- New Upstream (2.2) & Spec file cleanups
+
 * Tue Feb 26 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 2.1.7-1
 - Update to upstream: CVE-2008-0807: turba: insufficient access checks