You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2004/07/02 00:45:06 UTC
cvs commit: apr-util/build/rpm apr-util.spec.in
minfrin 2004/07/01 15:45:06
Modified: . CHANGES buildconf
Added: build/rpm apr-util.spec.in
Log:
Add an RPM spec file derived from Fedora Core.
Reviewed by: jorton
Revision Changes Path
1.132 +3 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- CHANGES 28 May 2004 07:37:32 -0000 1.131
+++ CHANGES 1 Jul 2004 22:45:06 -0000 1.132
@@ -1,5 +1,8 @@
Changes with APR-util 1.0
+ *) Add an RPM spec file derived from Fedora Core.
+ [Graham Leggett, Joe Orton]
+
*) The whole codebase was relicensed and is now available under
the Apache License, Version 2.0 (http://www.apache.org/licenses).
[Apache Software Foundation]
1.13 +17 -0 apr-util/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/apr-util/buildconf,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- buildconf 21 Feb 2004 00:43:56 -0000 1.12
+++ buildconf 1 Jul 2004 22:45:06 -0000 1.13
@@ -74,3 +74,20 @@
# Remove autoconf cache again
rm -rf autom4te*.cache
+
+# Create RPM Spec file
+if [ -f `which cut` ]; then
+ echo rebuilding rpm spec file
+ ( REVISION=`build/get-version.sh all include/apu_version.h APU`
+ VERSION=`echo $REVISION | cut -d- -s -f1`
+ RELEASE=`echo $REVISION | cut -d- -s -f2`
+ if [ "x$VERSION" = "x" ]; then
+ VERSION=$REVISION
+ RELEASE=1
+ fi
+ cat ./build/rpm/apr-util.spec.in | \
+ sed -e "s/APU_VERSION/$VERSION/" \
+ -e "s/APU_RELEASE/$RELEASE/" \
+ > apr-util.spec )
+fi
+
1.1 apr-util/build/rpm/apr-util.spec.in
Index: apr-util.spec.in
===================================================================
%define apuver 1
Summary: Apache Portable Runtime Utility library
Name: apr-util
Version: APU_VERSION
Release: APU_RELEASE
License: Apache Software License
Group: System Environment/Libraries
URL: http://apr.apache.org/
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release}
BuildPrereq: openldap-devel, db4-devel, expat-devel
Conflicts: subversion < 0.20.1-2
%description
The mission of the Apache Portable Runtime (APR) is to provide a
free library of C data structures and routines. This library
contains additional utility interfaces for APR; including support
for XML, LDAP, database interfaces, URI parsing and more.
%package devel
Group: Development/Libraries
Summary: APR utility library development kit
Requires: apr-util = %{version}-%{release}, apr-devel
Requires: openldap-devel, db4-devel, expat-devel
Conflicts: subversion-devel < 0.20.1-2
%description devel
This package provides the support files which can be used to
build applications using the APR utility library. The mission
of the Apache Portable Runtime (APR) is to provide a free
library of C data structures and routines.
%prep
%setup -q
%build
%configure --with-apr=%{_prefix} \
--includedir=%{_includedir}/apr-%{apuver} \
--with-ldap --without-gdbm
make %{?_smp_mflags} && make dox
%check
# Run non-interactive tests
pushd test
make %{?_smp_mflags} testall CFLAGS=-fno-strict-aliasing
./testall -v || exit 1
popd
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Documentation
mv docs/dox/html html
# Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/aprutil.exp
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc CHANGES LICENSE NOTICE
%{_libdir}/libaprutil-%{apuver}.so.*
%files devel
%defattr(-,root,root,-)
%{_bindir}/apu-config
%{_bindir}/apu-%{apuver}-config
%{_libdir}/libaprutil-%{apuver}.*a
%{_libdir}/libaprutil-%{apuver}.so
%{_libdir}/pkgconfig/apr-util-%{apuver}.pc
%{_includedir}/apr-%{apuver}/*.h
%doc --parents html
%changelog
* Tue Jun 22 2004 Graham Leggett <mi...@sharp.fm> 1.0.0-1
- update to support v1.0.0 of APR
* Tue Jun 22 2004 Graham Leggett <mi...@sharp.fm> 1.0.0-1
- derived from Fedora Core apr.spec
Re: cvs commit: apr-util/build/rpm apr-util.spec.in
Posted by Greg Stein <gs...@lyra.org>.
On Thu, Jul 01, 2004 at 10:45:06PM -0000, minfrin@apache.org wrote:
>...
> +++ buildconf 1 Jul 2004 22:45:06 -0000 1.13
> @@ -74,3 +74,20 @@
>
> # Remove autoconf cache again
> rm -rf autom4te*.cache
> +
> +# Create RPM Spec file
> +if [ -f `which cut` ]; then
> + echo rebuilding rpm spec file
> + ( REVISION=`build/get-version.sh all include/apu_version.h APU`
> + VERSION=`echo $REVISION | cut -d- -s -f1`
> + RELEASE=`echo $REVISION | cut -d- -s -f2`
> + if [ "x$VERSION" = "x" ]; then
> + VERSION=$REVISION
> + RELEASE=1
> + fi
> + cat ./build/rpm/apr-util.spec.in | \
> + sed -e "s/APU_VERSION/$VERSION/" \
> + -e "s/APU_RELEASE/$RELEASE/" \
> + > apr-util.spec )
> +fi
There is no need for the parens. That's just some extra baggage...
Cheers,
-g
--
Greg Stein, http://www.lyra.org/