summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2012-01-16 19:05:55 +0100
committerStephen Gallagher <sgallagh@redhat.com>2012-01-17 11:38:16 -0500
commit78e5b91e6b22efbcd0621144b104ac9dfd487e5b (patch)
tree8aac11aa7e46041a602955606121212b2067937e
parent70e59ed31c5a9c9ed02d9065ddf92be87c887efb (diff)
downloadsssd-78e5b91e6b22efbcd0621144b104ac9dfd487e5b.tar.gz
sssd-78e5b91e6b22efbcd0621144b104ac9dfd487e5b.tar.xz
sssd-78e5b91e6b22efbcd0621144b104ac9dfd487e5b.zip
Add a new Makefile target to build RPMs with the experimental flag
-rw-r--r--Makefile.am20
-rw-r--r--contrib/sssd.spec.in38
2 files changed, 53 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 971a14963..0cc2751fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1289,25 +1289,37 @@ rpmroot:
mkdir -p $(RPMBUILD)/SPECS
mkdir -p $(RPMBUILD)/SRPMS
-rpms: dist-gzip rpmroot
+rpmbrprep: dist-gzip rpmroot
cp $(builddir)/contrib/sssd.spec $(RPMBUILD)/SPECS
cp $(distdir).tar.gz $(RPMBUILD)/SOURCES
+
+rpms: rpmbrprep
cd $(RPMBUILD); \
rpmbuild --define "_topdir $(RPMBUILD)" -ba SPECS/sssd.spec
+experimental-rpms: rpmbrprep
+ cd $(RPMBUILD); \
+ rpmbuild --define "_topdir $(RPMBUILD)" \
+ --define "enable_experimental 1" \
+ -ba SPECS/sssd.spec
+
if GIT_CHECKOUT
prerelease-rpms:
cp $(srcdir)/version.m4 $(srcdir)/version.m4.orig
sed -e "s/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.*\])/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.`date +%Y%m%d.%H%M`.git`git log -1 --pretty=format:%h`\])/" < $(srcdir)/version.m4.orig > $(srcdir)/version.m4
$(MAKE) rpms
mv $(srcdir)/version.m4.orig $(srcdir)/version.m4
+
+prerelease-experimental-rpms:
+ cp $(srcdir)/version.m4 $(srcdir)/version.m4.orig
+ sed -e "s/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.*\])/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.`date +%Y%m%d.%H%M`.git`git log -1 --pretty=format:%h`\])/" < $(srcdir)/version.m4.orig > $(srcdir)/version.m4
+ $(MAKE) experimental-rpms
+ mv $(srcdir)/version.m4.orig $(srcdir)/version.m4
endif
# make srpms will use the old digest algorithm to be compatible
# with RHEL5
-srpm: dist-gzip rpmroot
- cp $(builddir)/contrib/sssd.spec $(RPMBUILD)/SPECS
- cp $(distdir).tar.gz $(RPMBUILD)/SOURCES
+srpm: rpmbrprep
cd $(RPMBUILD); \
rpmbuild --define "_topdir $(RPMBUILD)" \
--define _source_filedigest_algorithm=1 \
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 8bc51148f..e5d12bfcb 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -14,6 +14,10 @@
%global with_unicode_lib --with-unicode-lib=glib2
%endif
+%if (0%{?enable_experimental} == 1)
+%global experimental --enable-all-experimental-features
+%endif
+
# Determine the location of the LDB modules directory
%global ldb_modulesdir %(pkg-config --variable=modulesdir ldb)
@@ -158,6 +162,25 @@ Requires: libipa_hbac = %{version}-%{release}
The libipa_hbac-python contains the bindings so that libipa_hbac can be
used by Python applications.
+%if (0%{?enable_experimental} == 1)
+%package -n libsss_sudo
+Summary: A library to allow communication between SUDO and SSSD
+Group: Development/Libraries
+License: LGPLv3+
+
+%description -n libsss_sudo
+A utility library to allow communication between SUDO and SSSD
+
+%package -n libsss_sudo-devel
+Summary: A library to allow communication between SUDO and SSSD
+Group: Development/Libraries
+License: LGPLv3+
+Requires: libsss_sudo = %{version}-%{release}
+
+%description -n libsss_sudo-devel
+A utility library to allow communication between SUDO and SSSD
+%endif
+
%prep
%setup -q
@@ -183,7 +206,8 @@ autoreconf -ivf
--enable-pammoddir=/%{_lib}/security \
--disable-static \
--disable-rpath \
- %{with_unicode_lib}
+ %{with_unicode_lib} \
+ %{experimental}
make %{?_smp_mflags} all
@@ -341,6 +365,18 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{python_sitearch}/pyhbac.so
+%if (0%{?enable_experimental} == 1)
+%files -n libsss_sudo
+%defattr(-,root,root,-)
+%doc src/sss_client/COPYING src/sss_client/COPYING.LESSER
+%{_libdir}/sssd/modules/libsss_sudo.so.*
+
+%files -n libsss_sudo-devel
+%{_includedir}/sss_sudo.h
+%{_libdir}/sssd/modules/libsss_sudo.so
+%{_libdir}/pkgconfig/libsss_sudo.pc
+%endif
+
%post
/sbin/ldconfig
/sbin/chkconfig --add %{servicename}