jorton dd6328
%define aprver 1
cvsdist 9c651d
jorton e12402
# Arches on which the multilib apr.h hack is needed:
jorton e12402
%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
jorton e12402
cvsdist 9c651d
Summary: Apache Portable Runtime library
cvsdist 9c651d
Name: apr
jorton 959d65
Version: 1.2.7
Jakub Jelinek 4da57b
Release: 8
cvsdist 9c651d
License: Apache Software License
cvsdist 9c651d
Group: System Environment/Libraries
cvsdist 9c651d
URL: http://apr.apache.org/
cvsdist 9c651d
Source0: %{name}-%{version}.tar.gz
jorton e12402
Source1: apr-wrapper.h
jorton dd6328
Patch1: apr-0.9.6-readdir64.patch
jorton 959d65
Patch2: apr-0.9.7-deepbind.patch
jorton 959d65
Patch3: apr-1.2.2-locktimeout.patch
jorton 959d65
Patch4: apr-1.2.2-libdir.patch
jorton 959d65
Patch5: apr-1.2.7-pkgconf.patch
cvsdist 9c651d
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
jorton 65268e
BuildPrereq: autoconf, libtool, doxygen, e2fsprogs-devel
cvsdist 9c651d
Conflicts: subversion < 0.20.1-2
cvsdist 9c651d
cvsdist 9c651d
%description
cvsdist 9c651d
The mission of the Apache Portable Runtime (APR) is to provide a
cvsdist 9c651d
free library of C data structures and routines, forming a system
cvsdist 9c651d
portability layer to as many operating systems as possible,
cvsdist 9c651d
including Unices, MS Win32, BeOS and OS/2.
cvsdist 9c651d
cvsdist 9c651d
%package devel
cvsdist 9c651d
Group: Development/Libraries
cvsdist 9c651d
Summary: APR library development kit
cvsdist 9c651d
Conflicts: subversion-devel < 0.20.1-2
jorton 959d65
Requires: apr = %{version}-%{release}, gcc = %(gcc -dumpversion), pkgconfig
jorton 4f22d7
# shipped libtool hard-codes paths to gcc libraries in versioned dir
cvsdist 9c651d
cvsdist 9c651d
%description devel
cvsdist 9c651d
This package provides the support files which can be used to 
cvsdist 9c651d
build applications using the APR library.  The mission of the
cvsdist 9c651d
Apache Portable Runtime (APR) is to provide a free library of 
cvsdist 9c651d
C data structures and routines.
cvsdist 9c651d
cvsdist 9c651d
%prep
cvsdist 9c651d
%setup -q
jorton dd6328
%patch1 -p1 -b .readdir64
jorton 959d65
%patch2 -p1 -b .deepbind
jorton 959d65
%patch3 -p1 -b .locktimeout
jorton 959d65
%patch4 -p1 -b .libdir
jorton 959d65
%patch5 -p1 -b .pkgconf
cvsdist 9c651d
cvsdist 2da98d
%build
cvsdist 9c651d
# regenerate configure script etc.
cvsdist 9c651d
./buildconf
jorton 397f8f
jorton 397f8f
# Forcibly prevent detection of shm_open (which then picks up but
jorton 397f8f
# does not use -lrt).
jorton 397f8f
export ac_cv_search_shm_open=no
jorton 397f8f
cvsdist b7fa87
%configure \
cvsdist 9c651d
        --includedir=%{_includedir}/apr-%{aprver} \
jorton dd6328
        --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
cvsdist 9c651d
        --with-devrandom=/dev/urandom \
cvsdist 9c651d
        CC=gcc CXX=g++
