summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-04-30 21:59:52 +0000
committerAlan Conway <aconway@apache.org>2007-04-30 21:59:52 +0000
commit064dad0b1602fbbfcb8d2818bd24779a25420cb5 (patch)
tree722024ece524daa932c2b5853f9f13d8e61b28ec
parent6dfec93461aaf1ddf7dbd681bc67e6edcb8d81d3 (diff)
downloadqpid-python-064dad0b1602fbbfcb8d2818bd24779a25420cb5.tar.gz
Add .M2 tag to rpm release
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@533860 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/qpidc.spec.in6
-rw-r--r--cpp/rpm/Makefile.am2
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/qpidc.spec.in b/cpp/qpidc.spec.in
index e0d719b51c..4d4c75f1ca 100644
--- a/cpp/qpidc.spec.in
+++ b/cpp/qpidc.spec.in
@@ -5,7 +5,7 @@
Name: @PACKAGE@
Version: @VERSION@
-Release: 5%-M2
+Release: 5%{?dist}
Summary: Libraries for Qpid C++ client applications
Group: System Environment/Libraries
License: Apache Software License
@@ -20,12 +20,10 @@ BuildRequires: doxygen
BuildRequires: e2fsprogs-devel
BuildRequires: graphviz
BuildRequires: help2man
-BuildRequires: libdaemon-devel
BuildRequires: libtool
BuildRequires: pkgconfig
Requires: boost
-Requires: libdaemon
Requires(post):/sbin/chkconfig
Requires(preun):/sbin/chkconfig
@@ -131,6 +129,8 @@ fi
/sbin/ldconfig
%changelog
+* Mon Apr 30 2007 Alan Conway <aconway@redhat.com> - 0.1-5.M2
+- Added M2 release tag.
* Mon Feb 19 2007 Jim Meyering <meyering@redhat.com> - 0.1-4
- Address http://bugzilla.redhat.com/220630:
diff --git a/cpp/rpm/Makefile.am b/cpp/rpm/Makefile.am
index 710874ff19..229227c98f 100644
--- a/cpp/rpm/Makefile.am
+++ b/cpp/rpm/Makefile.am
@@ -6,7 +6,7 @@ abs_top_srcdir=@abs_top_srcdir@
abs_builddir=@abs_builddir@
SPEC=${top_srcdir}/qpidc.spec
-RPMOPTS=--define "_sourcedir ${abs_top_srcdir}" --define "_topdir ${abs_builddir}" --define "_dist -incubator-M2"
+RPMOPTS=--define "_sourcedir ${abs_top_srcdir}" --define "_topdir ${abs_builddir}" --define "dist .M2"
clean-local:
-rm -rf BUILD RPMS SOURCES SPECS SRPMS