Author: aconway
Date: Tue Mar 13 15:04:40 2007
New Revision: 517904
URL: http://svn.apache.org/viewvc?view=rev&rev=517904
Log:
Merged revisions 499374 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid
........
r499374 | gsim | 2007-01-24 07:01:48 -0500 (Wed, 24 Jan 2007) | 18 lines
2007-01-24 Jim Meyering <[EMAIL PROTECTED]>
Suggestions from Ralf Corsepius in http://bugzilla.redhat.com/220630.
* qpidc.spec.in (BuildRequires): Remove redundant cppunit here, too.
The previous removal addressed only the redundant _Requires_.
(%configure): Add --disable-static, so as not to build unused
static libraries.
Generate qpidc.spec. Re-factor/generate even more.
* qpidc.spec.in: New file. Use it to generate qpidc.spec,
substituting PACKAGE and VERSION from configure.ac.
(URL): Omit trailing .tar.gz name. That's specified via "Source0".
* Makefile.am (qpidc.spec): New rule.
(EXTRA_DIST): Add $(PACKAGE).spec and $(PACKAGE).spec.in.
(MAINTAINERCLEANFILES): Define.
* qpidc.spec: Remove file. Now it's generated.
........
Removed:
incubator/qpid/branches/qpid.0-9/cpp/qpidc.spec
Modified:
incubator/qpid/branches/qpid.0-9/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/LICENSE.txt (props changed)
incubator/qpid/branches/qpid.0-9/cpp/Makefile.am
Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 13 15:04:40 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
+/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317,496665,496678,497341,497439,498591,499049,499374
Propchange: incubator/qpid/branches/qpid.0-9/cpp/LICENSE.txt
('svn:executable' removed)
Modified: incubator/qpid/branches/qpid.0-9/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/Makefile.am?view=diff&rev=517904&r1=517903&r2=517904
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/Makefile.am Tue Mar 13 15:04:40 2007
@@ -1,7 +1,11 @@
AUTOMAKE_OPTIONS = 1.9.2 foreign
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = README README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3
etc/qpidd
+EXTRA_DIST = \
+ README README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3 \
+ etc/qpidd \
+ $(PACKAGE).spec \
+ $(PACKAGE).spec.in
SUBDIRS = gen lib src docs/api docs/man rpm tests
@@ -9,7 +13,14 @@
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
-.PHONY: rpm srpm
+# This cannot be done by AC_CONFIG_FILES, because automake's
+# make distcheck target does not like auto-generated files
+# being included in the distributed archive.
+qpidc.spec: %: %.in
+ sed 's/@''PACKAGE@/@PACKAGE@/;s/@''VERSION@/@VERSION@/' $< > [EMAIL
PROTECTED]
+ mv [EMAIL PROTECTED] $@
+MAINTAINERCLEANFILES = $(PACKAGE).spec
+.PHONY: rpm srpm
rpm srpm:
cd rpm && $(MAKE) $(MAKEFLAGS_AM) $@
