rpms/ipa/devel .cvsignore, 1.6, 1.7 ipa.spec, 1.24, 1.25 sources, 1.11, 1.12 freeipa-delegation.patch, 1.1, NONE freeipa-selinux.patch, 1.1, NONE

[rcritten]

Author: rcritten

Update of /cvs/extras/rpms/ipa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29640

Modified Files:
	.cvsignore ipa.spec sources 
Removed Files:
	freeipa-delegation.patch freeipa-selinux.patch 
Log Message:
- New upstream release 1.2.2
- Own /etc/httpd/conf.d/ipa-*.conf as config files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipa/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Dec 2008 19:00:42 -0000	1.6
+++ .cvsignore	10 Sep 2009 21:25:13 -0000	1.7
@@ -1 +1 @@
-freeipa-1.2.1.tar.gz
+freeipa-1.2.2.tar.gz


Index: ipa.spec
===================================================================
RCS file: /cvs/extras/rpms/ipa/devel/ipa.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ipa.spec	21 Aug 2009 13:57:47 -0000	1.24
+++ ipa.spec	10 Sep 2009 21:25:13 -0000	1.25
@@ -5,8 +5,8 @@
 %define POLICYCOREUTILSVER 1.33.12-1
 
 Name:           ipa
-Version:        1.2.1
-Release:        6%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -35,9 +35,6 @@ BuildRequires:  m4
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
 BuildRequires:  TurboGears
 
-Patch0: freeipa-delegation.patch
-Patch1: freeipa-selinux.patch
-
 %description
 IPA is an integrated solution to provide centrally managed Identity (machine,
 user, virtual machines, groups, authentication credentials), Policy
@@ -196,9 +193,6 @@ administering radius authentication sett
 %prep
 %setup -n freeipa-%{version} -q
 
-%patch0 -p1 -b .delegation
-%patch1 -p1 -b .selinux
-
 %build
 export CFLAGS="$CFLAGS %{optflags}"
 export CPPFLAGS="$CPPFLAGS %{optflags}"
@@ -236,6 +230,11 @@ ln -s ../../../..%{_sysconfdir}/ipa/html
 ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \
     %{buildroot}%{_usr}/share/ipa/html/unauthorized.html
 
+# So we can own our Apache configuration
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
+/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa.conf
+/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
+
 %clean
 rm -rf %{buildroot}
 
@@ -338,6 +337,8 @@ fi
 %dir %{_usr}/share/ipa/html
 %{_usr}/share/ipa/html/ssbrowser.html
 %{_usr}/share/ipa/html/unauthorized.html
+%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa.conf
+%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
 %dir %{_sysconfdir}/ipa
 %dir %{_sysconfdir}/ipa/html
 %config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
@@ -471,6 +472,10 @@ fi
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Wed Sep  9 2009 Rob Crittenden <rcritten at redhat.com> - 1.2.2-1
+- New upstream release 1.2.2
+- Own /etc/httpd/conf.d/ipa-*.conf as config files
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-6
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipa/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	5 Dec 2008 19:00:42 -0000	1.11
+++ sources	10 Sep 2009 21:25:13 -0000	1.12
@@ -1 +1 @@
-e934709fe92a41696ca4dd341ea9066d  freeipa-1.2.1.tar.gz
+aec42d3e5228301f7d16e2b068421ec8  freeipa-1.2.2.tar.gz


--- freeipa-delegation.patch DELETED ---


--- freeipa-selinux.patch DELETED ---