On 09/02/2009 08:01 AM, Stephen Gallagher wrote: > On 09/01/2009 04:46 PM, Stephen Gallagher wrote: >> On 09/01/2009 04:43 PM, Simo Sorce wrote: >>> On Tue, 2009-09-01 at 16:15 -0400, Stephen Gallagher wrote: >>>> Also create a new spec file for RHEL5 > >>> Ack, although later it may be worth considering if it makes sense to >>> have just one spec file with conditionals. > >>> Simo. > > >> Well, I hope the contrib directory will eventually contain spec files >> for other OSes as well, such as SUSE and Mandriva, so this isn't a >> terrible precedent either, I think. > > > self-nack. I found some problems in testing with the RHEL5 specfile. > _______________________________________________ > sssd-devel mailing list > sssd-devel@lists.fedorahosted.org > https://fedorahosted.org/mailman/listinfo/sssd-devel >
New version. I have combined the two spec files into one and cleared up some glitches in the earlier patch. _______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/sssd-devel -- Stephen Gallagher RHCE 804006346421761 Looking to carve out IT costs? www.redhat.com/carveoutcosts/
From 2a051014773f039b9f7af1a83d40b8bacc1a4ea5 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgall...@redhat.com>
Date: Tue, 1 Sep 2009 16:02:46 -0400
Subject: [PATCH] Move RPM specfiles into contrib/
Support RHEL 5 in the spec file
---
Makefile.am | 16 +++++++++++-----
configure.ac | 2 +-
sssd.spec.in => contrib/sssd.spec.in | 6 +++++-
3 files changed, 17 insertions(+), 7 deletions(-)
rename sssd.spec.in => contrib/sssd.spec.in (96%)
diff --git a/Makefile.am b/Makefile.am
index 04c2215..d569605 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 0fb6d73..d8d092a 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
similarity index 96%
rename from sssd.spec.in
rename to contrib/sssd.spec.in
index 49e2661..7b257e2 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 <sgall...@redhat.com> - 0.5.0-0
+- New upstream release 0.5.0
+
* Mon May 18 2009 Stephen Gallagher <sgall...@redhat.com> - 0.4.0-1
- Convert build system to automake
--
1.6.2.5
signature.asc
Description: OpenPGP digital signature
_______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/sssd-devel
