diff options
| author | Gordon Sim <gsim@apache.org> | 2007-01-24 12:01:48 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2007-01-24 12:01:48 +0000 |
| commit | 75235567e7eb60055aea01ca6d1def4dfbe555e0 (patch) | |
| tree | 12be773ddbb0ad9036576b7370b180707a6c5541 /cpp | |
| parent | d005f187aecf71c61c33f1cb2743b993d43d6dda (diff) | |
| download | qpid-python-75235567e7eb60055aea01ca6d1def4dfbe555e0.tar.gz | |
2007-01-24 Jim Meyering <meyering@redhat.com>
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.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@499374 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r--[-rwxr-xr-x] | cpp/LICENSE.txt | 0 | ||||
| -rw-r--r-- | cpp/Makefile.am | 15 | ||||
| -rw-r--r-- | cpp/qpidc.spec.in (renamed from cpp/qpidc.spec) | 9 |
3 files changed, 17 insertions, 7 deletions
diff --git a/cpp/LICENSE.txt b/cpp/LICENSE.txt index 6b0b1270ff..6b0b1270ff 100755..100644 --- a/cpp/LICENSE.txt +++ b/cpp/LICENSE.txt diff --git a/cpp/Makefile.am b/cpp/Makefile.am index 703266f8e9..98f715e6aa 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -1,7 +1,11 @@ AUTOMAKE_OPTIONS = 1.9.2 foreign ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3 README.txt etc/qpidd +EXTRA_DIST = \ + README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3 README.txt \ + etc/qpidd \ + $(PACKAGE).spec \ + $(PACKAGE).spec.in SUBDIRS = gen lib tests src docs/api docs/man rpm @@ -9,7 +13,14 @@ SUBDIRS = gen lib tests src docs/api docs/man rpm 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@/' $< > $@-tmp + mv $@-tmp $@ +MAINTAINERCLEANFILES = $(PACKAGE).spec +.PHONY: rpm srpm rpm srpm: cd rpm && $(MAKE) $(MAKEFLAGS_AM) $@ diff --git a/cpp/qpidc.spec b/cpp/qpidc.spec.in index cadbbc34b9..16816385cc 100644 --- a/cpp/qpidc.spec +++ b/cpp/qpidc.spec.in @@ -3,19 +3,18 @@ # %define daemon qpidd -Name: qpidc -Version: 0.1 +Name: @PACKAGE@ +Version: @VERSION@ Release: 1%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: Apache Software License -URL: http://people.apache.org/dist/incubator/qpid/M1-incubating/cpp/qpidc-0.1.tar.gz +URL: http://people.apache.org/dist/incubator/qpid/M1-incubating/cpp/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool BuildRequires: boost-devel -BuildRequires: cppunit BuildRequires: cppunit-devel BuildRequires: doxygen BuildRequires: graphviz @@ -62,7 +61,7 @@ the open AMQP messaging protocol. %setup -q %build -%configure +%configure --disable-static make %{?_smp_mflags} # Remove this generated perl file, we don't need it and it upsets rpmlint. rm docs/api/html/installdox |