rpms/ipa/F-10 .cvsignore, 1.6, 1.7 ipa.spec, 1.20, 1.21 sources, 1.11, 1.12 freeipa-cherrypy.patch, 1.1, NONE freeipa-delegation.patch, 1.1, NONE freeipa-webui-logging.patch, 1.1, NONE

[rcritten]

Author: rcritten

Update of /cvs/extras/rpms/ipa/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28876

Modified Files:
	.cvsignore ipa.spec sources 
Removed Files:
	freeipa-cherrypy.patch freeipa-delegation.patch 
	freeipa-webui-logging.patch 
Log Message:
- New upstream release 1.2.2
- Own /etc/httpd/conf.d/ipa-*.conf as config files
- Change SELinux BuildRequires to just the Makefile



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Dec 2008 20:42:42 -0000	1.6
+++ .cvsignore	9 Sep 2009 20:02:47 -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/F-10/ipa.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ipa.spec	18 Jun 2009 20:46:09 -0000	1.20
+++ ipa.spec	9 Sep 2009 20:02:47 -0000	1.21
@@ -5,8 +5,8 @@
 %define POLICYCOREUTILSVER 1.33.12-1
 
 Name:           ipa
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -30,15 +30,11 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  popt-devel
-BuildRequires:  selinux-policy-devel
+BuildRequires:  /usr/share/selinux/devel/Makefile
 BuildRequires:  m4
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
 BuildRequires:  TurboGears
 
-Patch0: freeipa-delegation.patch
-Patch1: freeipa-cherrypy.patch
-Patch2: freeipa-webui-logging.patch
-
 %description
 IPA is an integrated solution to provide centrally managed Identity (machine,
 user, virtual machines, groups, authentication credentials), Policy
@@ -197,10 +193,6 @@ administering radius authentication sett
 %prep
 %setup -n freeipa-%{version} -q
 
-%patch0 -p1 -b .delegation
-%patch1 -p1 -b .cherrypy
-%patch2 -p1 -b .webui-logging
-
 %build
 export CFLAGS="$CFLAGS %{optflags}"
 export CPPFLAGS="$CPPFLAGS %{optflags}"
@@ -238,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}
 
@@ -340,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
@@ -473,6 +472,11 @@ 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
+- Change SELinux BuildRequires to just the Makefile
+
 * Thu Jun 18 2009 Rob Crittenden <rcritten at redhat.com> - 1.2.1-2
 - Resolves BZ 505686, workaround if both python-cherrypy and
   python-cherrypy2 are loaded.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	5 Dec 2008 20:42:42 -0000	1.11
+++ sources	9 Sep 2009 20:02:47 -0000	1.12
@@ -1 +1 @@
-e934709fe92a41696ca4dd341ea9066d  freeipa-1.2.1.tar.gz
+aec42d3e5228301f7d16e2b068421ec8  freeipa-1.2.2.tar.gz


--- freeipa-cherrypy.patch DELETED ---


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


--- freeipa-webui-logging.patch DELETED ---