summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am16
-rw-r--r--configure.ac2
-rw-r--r--contrib/sssd.spec.in (renamed from sssd.spec.in)6
3 files changed, 17 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 04c22158f..d569605a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ RPMBUILD ?= $(PWD)/rpmbuild
builddir ?= .
dist_noinst_DATA = \
- sssd.spec.in \
+ contrib/sssd.spec.in \
BUILD.txt \
COPYING
@@ -18,11 +18,17 @@ rpmroot:
mkdir -p $(RPMBUILD)/SRPMS
rpms: dist-gzip rpmroot
- cp $(builddir)/sssd.spec $(RPMBUILD)/SPECS
+ cp $(builddir)/contrib/sssd.spec $(RPMBUILD)/SPECS
cp $(distdir).tar.gz $(RPMBUILD)/SOURCES
- cd $(RPMBUILD); rpmbuild --define "_topdir $(RPMBUILD)" -ba SPECS/sssd.spec
+ cd $(RPMBUILD); \
+ rpmbuild --define "_topdir $(RPMBUILD)" -ba SPECS/sssd.spec
+# make srpms will use the old digest algorithm to be compatible
+# with RHEL5
srpms: dist-gzip rpmroot
- cp $(builddir)/sssd.spec $(RPMBUILD)/SPECS
+ cp $(builddir)/contrib/sssd.spec $(RPMBUILD)/SPECS
cp $(distdir).tar.gz $(RPMBUILD)/SOURCES
- cd $(RPMBUILD); rpmbuild --define "_topdir $(RPMBUILD)" -bs SPECS/sssd.spec
+ cd $(RPMBUILD); \
+ rpmbuild --define "_topdir $(RPMBUILD)" \
+ --define _source_filedigest_algorithm=1 \
+ -bs SPECS/sssd.spec
diff --git a/configure.ac b/configure.ac
index 0fb6d7344..d8d092af5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,5 +7,5 @@ AC_PROG_INSTALL
AC_CONFIG_SUBDIRS([replace common server sss_client])
-AC_CONFIG_FILES([Makefile sssd.spec])
+AC_CONFIG_FILES([Makefile contrib/sssd.spec])
AC_OUTPUT
diff --git a/sssd.spec.in b/contrib/sssd.spec.in
index 49e266153..7b257e21d 100644
--- a/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -30,7 +30,8 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: m4
-BuildRequires: popt-devel
+%{?fedora:BuildRequires: popt-devel}
+%{?rhel:BuildRequires: popt}
BuildRequires: libtalloc-devel
BuildRequires: libtevent-devel
BuildRequires: libtdb-devel
@@ -135,6 +136,9 @@ if [ $1 -ge 1 ] ; then
fi
%changelog
+* Wed Sep 02 2009 Stephen Gallagher <sgallagh@redhat.com> - 0.5.0-0
+- New upstream release 0.5.0
+
* Mon May 18 2009 Stephen Gallagher <sgallagh@redhat.com> - 0.4.0-1
- Convert build system to automake