summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2009-03-04 14:07:27 -0500
committerRob Crittenden <rcritten@redhat.com>2009-03-04 15:40:06 -0500
commitc25181be57a108124e8b5ae424ade6de8372c1fb (patch)
treecaf77217c07ad397fa279f7f653a5ac73364ee1a
parenteb0601a19c0d939c83965e4a71b948f3894394a9 (diff)
downloadfreeipa-c25181be57a108124e8b5ae424ade6de8372c1fb.tar.gz
freeipa-c25181be57a108124e8b5ae424ade6de8372c1fb.tar.xz
freeipa-c25181be57a108124e8b5ae424ade6de8372c1fb.zip
Don't build radius by default
-rw-r--r--Makefile14
-rw-r--r--ipa.spec.in21
2 files changed, 26 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index f9d4367d6..ecbe47ec9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
include VERSION
-SUBDIRS=daemons install ipapython ipa-client ipa-radius-server ipa-radius-admintools
+SUBDIRS=daemons install ipapython ipa-client
+RADIUSDIRS=ipa-radius-server ipa-radius-admintools
PRJ_PREFIX=ipa
@@ -41,6 +42,11 @@ all: bootstrap-autogen server
(cd $$subdir && $(MAKE) $@) || exit 1; \
done
+radius:
+ @for subdir in $(RADIUSDIRS); do \
+ (cd $$subdir && $(MAKE) all) || exit 1; \
+ done
+
bootstrap-autogen: version-update
@echo "Building IPA $(IPA_VERSION)"
cd daemons; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
@@ -52,6 +58,11 @@ install: all server-install
(cd $$subdir && $(MAKE) $@) || exit 1; \
done
+radius-install: radius install
+ @for subdir in $(RADIUSDIRS); do \
+ (cd $$subdir && $(MAKE) install) || exit 1; \
+ done
+
test:
./make-test
@@ -99,7 +110,6 @@ archive-cleanup:
tarballs: local-archive
-mkdir -p dist/sources
# tar up clean sources
- ls dist/$(TARBALL_PREFIX)
cd dist/$(TARBALL_PREFIX)/ipa-client; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
cd dist/$(TARBALL_PREFIX)/daemons; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
cd dist/$(TARBALL_PREFIX)/install; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
diff --git a/ipa.spec.in b/ipa.spec.in
index f65e9e43e..629773dd4 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -3,6 +3,8 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define POLICYCOREUTILSVER 1.33.12-1
+# Define WITH_RADIUS to build the radius packages
+%define WITH_RADIUS 0
Name: ipa
Version: __VERSION__
@@ -165,6 +167,7 @@ user, virtual machines, groups, authentication credentials), Policy
logs, analysis thereof). If you are using IPA you need to install this
package.
+%if %{WITH_RADIUS}
%package radius-server
Summary: IPA authentication server - radius plugin
Group: System Environment/Base
@@ -191,6 +194,7 @@ user, virtual machines, groups, authentication credentials), Policy
(configuration settings, access control information) and Audit (events,
logs, analysis thereof). This package provides command-line tools for
administering radius authentication settings in IPA.
+%endif
%prep
@@ -200,6 +204,8 @@ administering radius authentication settings in IPA.
export CFLAGS="$CFLAGS %{optflags}"
export CPPFLAGS="$CPPFLAGS %{optflags}"
make version-update
+touch daemons/NEWS daemons/README daemons/AUTHORS daemons/ChangeLog
+touch install/NEWS install/README install/AUTHORS install/ChangeLog
cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
@@ -227,15 +233,11 @@ rm %{buildroot}/%{plugin_dir}/libipa_winsync.la
mkdir -p %{buildroot}/%{_sysconfdir}/ipa/html
mkdir -p %{buildroot}/%{_localstatedir}/cache/ipa/sysrestore
mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore
-#mv %{buildroot}/%{_usr}/share/ipa/html/ssbrowser.html %{buildroot}/%{_sysconfdir}/ipa/html
-#mv %{buildroot}/%{_usr}/share/ipa/html/unauthorized.html %{buildroot}/%{_sysconfdir}/ipa/html
mkdir %{buildroot}%{_usr}/share/ipa/html/
ln -s ../../../..%{_sysconfdir}/ipa/html/ssbrowser.html \
%{buildroot}%{_usr}/share/ipa/html/ssbrowser.html
ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \
%{buildroot}%{_usr}/share/ipa/html/unauthorized.html
-ln -s ../../../..%{python_sitelib}/ipaserver/mod_python_xmlrpc.py \
- %{buildroot}%{_usr}/share/ipa/ipaserver/mod_python_xmlrpc.py
%clean
rm -rf %{buildroot}
@@ -343,8 +345,8 @@ fi
%config(noreplace) %{_sysconfdir}/ipa/html/unauthorized.html
%{_usr}/share/ipa/ipa.conf
%{_usr}/share/ipa/ipa-rewrite.conf
-%dir %{_usr}/share/ipa/ipaserver
-%{_usr}/share/ipa/ipaserver/*
+#%dir %{_usr}/share/ipa/ipaserver
+#%{_usr}/share/ipa/ipaserver/*
%dir %{_usr}/share/ipa/updates/
%{_usr}/share/ipa/updates/*
%attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so
@@ -403,9 +405,9 @@ fi
%endif
%config(noreplace) %{_sysconfdir}/ipa/ipa.conf
+%if %{WITH_RADIUS}
%files radius-server
%doc LICENSE README
-%{_sbindir}/ipa-radius-install
%{_usr}/share/ipa/ipaserver/plugins/*
%dir %{_usr}/share/ipa/plugins
%{_usr}/share/ipa/plugins/radius.radiusd.conf.template
@@ -420,8 +422,13 @@ fi
%{_sbindir}/ipa-findradiusprofile
%{_sbindir}/ipa-modradiusclient
%{_sbindir}/ipa-modradiusprofile
+%endif
%changelog
+* Thu Mar 4 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-2
+- Build radius separately
+- Fix a few minor issues
+
* Tue Feb 3 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-1
- Replace TurboGears requirement with python-cherrypy