jorton d32a17
make %{?_smp_mflags} && make dox
cvsdist 9c651d
cvsdist 9c651d
%check
jorton e8ca28
%ifnarch s390 ppc
jorton e8ca28
# Run non-interactive tests.  Skip on platforms which several
jorton e8ca28
# builds might be run concurrently since the test suite binds
jorton e8ca28
# to fixed port numbers in a few places.
cvsdist 9c651d
pushd test
jorton dd6328
make %{?_smp_mflags} testall
jorton dd6328
./testall -v -q || exit 1
cvsdist 9c651d
popd
jorton e8ca28
%endif
cvsdist 9c651d
cvsdist 9c651d
%install
cvsdist 9c651d
rm -rf $RPM_BUILD_ROOT
cvsdist 9c651d
make install DESTDIR=$RPM_BUILD_ROOT
cvsdist 9c651d
cvsdist 9c651d
# Move docs to more convenient location
cvsdist 9c651d
mv docs/dox/html html
cvsdist 9c651d
jorton 397f8f
# Trim exported dependecies
jorton 397f8f
sed -ri '/^dependency_libs/{s,-l(uuid|crypt) ,,g}' \
jorton 397f8f
      $RPM_BUILD_ROOT%{_libdir}/libapr*.la
jorton 3b6165
sed -ri '/^LIBS=/{s,-l(uuid|crypt) ,,g;s/  */ /g}' \
jorton 3b6165
      $RPM_BUILD_ROOT%{_bindir}/apr-%{aprver}-config
jorton 397f8f
jorton e12402
%ifarch %{multilib_arches}
jorton e12402
# Ugly hack to allow parallel installation of 32-bit and 64-bit apr-devel 
jorton e12402
# packages:
jorton e12402
mv $RPM_BUILD_ROOT%{_includedir}/apr-%{aprver}/apr.h \
jorton e12402
   $RPM_BUILD_ROOT%{_includedir}/apr-%{aprver}/apr-%{_arch}.h
