apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: apr/build/rpm apr.spec.in
Date Thu, 01 Jul 2004 21:21:59 GMT
minfrin     2004/07/01 14:21:59

  Modified:    .        CHANGES buildconf
  Added:       build/rpm apr.spec.in
  Log:
  Add an RPM spec file derived from Fedora Core.
  Reviewed by:	jorton
  
  Revision  Changes    Path
  1.478     +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.477
  retrieving revision 1.478
  diff -u -r1.477 -r1.478
  --- CHANGES	27 Jun 2004 11:46:42 -0000	1.477
  +++ CHANGES	1 Jul 2004 21:21:59 -0000	1.478
  @@ -7,6 +7,9 @@
   
   Changes with APR 1.0
   
  +  *) Add an RPM spec file derived from Fedora Core.
  +     [Graham Leggett, Joe Orton]
  +
     *) Fix apr_threadattr_detach_set() on Mac OS X.  PR 28472.
        [INOUE Seiichiro <inoue ariel-networks.com>]
   
  
  
  
  1.31      +16 -0     apr/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/apr/buildconf,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- buildconf	6 Jun 2004 21:19:19 -0000	1.30
  +++ buildconf	1 Jul 2004 21:21:59 -0000	1.31
  @@ -83,4 +83,20 @@
   echo "Generating 'make' outputs ..."
   build/gen-build.py make
   
  +# Create RPM Spec file
  +if [ -f `which cut` ]; then
  +  echo rebuilding rpm spec file
  +  ( REVISION=`build/get-version.sh all include/apr_version.h APR`
  +    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.spec.in | \
  +    sed -e "s/APR_VERSION/$VERSION/" \
  +        -e "s/APR_RELEASE/$RELEASE/" \
  +    > apr.spec )
  +fi
  +
   exit 0
  
  
  
  1.1                  apr/build/rpm/apr.spec.in
  
  Index: apr.spec.in
  ===================================================================
  
  %define aprver 1
  
  Summary: Apache Portable Runtime library
  Name: apr
  Version: APR_VERSION
  Release: APR_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
  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, forming a system
  portability layer to as many operating systems as possible,
  including Unices, MS Win32, BeOS and OS/2.
  
  %package devel
  Group: Development/Libraries
  Summary: APR library development kit
  Requires: apr = %{version}
  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 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
  # regenerate configure script etc.
  ./buildconf
  %configure \
          --prefix=/usr \
          --includedir=%{_includedir}/apr-%{aprver} \
          --with-installbuilddir=%{_libdir}/apr/build \
          --with-devrandom=/dev/urandom \
          CC=gcc CXX=g++
  make %{?_smp_mflags} && make dox
  
  %check
  # Run non-interactive tests
  %ifarch x86_64
  # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=97611
  excludes=testlock
  %endif
  pushd test
  make %{?_smp_mflags} testall CFLAGS=-fno-strict-aliasing
  TZ=PST8PDT ./testall -v ${excludes+-x $excludes} || exit 1
  popd
  
  %install
  rm -rf $RPM_BUILD_ROOT
  make install DESTDIR=$RPM_BUILD_ROOT
  
  # Move docs to more convenient location
  mv docs/dox/html html
  
  # Unpackaged files:
  rm -f $RPM_BUILD_ROOT%{_libdir}/apr.exp
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %post -p /sbin/ldconfig
  
  %postun -p /sbin/ldconfig
  
  %files
  %defattr(-,root,root,-)
  %doc CHANGES LICENSE 
  %{_libdir}/libapr-%{aprver}.so.*
  
  %files devel
  %defattr(-,root,root,-)
  %doc docs/APRDesign.html docs/canonical_filenames.html
  %doc docs/incomplete_types docs/non_apr_programs
  %doc --parents html
  %{_bindir}/apr-config
  %{_bindir}/apr-%{aprver}-config
  %{_libdir}/libapr-%{aprver}.*a
  %{_libdir}/libapr-%{aprver}.so
  %dir %{_libdir}/apr
  %dir %{_libdir}/apr/build
  %{_libdir}/apr/build/*
  %{_libdir}/pkgconfig/apr-%{aprver}.pc
  %dir %{_includedir}/apr-%{aprver}
  %{_includedir}/apr-%{aprver}/*.h
  
  %changelog
  * Tue Jun 22 2004 Graham Leggett <minfrin@sharp.fm> 1.0.0-1
  - update to support v1.0.0 of APR
  
  * Tue Jun 22 2004 Graham Leggett <minfrin@sharp.fm> 1.0.0-1
  - derived from Fedora Core apr.spec
  
  
  
  

Mime
View raw message