From a098b26a2a902cfb2968ca44604f61bf000d8413 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 6 Mar 2012 10:24:56 -0500
Subject: Build experimental features by default in RPMs

---
 Makefile.am          | 13 -------------
 contrib/sssd.spec.in |  2 ++
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 30a640d14..2c666aeec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1454,12 +1454,6 @@ 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
@@ -1467,13 +1461,6 @@ prerelease-rpms:
 	$(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: rpmbrprep
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index e406ca96a..583ccbff4 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -17,6 +17,8 @@
 %define __provides_exclude_from %{python_sitearch}/.*\.so$
 %endif
 
+%global enable_experimental 1
+
 %if (0%{?enable_experimental} == 1)
 %global experimental --enable-all-experimental-features
 %endif
-- 
cgit