Joe Orton wrote:
buildconf change looks OK. For the spec file:
- just use a %changelog which says "derived from Fedora Core apr.spec" or something rather than include the entire history
- in %install, remove everything between "make install" and "# Move docs..."; none of that should be necessary.
In the process of committing to apr, with the above changes added.
Can you review the proposed diff to apr-util? What should I change in the apr-util spec file to make it work with the apr file?
- NOTICE should be in the main package %doc list for a ASL2.0-licensed package.
Will see if I can convince make install to install this.
Regards, Graham --
Index: buildconf =================================================================== RCS file: /home/cvs/apr-util/buildconf,v retrieving revision 1.12 diff -u -r1.12 buildconf --- buildconf 21 Feb 2004 00:43:56 -0000 1.12 +++ buildconf 1 Jul 2004 21:15:33 -0000 @@ -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 +
%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 autoheader && autoconf %configure --with-apr=%{_prefix} \ --includedir=%{_includedir}/apr-%{apuver} \ --with-ldap --without-gdbm make %{?_smp_mflags} && make dox %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 %check # Run the less verbose tests %define tests testmd5 testrmm teststrmatch testuri testxlate cd test; make %{?_smp_mflags} %{tests} testdbm for t in %{tests}; do ./${t} || exit 1; done ./testdbm auto tsdbm ./testdbm -tDB auto tbdb.db %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc CHANGES LICENSE %{_libdir}/libaprutil-%{apuver}.so.* %files devel %defattr(-,root,root,-) %{_bindir}/apu-config %{_libdir}/libaprutil-%{apuver}.*a %{_libdir}/libaprutil-%{apuver}.so %{_libdir}/pkgconfig/apr-util.pc %{_includedir}/apr-%{apuver}/*.h %doc --parents html %changelog * Tue Jun 22 2004 Graham Leggett <[EMAIL PROTECTED]> 1.0.0-1 - update to support v1.0.0 of APR * Sat Jun 19 2004 Joe Orton <[EMAIL PROTECTED]> 0.9.4-16 - have -devel require matching release of apr-util * Tue Jun 15 2004 Elliot Lee <[EMAIL PROTECTED]> - rebuilt * Thu Apr 1 2004 Joe Orton <[EMAIL PROTECTED]> 0.9.4-14 - fix use of SHA1 passwords (#119651) * Tue Mar 30 2004 Joe Orton <[EMAIL PROTECTED]> 0.9.4-13 - remove fundamentally broken check_sbcs() from xlate code * Fri Mar 19 2004 Joe Orton <[EMAIL PROTECTED]> 0.9.4-12 - tweak xlate fix * Fri Mar 19 2004 Joe Orton <[EMAIL PROTECTED]> 0.9.4-11 - rebuild with xlate fixes and tests enabled * Tue Mar 02 2004 Elliot Lee <[EMAIL PROTECTED]> 0.9.4-10.1 - rebuilt * Tue Mar 2 2004 Joe Orton <[EMAIL PROTECTED]> 0.9.4-10 - rename sdbm_* symbols to apu__sdbm_* * Mon Feb 16 2004 Joe Orton <[EMAIL PROTECTED]> 0.9.4-9 - fix sdbm apr_dbm_exists() on s390x/ppc64 * Fri Feb 13 2004 Elliot Lee <[EMAIL PROTECTED]> 0.9.4-8 - rebuilt * Thu Feb 5 2004 Joe Orton <[EMAIL PROTECTED]> 0.9.4-7 - fix warnings from use of apr_optional*.h with gcc 3.4 * Thu Jan 29 2004 Joe Orton <[EMAIL PROTECTED]> 0.9.4-6 - drop gdbm support * Thu Jan 8 2004 Joe Orton <[EMAIL PROTECTED]> 0.9.4-5 - fix DB library detection * Sat Dec 13 2003 Jeff Johnson <[EMAIL PROTECTED]> 0.9.4-4 - rebuild against db-4.2.52. * Mon Oct 13 2003 Jeff Johnson <[EMAIL PROTECTED]> 0.9.4-3 - rebuild against db-4.2.42. * Mon Oct 6 2003 Joe Orton <[EMAIL PROTECTED]> 0.9.4-2 - fix 'apu-config --apu-la-file' output * Mon Oct 6 2003 Joe Orton <[EMAIL PROTECTED]> 0.9.4-1 - update to 0.9.4. * Tue Jul 22 2003 Nalin Dahyabhai <[EMAIL PROTECTED]> 0.9.3-10 - rebuild * Mon Jul 7 2003 Joe Orton <[EMAIL PROTECTED]> 0.9.3-9 - rebuild - don't run testuuid test because of #98677 * Thu Jul 3 2003 Joe Orton <[EMAIL PROTECTED]> 0.9.3-8 - rebuild * Wed Jun 04 2003 Elliot Lee <[EMAIL PROTECTED]> - rebuilt * Tue May 20 2003 Joe Orton <[EMAIL PROTECTED]> 0.9.3-6 - fix to detect crypt_r correctly (CAN-2003-0195) * Thu May 15 2003 Joe Orton <[EMAIL PROTECTED]> 0.9.3-5 - fix to try linking against -ldb first (#90917) - depend on openldap, gdbm, db4, expat appropriately. * Tue May 13 2003 Joe Orton <[EMAIL PROTECTED]> 0.9.3-4 - rebuild * Wed May 7 2003 Joe Orton <[EMAIL PROTECTED]> 0.9.3-3 - make devel package conflict with old subversion-devel - run the less crufty parts of the test suite * Tue Apr 29 2003 Joe Orton <[EMAIL PROTECTED]> 0.9.3-2 - run ldconfig in post/postun * Mon Apr 28 2003 Joe Orton <[EMAIL PROTECTED]> 0.9.3-1 - initial build
smime.p7s
Description: S/MIME Cryptographic Signature
