rpms/ipa/F-7 ipa.spec,1.5,1.6 sources,1.5,1.6

Robert Crittenden (rcritten) fedora-extras-commits at redhat.com
Tue Mar 18 13:49:28 UTC 2008


Author: rcritten

Update of /cvs/extras/rpms/ipa/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18340

Modified Files:
	ipa.spec sources 
Log Message:
Pull upstream changelog 722
Add Conflicts mod_ssl (435360)



Index: ipa.spec
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-7/ipa.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ipa.spec	29 Feb 2008 20:22:28 -0000	1.5
+++ ipa.spec	18 Mar 2008 13:48:50 -0000	1.6
@@ -6,7 +6,7 @@
 
 Name:           ipa
 Version:        0.99
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -15,7 +15,7 @@
 Source0:        freeipa-%{version}.tar.gz
 # Tree is not tagged or branched at 1.0 yet (soon). The tar.gz was created 
 # with:
-# hg clone -r 678 http://hg.fedorahosted.org/hg/freeipa freeipa-0.99
+# hg clone -r 722 http://hg.fedorahosted.org/hg/freeipa freeipa-0.99
 # rm -rf freeipa-0.99/.hg freeipa-0.99/.hgtags
 # tar czf freeipa-0.99.tar.gz freeipa-0.99
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +75,7 @@
 Requires: acl
 Requires: python-pyasn1
 Requires: libcap
+Conflicts: mod_ssl
 
 %description server
 IPA is an integrated solution to provide centrally managed Identity (machine,
@@ -281,6 +282,7 @@
 %{_sbindir}/ipa-server-certinstall
 %{_sbindir}/ipa_kpasswd
 %{_sbindir}/ipa_webgui
+%{_sbindir}/ipactl
 %attr(755,root,root) %{_initrddir}/ipa_kpasswd
 %attr(755,root,root) %{_initrddir}/ipa_webgui
 %dir %{_usr}/share/ipa
@@ -398,6 +400,10 @@
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Tue Mar 18 2008 Rob Crittenden <rcritten at redhat.com> 0.99-12
+- Pull upstream changelog 722
+- Add Conflicts mod_ssl (435360)
+
 * Thu Feb 29 2008 Rob Crittenden <rcritten at redhat.com> 0.99-11
 - Pull upstream changelog 698
 - Fix ownership of /var/log/ipa_error.log during install (435119)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Feb 2008 20:22:28 -0000	1.5
+++ sources	18 Mar 2008 13:48:50 -0000	1.6
@@ -1 +1 @@
-f3ef12445450381932412e603c51e50e  freeipa-0.99.tar.gz
+e0d64efce4d8298e1d893d342e0b4d95  freeipa-0.99.tar.gz




More information about the fedora-extras-commits mailing list