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/04/12 21:48:09 UTC
svn commit: r528107 - in /incubator/qpid/trunk/qpid/cpp: ./ Makefile.am
configure.ac m4/qpid.m4 qpidc.pc.in qpidc.spec.in
Author: aconway
Date: Thu Apr 12 12:48:08 2007
New Revision: 528107
URL: http://svn.apache.org/viewvc?view=rev&rev=528107
Log:
* Add pgg-config support for downstream packages
* Bump version to 0.2 for downstream packages.
Added:
incubator/qpid/trunk/qpid/cpp/qpidc.pc.in
Removed:
incubator/qpid/trunk/qpid/cpp/m4/qpid.m4
Modified:
incubator/qpid/trunk/qpid/cpp/ (props changed)
incubator/qpid/trunk/qpid/cpp/Makefile.am
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
Propchange: incubator/qpid/trunk/qpid/cpp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 12 12:48:08 2007
@@ -13,3 +13,4 @@
qpidc.spec
qpidc-*
qpid-config
+qpidc.pc
Modified: incubator/qpid/trunk/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile.am?view=diff&rev=528107&r1=528106&r2=528107
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile.am Thu Apr 12 12:48:08 2007
@@ -1,14 +1,19 @@
AUTOMAKE_OPTIONS = 1.9.2 foreign
ACLOCAL_AMFLAGS = -I m4
-bin_SCRIPTS = qpid-config
+# pkg-config data file.
+pkgconfigdir = $(libdir)/pkgconfig
+PC=$(PACKAGE).pc
+pkgconfig_DATA = $(PC)
+
+BUILT_SOURCES=$(PACKAGE).pc
SPEC=$(PACKAGE).spec
EXTRA_DIST = \
LICENSE NOTICE README \
etc/qpidd \
- $(SPEC) $(SPEC).in \
+ $(SPEC) $(SPEC).in $(PC) $(PC).in\
rpm/README.qpidd-devel
SUBDIRS = src docs/api docs/man
@@ -16,14 +21,6 @@
# Update libtool, if needed.
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
-
-# 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.
-$(SPEC): %: %.in Makefile
- sed 's/@''PACKAGE@/@PACKAGE@/;s/@''VERSION@/@VERSION@/' $< > $@-tmp
- mv $@-tmp $@
-MAINTAINERCLEANFILES = $(SPEC)
#
# Build RPMs from the distribution tarball.
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=528107&r1=528106&r2=528107
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Thu Apr 12 12:48:08 2007
@@ -8,7 +8,7 @@
dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-AC_INIT([qpidc], [0.1], [qpid-dev@incubator.apache.org])
+AC_INIT([qpidc], [0.2], [qpid-dev@incubator.apache.org])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([dist-bzip2])
@@ -131,9 +131,16 @@
# If rpmlint is availalbe we'll run it when building RPMs.
AC_CHECK_PROG([RPMLINT], [rpmlint], [rpmlint])
AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"])
+
+# URL and download URL for the package.
+URL=http://rhm.et.redhat.com/qpidc
+AC_SUBST(URL)
+DOWNLOAD_URL=http://rhm.et.redhat.com/download
+AC_SUBST(DOWNLOAD_URL)
AC_CONFIG_FILES([
- qpid-config
+ qpidc.pc
+ qpidc.spec
Makefile
src/Makefile
src/tests/Makefile
@@ -143,3 +150,4 @@
docs/api/developer.doxygen
])
AC_OUTPUT
+
Added: incubator/qpid/trunk/qpid/cpp/qpidc.pc.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.pc.in?view=auto&rev=528107
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.pc.in (added)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.pc.in Thu Apr 12 12:48:08 2007
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE@
+Description: C++ implementation of the AMQP messaging specification.
+Version: @VERSION@
+Requires:
+URL: @URL@
+Libs: -L${libdir} -lqpidcommon
+Cflags: -I${includedir}
Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec.in?view=diff&rev=528107&r1=528106&r2=528107
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec.in (original)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec.in Thu Apr 12 12:48:08 2007
@@ -5,12 +5,12 @@
Name: @PACKAGE@
Version: @VERSION@
-Release: 5%{?dist}
+Release: 1%{?dist}
Summary: Libraries for Qpid C++ client applications
Group: System Environment/Libraries
License: Apache Software License
-URL: http://rhm.et.redhat.com/qpidc/
-Source0: http://rhm.et.redhat.com/download/%{name}-%{version}.tar.gz
+URL: @URL@
+Source0: @DOWNLOAD_URL@/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool
@@ -145,6 +145,9 @@
/sbin/ldconfig
%changelog
+
+* THU Apr 12 2007 Alan Conway <ac...@redhat.com> - 0.2-1
+- Bumped version number for rhm dependencies.
* Wed Apr 11 2007 Alan Conway <ac...@redhat.com> - 0.1-5
- Add qpidd-devel sub-package.