jorton e12402
install -c -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/apr-%{aprver}/apr.h
jorton e12402
%endif
jorton e12402
cvsdist 9c651d
# Unpackaged files:
cvsdist 9c651d
rm -f $RPM_BUILD_ROOT%{_libdir}/apr.exp
cvsdist 9c651d
cvsdist 9c651d
%clean
cvsdist 9c651d
rm -rf $RPM_BUILD_ROOT
cvsdist 9c651d
cvsdist 9c651d
%post -p /sbin/ldconfig
cvsdist 9c651d
cvsdist 9c651d
%postun -p /sbin/ldconfig
cvsdist 9c651d
cvsdist 9c651d
%files
cvsdist 9c651d
%defattr(-,root,root,-)
jorton 4f22d7
%doc CHANGES LICENSE NOTICE
cvsdist 9c651d
%{_libdir}/libapr-%{aprver}.so.*
cvsdist 9c651d
cvsdist 9c651d
%files devel
cvsdist 9c651d
%defattr(-,root,root,-)
cvsdist 9c651d
%doc docs/APRDesign.html docs/canonical_filenames.html
cvsdist 9c651d
%doc docs/incomplete_types docs/non_apr_programs
cvsdist 9c651d
%doc --parents html
jorton dd6328
%{_bindir}/apr-%{aprver}-config
cvsdist 9c651d
%{_libdir}/libapr-%{aprver}.*a
cvsdist 9c651d
%{_libdir}/libapr-%{aprver}.so
jorton dd6328
%{_libdir}/pkgconfig/*.pc
jorton dd6328
%dir %{_libdir}/apr-%{aprver}
jorton dd6328
%dir %{_libdir}/apr-%{aprver}/build
jorton dd6328
%{_libdir}/apr-%{aprver}/build/*
cvsdist 9c651d
%dir %{_includedir}/apr-%{aprver}
cvsdist 9c651d
%{_includedir}/apr-%{aprver}/*.h
cvsdist 9c651d
cvsdist 9c651d
%changelog
Jakub Jelinek 4da57b
* Fri May 26 2006 Jakub Jelinek <jakub@redhat.com> 1.2.7-8
Jakub Jelinek 4da57b
- rebuilt with GCC 4.1.0
Jakub Jelinek 4da57b
jorton 1ae778
* Tue May 23 2006 Joe Orton <jorton@redhat.com> 1.2.7-7
jorton 1ae778
- fix another multilib conflict (#192659)
jorton 1ae778
jorton 4b515d
* Tue May 16 2006 Joe Orton <jorton@redhat.com> 1.2.7-6
jorton 65268e
- BR e2fsprogs-devel for libuuid
jorton 65268e
jorton dc8b1e
* Mon May  8 2006 Joe Orton <jorton@redhat.com> 1.2.7-4
jorton e12402
- use multilib parallel-installation wrapper hack for apr.h
jorton e12402
jorton d33618
* Tue May  2 2006 Joe Orton <jorton@redhat.com> 1.2.7-3
jorton d33618
- fix installbuilddir in apr-1-config
jorton d33618
jorton 959d65
* Tue May  2 2006 Joe Orton <jorton@redhat.com> 1.2.7-2
jorton 959d65
- update to 1.2.7
jorton 959d65
- use pkg-config in apr-1-config to make it libdir-agnostic
jorton 959d65
jorton 3d244a
* Thu Apr  6 2006 Joe Orton <jorton@redhat.com> 1.2.6-2
jorton 3d244a
- update to 1.2.6
jorton 3d244a
Jesse Keating 05f69e
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.2.2-7.2
Jesse Keating 05f69e
- bump again for double-long bug on ppc(64)
Jesse Keating 05f69e
Jesse Keating 9045fe
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.2.2-7.1
Jesse Keating 9045fe
- rebuilt for new gcc4.1 snapshot and glibc changes
Jesse Keating 9045fe
jorton 71fc78
* Wed Jan  4 2006 Joe Orton <jorton@redhat.com> 1.2.2-7
jorton 71fc78
- fix namespace pollution (r354824, r355464)
jorton 71fc78
jorton 893685
* Wed Jan  4 2006 Joe Orton <jorton@redhat.com> 1.2.2-6
jorton 893685
- fix build with recent glibc (#176911)
jorton 893685
Jesse Keating 5ab73a
* Tue Jan  3 2006 Jesse Keating <jkeating@redhat.com> 1.2.2-5.2
Jesse Keating 5ab73a
- rebuilt again
Jesse Keating 5ab73a
Jesse Keating 224fe3
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
Jesse Keating 224fe3
- rebuilt
Jesse Keating 224fe3
jorton 9c6699
* Fri Dec  9 2005 Joe Orton <jorton@redhat.com> 1.2.2-5
jorton 9c6699
- rebuild for new gcc
jorton 9c6699
jorton ba27ee
* Thu Dec  8 2005 Joe Orton <jorton@redhat.com> 1.2.2-4
jorton ba27ee
- add apr_file_seek() fixes from upstream (r326593, r326597)
jorton ba27ee
jorton 3b6165
* Wed Dec  7 2005 Joe Orton <jorton@redhat.com> 1.2.2-3
jorton 3b6165
- apr-1-config: strip more exports (#175124) 
jorton 3b6165
jorton 397f8f
* Tue Dec  6 2005 Joe Orton <jorton@redhat.com> 1.2.2-2
jorton 397f8f
- avoid linking against -lrt
jorton 397f8f
- don't print -L${libdir} in --libs output
jorton 397f8f
- don't export -lcrypt/-luuid in .la file
jorton 397f8f
jorton dd6328
* Fri Dec  2 2005 Joe Orton <jorton@redhat.com> 1.2.2-1
jorton dd6328
- update to 1.2.2
jorton dd6328
jorton 2cc98b
* Thu Nov 24 2005 Joe Orton <jorton@redhat.com> 0.9.7-3
jorton 2cc98b
- use RTLD_DEEPBIND in apr_dso_open by default
jorton 2cc98b
jorton 93c7b3
* Thu Oct 20 2005 Joe Orton <jorton@redhat.com> 0.9.7-2
jorton 93c7b3
- update to 0.9.7
jorton 93c7b3
Florian La Roche 09af1a
* Fri Sep 30 2005 Florian La Roche <laroche@redhat.com>
Florian La Roche 09af1a
- rebuild for new gcc
Florian La Roche 09af1a
jorton d32a17
* Thu Sep 15 2005 Joe Orton <jorton@redhat.com> 0.9.6-6
jorton d32a17
- don't override CFLAGS at build time
jorton 95c9af
- allow setting TCP_NODELAY and TCP_CORK concurrently
jorton 95c9af
- use _exit() not exit() in child if exec*() fails (upstream #30913)
jorton d32a17
jorton f0cc37
* Fri Sep  9 2005 Joe Orton <jorton@redhat.com> 0.9.6-5
jorton f0cc37
- add from 0.9.x branch:
jorton f0cc37
 * fix for apr_{uid,gid}_* error handling (r239592)
jorton f0cc37
 * fix for apr_file_ write flushing (r267192)
jorton f0cc37
- add backport for use of readdir64_r (r265032, r265681, r265684)
jorton f0cc37
Florian La Roche d0841e
* Mon Jul 11 2005 Florian La Roche <laroche@redhat.com>
Florian La Roche d0841e
- rebuild
Florian La Roche d0841e
jorton 51e20d
* Tue May 17 2005 Joe Orton <jorton@redhat.com> 0.9.6-3
jorton 51e20d
- fix apr_procattr_child_*_set error handling
jorton 51e20d
jorton 4f22d7
* Tue Mar  1 2005 Joe Orton <jorton@redhat.com> 0.9.6-2
jorton 4f22d7
- have apr-devel depend on specific version of gcc
jorton 4f22d7
- add NOTICE to docdir
jorton 4f22d7
jorton 5b71dc
* Wed Feb  9 2005 Joe Orton <jorton@redhat.com> 0.9.6-1
jorton 5b71dc
- update to 0.9.6
jorton 5b71dc
jorton 25aeb2
* Wed Feb  2 2005 Joe Orton <jorton@redhat.com> 0.9.5-4
jorton 25aeb2
- don't disable sendfile on s390 (IBM LTC, #146891)
jorton 25aeb2
jorton cd95f3
* Mon Nov 22 2004 Joe Orton <jorton@redhat.com> 0.9.5-3
jorton cd95f3
- really fix apr-config --srcdir
jorton cd95f3
jorton 3f5a08
* Mon Nov 22 2004 Joe Orton <jorton@redhat.com> 0.9.5-2
jorton 3f5a08
- fix apr-config --srcdir again
jorton 3f5a08
jorton 124b9d
* Sun Nov 21 2004 Joe Orton <jorton@redhat.com> 0.9.5-1
jorton 124b9d
- update to 0.9.5
jorton 124b9d
jorton df995e
* Mon Sep 27 2004 Joe Orton <jorton@redhat.com> 0.9.4-24
jorton df995e
- rebuild
jorton df995e
cvsdist b75edb
* Wed Sep  1 2004 Joe Orton <jorton@redhat.com> 0.9.4-23
cvsdist b75edb
- have -devel require apr of same V-R
cvsdist b75edb
cvsdist 69e192
* Tue Aug 31 2004 Joe Orton <jorton@redhat.com> 0.9.4-22
cvsdist 69e192
- backport fixes from HEAD:
cvsdist 69e192
 * correct implementation of nested mutexes
cvsdist 69e192
 * support for POSIX semaphores on LP64 platforms
cvsdist 69e192
cvsdist 9431d4
* Thu Jul 15 2004 Joe Orton <jorton@redhat.com> 0.9.4-21
cvsdist 9431d4
- rebuild for another attempt at using sem_open
cvsdist 9431d4
cvsdist 0ff62e
* Tue Jul 13 2004 Joe Orton <jorton@redhat.com> 0.9.4-20
cvsdist 0ff62e
- move sticky/suid bits outside APR_OS_DEFAULT bitmask (Greg Hudson)
cvsdist 0ff62e
cvsdist 4ac0bd
* Thu Jul  1 2004 Joe Orton <jorton@redhat.com> 0.9.4-19
cvsdist 4ac0bd
- rebuild
cvsdist 4ac0bd
cvsdist f17d36
* Wed Jun 30 2004 Joe Orton <jorton@redhat.com> 0.9.4-18
cvsdist f17d36
- rebuild now /dev/shm is mounted
cvsdist f17d36
cvsdist f17d36
* Thu Jun 17 2004 Joe Orton <jorton@redhat.com> 0.9.4-17
cvsdist f17d36
- add fix for cleanup structure reuse (part of upstream #23567)
cvsdist f17d36
cvsdist 447ba0
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
cvsdist 447ba0
- rebuilt
cvsdist 447ba0
cvsdist d87a57
* Thu Jun 10 2004 Joe Orton <jorton@redhat.com> 0.9.4-15
cvsdist d87a57
- add support for setuid/setgid/sticky bits (André Malo)
cvsdist d87a57
- add apr_threadattr_{guardsize,stacksize}_set() (latter by Jeff Trawick)
cvsdist d87a57
cvsdist b7fa87
* Mon Jun  7 2004 Joe Orton <jorton@redhat.com> 0.9.4-14
cvsdist b7fa87
- enable posixsem and process-shared pthread mutex support, but
cvsdist b7fa87
  ensure that sysvsem remains the default mechanism
cvsdist b7fa87
cvsdist b7fa87
* Mon May 24 2004 Joe Orton <jorton@redhat.com> 0.9.4-13
cvsdist b7fa87
- entirely remove 2Gb file size limit from apr_file_copy();
cvsdist b7fa87
  fixes "svnadmin hotcopy" on repos with >2Gb strings table
cvsdist b7fa87
- work around getnameinfo bugs with v4-mapped addresses
cvsdist b7fa87
- fix apr_time_exp_get() for dates in 2038 (Philip Martin)
cvsdist b7fa87
cvsdist 2da98d
* Thu May 13 2004 Joe Orton <jorton@redhat.com> 0.9.4-12
cvsdist 2da98d
- use APR_LARGEFILE in apr_file_{copy,append}
cvsdist 2da98d
cvsdist 7f70dd
* Wed Mar 24 2004 Joe Orton <jorton@redhat.com> 0.9.4-11
cvsdist 7f70dd
- add APR_LARGEFILE flag
cvsdist 7f70dd
cvsdist ae4486
* Mon Mar 15 2004 Joe Orton <jorton@redhat.com> 0.9.4-10
cvsdist ae4486
- fix configure check for mmap of /dev/zero
cvsdist ae4486
- just put -D_GNU_SOURCE in CPPFLAGS not _{BSD,SVID,XOPEN}_SOURCE
cvsdist ae4486
cvsdist ae4486
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com> 0.9.4-9.1
cvsdist ae4486
- rebuilt
cvsdist ae4486
cvsdist ae4486
* Thu Feb 19 2004 Joe Orton <jorton@redhat.com> 0.9.4-9
cvsdist ae4486
- undocument apr_dir_read() ordering constraint and fix tests
cvsdist ae4486
cvsdist ae4486
* Sun Feb 15 2004 Joe Orton <jorton@redhat.com> 0.9.4-8
cvsdist ae4486
- rebuilt without -Wall -Werror
cvsdist ae4486
cvsdist ae4486
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> 0.9.4-7
cvsdist ae4486
- rebuilt
cvsdist ae4486
cvsdist ae4486
* Tue Feb  3 2004 Joe Orton <jorton@redhat.com> 0.9.4-6
cvsdist ae4486
- define apr_off_t as int/long/... to prevent it changing
cvsdist ae4486
  with _FILE_OFFSET_BITS on 32-bit platforms
cvsdist ae4486
cvsdist ae4486
* Mon Jan 12 2004 Joe Orton <jorton@redhat.com> 0.9.4-5
cvsdist ae4486
- add apr_temp_dir_get fixes from HEAD
cvsdist ae4486
cvsdist d4c8bf
* Thu Jan  8 2004 Joe Orton <jorton@redhat.com> 0.9.4-4
cvsdist d4c8bf
- ensure that libapr is linked against libpthread
cvsdist d4c8bf
- don't link libapr against -lnsl
cvsdist d4c8bf
cvsdist d4c8bf
* Thu Nov 13 2003 Joe Orton <jorton@redhat.com> 0.9.4-3
cvsdist d4c8bf
- -devel package no longer requires libtool
cvsdist 32fc66
cvsdist 9c651d
* Fri Oct  3 2003 Joe Orton <jorton@redhat.com> 0.9.4-2
cvsdist 9c651d
- disable tests on x86_64 (#97611)
cvsdist 9c651d
cvsdist 9c651d
* Fri Oct  3 2003 Joe Orton <jorton@redhat.com> 0.9.4-1
cvsdist 9c651d
- update to 0.9.4, enable tests
cvsdist 9c651d
- ensure that libresolv is not used
cvsdist 9c651d
cvsdist 9c651d
* Sun Sep  7 2003 Joe Orton <jorton@redhat.com> 0.9.3-14
cvsdist 9c651d
- use /dev/urandom (#103049)
cvsdist 9c651d
cvsdist 9c651d
* Thu Jul 24 2003 Joe Orton <jorton@redhat.com> 0.9.3-13
cvsdist 9c651d
- add back CC=gcc, CXX=g++
cvsdist 9c651d
cvsdist 9c651d
* Tue Jul 22 2003 Nalin Dahyabhai <nalin@redhat.com> 0.9.3-12
cvsdist 9c651d
- rebuild
cvsdist 9c651d
cvsdist 9c651d
* Mon Jul 14 2003 Joe Orton <jorton@redhat.com> 0.9.3-11
cvsdist 9c651d
- work round useless autoconf 2.57 AC_DECL_SYS_SIGLIST
cvsdist 9c651d
cvsdist 9c651d
* Thu Jul 10 2003 Joe Orton <jorton@redhat.com> 0.9.3-10
cvsdist 9c651d
- support --cc and --cpp arguments in apr-config
cvsdist 9c651d
cvsdist 9c651d
* Thu Jul  3 2003 Joe Orton <jorton@redhat.com> 0.9.3-9
cvsdist 9c651d
- force libtool to use CC=gcc, CXX=g++
cvsdist 9c651d
cvsdist 9c651d
* Thu Jul  3 2003 Joe Orton <jorton@redhat.com> 0.9.3-8
cvsdist 9c651d
- fix libtool location in apr_rules.mk
cvsdist 9c651d
cvsdist 9c651d
* Mon Jun 30 2003 Joe Orton <jorton@redhat.com> 0.9.3-7
cvsdist 9c651d
- use AI_ADDRCONFIG in getaddrinfo() support (#73350)
cvsdist 9c651d
- include a working libtool script rather than relying on
cvsdist 9c651d
 /usr/bin/libtool (#97695)
cvsdist 9c651d
cvsdist 9c651d
* Wed Jun 18 2003 Joe Orton <jorton@redhat.com> 0.9.3-6
cvsdist 9c651d
- don't use /usr/bin/libtool
cvsdist 9c651d
cvsdist 9c651d
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
cvsdist 9c651d
- rebuilt
cvsdist 9c651d
cvsdist 9c651d
* Tue May 20 2003 Joe Orton <jorton@redhat.com> 0.9.3-5
cvsdist 9c651d
- add fix for psprintf memory corruption (CAN-2003-0245)
cvsdist 9c651d
- remove executable bit from apr_poll.h
cvsdist 9c651d
cvsdist 9c651d
* Thu May  1 2003 Joe Orton <jorton@redhat.com> 0.9.3-4
cvsdist 9c651d
- link libapr against libpthread
cvsdist 9c651d
- make apr-devel conflict with old subversion-devel
cvsdist 9c651d
- fix License
cvsdist 9c651d
cvsdist 9c651d
* Tue Apr 29 2003 Joe Orton <jorton@redhat.com> 0.9.3-3
cvsdist 9c651d
- run ldconfig in post/postun
cvsdist 9c651d
cvsdist 9c651d
* Tue Apr 29 2003 Joe Orton <jorton@redhat.com> 0.9.3-2
cvsdist 9c651d
- patch test suite to not care if IPv6 is disabled
cvsdist 9c651d
cvsdist 9c651d
* Mon Apr 28 2003 Joe Orton <jorton@redhat.com> 0.9.3-1
cvsdist 9c651d
- initial build