You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/03/14 00:10:32 UTC
svn commit: r517931 - in /incubator/qpid/branches/qpid.0-9: ./ cpp/
cpp/qpidc.spec.in cpp/rpm/Makefile.am cpp/tests/Makefile.am
Author: aconway
Date: Tue Mar 13 16:10:31 2007
New Revision: 517931
URL: http://svn.apache.org/viewvc?view=rev&rev=517931
Log:
Merged revisions 499845 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid
........
r499845 | aconway | 2007-01-25 11:45:48 -0500 (Thu, 25 Jan 2007) | 5 lines
* qpidc.spec.in: updated to release 3 for RPM.
* gen/make-gen-src-mk.sh: fixed problem with makefile generation in a new checkout.
* Other Makefile.am: added missing files to maintainer-clean.
* Added missing svn-ignores.
........
Modified:
incubator/qpid/branches/qpid.0-9/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec.in
incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am
incubator/qpid/branches/qpid.0-9/cpp/tests/Makefile.am
Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 13 16:10:31 2007
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317,496665,496678,497341,497439,498591,499049,499374,499803
+/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317,496665,496678,497341,497439,498591,499049,499374,499803,499845
Propchange: incubator/qpid/branches/qpid.0-9/cpp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 13 16:10:31 2007
@@ -9,8 +9,7 @@
stamp-h1
libtool
config.in
-qpid-cpp-0.1.tar.bz2
-qpid-cpp-0.1.tar.gz
config.cache
-qpidc-0.1.tar.bz2
-qpidc-0.1.tar.gz
+qpidc.spec
+qpidc-*.tar.bz2
+qpidc-*.tar.gz
Modified: incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec.in
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec.in?view=diff&rev=517931&r1=517930&r2=517931
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec.in (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec.in Tue Mar 13 16:10:31 2007
@@ -5,7 +5,7 @@
Name: @PACKAGE@
Version: @VERSION@
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Libraries for Qpid C++ client applications
Group: System Environment/Libraries
License: Apache Software License
@@ -137,3 +137,6 @@
* Fri Dec 8 2006 David Lutterkort <dl...@redhat.com> - 0.1-1
- Initial version based on Jim Meyering's sketch and discussions with Alan
Conway
+
+* Thu Jan 25 Alan Conway <ac...@redhat.com> - 0.1-3
+- Applied Jim Meyereings fixes from http://mail-archives.apache.org/mod_mbox/incubator-qpid-dev/200701.mbox/%3c87hcugzmyp.fsf@rho.meyering.net%3e
Modified: incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am?view=diff&rev=517931&r1=517930&r2=517931
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am Tue Mar 13 16:10:31 2007
@@ -13,11 +13,12 @@
.PHONY: rpm srpm dist
# Build source and binary RPMs.
-rpm: dist
- rpmbuild $(RPMOPTS) -ba $(SPEC)
+rpm: dist
+ rpmbuild $(RPMOPTS) $(RPMEXTRAOPTS) -ba $(SPEC)
+ rpmlint RPMS/*.rpm
-# Source RPM only.
-srpm: dist
+# Build source RPM only.
+srpm: dist
rpmbuild $(RPMOPTS) -bs $(SPEC)
# Build source distribution and create required subdirs.
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/Makefile.am?view=diff&rev=517931&r1=517930&r2=517931
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/Makefile.am Tue Mar 13 16:10:31 2007
@@ -90,6 +90,9 @@
topictest \
APRBaseTest.cpp
+CLEANFILES=qpidd.log
+DISTCLEANFILES=gen.mk
+
include gen.mk
abs_builddir = @abs_builddir@