apr-commits mailing list archives

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

  Modified:    build/rpm apr.spec.in
  Log:
  * build/rpm/apr.spec.in: Move installbuilddir to
  %{_libdir}/apr/build-1, remove unnecessary TZ setting for testall and
  old x86_64 pthreads workaround.
  
  Revision  Changes    Path
  1.2       +6 -13     apr/build/rpm/apr.spec.in
  
  Index: apr.spec.in
  ===================================================================
  RCS file: /home/cvs/apr/build/rpm/apr.spec.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -d -w -u -r1.1 -r1.2
  --- apr.spec.in	1 Jul 2004 21:21:59 -0000	1.1
  +++ apr.spec.in	1 Jul 2004 21:50:46 -0000	1.2
  @@ -11,7 +11,6 @@
   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
  @@ -23,7 +22,6 @@
   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 
  @@ -40,20 +38,16 @@
   %configure \
           --prefix=/usr \
           --includedir=%{_includedir}/apr-%{aprver} \
  -        --with-installbuilddir=%{_libdir}/apr/build \
  +        --with-installbuilddir=%{_libdir}/apr/build-%{aprver} \
           --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
  +./testall -v || exit 1
   popd
   
   %install
  @@ -75,7 +69,7 @@
   
   %files
   %defattr(-,root,root,-)
  -%doc CHANGES LICENSE 
  +%doc CHANGES LICENSE NOTICE
   %{_libdir}/libapr-%{aprver}.so.*
   
   %files devel
  @@ -83,13 +77,12 @@
   %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
  +%{_bindir}/apr*config
   %{_libdir}/libapr-%{aprver}.*a
   %{_libdir}/libapr-%{aprver}.so
   %dir %{_libdir}/apr
  -%dir %{_libdir}/apr/build
  -%{_libdir}/apr/build/*
  +%dir %{_libdir}/apr/build-%{aprver}
  +%{_libdir}/apr/build-%{aprver}/*
   %{_libdir}/pkgconfig/apr-%{aprver}.pc
   %dir %{_includedir}/apr-%{aprver}
   %{_includedir}/apr-%{aprver}/*.h
  
  
  

Mime
View raw message