This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2005-12-21 13:09:59 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '+  *) Bugfix for apr_pollset_poll() on systems that implement pollsets'
Delete:
    apr-gcc2.patch
    apr-libtool.patch
    apr-link.patch
    apr.spec

diff --git a/apr-gcc2.patch b/apr-gcc2.patch
deleted file mode 100644 (file)
index c3d345a..0000000
--- a/apr-gcc2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apr-0.9.4/build/apr_common.m4~     Sat Jan 24 00:21:17 2004
-+++ apr-0.9.4/build/apr_common.m4      Sat Jan 24 00:21:17 2004
-@@ -228,7 +228,7 @@
-           break
-         fi
-       done
--      if test $apr_addto_duplicate = "0"; then
-+      if test $apr_addto_duplicate = "0" -a "$i" != -I/usr/include ; then
-         echo "  adding \"$i\" to $1"
-         $1="$$1 $i"
-       fi

diff --git a/apr-libtool.patch b/apr-libtool.patch
deleted file mode 100644 (file)
index cfcdcfd..0000000
--- a/apr-libtool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-must give hint to libtool which tag to use, in case we use ccache and then
-libtool is unable to autodetect from $CC
-
---- apr-1.2.2/configure.in~    2005-12-19 22:17:54.000000000 +0200
-+++ apr-1.2.2/configure.in     2005-12-19 22:30:13.000000000 +0200
-@@ -196,9 +196,9 @@
-   [ use_libtool=$withval ], [ use_libtool="yes" ] )
- 
- if test "x$use_libtool" = "xyes"; then
--      lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
-+      lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile --tag=CC $(COMPILE) -o $@ -c $< && touch $@'
-       LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
--      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@"
-+      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link --tag=CC \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@"
-       so_ext='lo'
-       lib_target='-rpath $(libdir) $(OBJECTS)'
-       export_lib_target='-rpath \$(libdir) \$(OBJECTS)'

diff --git a/apr-link.patch b/apr-link.patch
deleted file mode 100644 (file)
index 569f682..0000000
--- a/apr-link.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- apr-1.0.0/configure.in.orig        2004-08-01 02:52:20.000000000 +0200
-+++ apr-1.0.0/configure.in     2004-09-16 21:33:34.263720072 +0200
-@@ -519,7 +519,7 @@
- AC_SEARCH_LIBS(gethostbyname, nsl)
- AC_SEARCH_LIBS(gethostname, nsl)
- AC_SEARCH_LIBS(socket, socket)
--AC_SEARCH_LIBS(crypt, crypt ufc)
-+dnl AC_SEARCH_LIBS(crypt, crypt ufc)
- AC_CHECK_LIB(truerand, main)
- AC_SEARCH_LIBS(modf, m)
- 
-@@ -659,7 +659,7 @@
- 
- # The real-time POSIX extensions (e.g. shm_*, sem_*) may only
- # be available if linking against librt.
--AC_SEARCH_LIBS(shm_open, rt)
-+dnl AC_SEARCH_LIBS(shm_open, rt)  -- not used by apr
- 
- case $host in
-  *-sysv*)

diff --git a/apr.spec b/apr.spec
deleted file mode 100644 (file)
index 015484e..0000000
--- a/apr.spec
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-# Conditional build (Linux 2.4 compat, switch after Ac):
-%bcond_with    epoll           # use epoll() syscall (requires Linux 2.6)
-%bcond_with    sendfile64      # use sendfile64 on even if it requires Linux 2.6
-%bcond_with    tcpnodelaycork  # use TCP_NODELAY|TCP_CORK flags (requires Linux 2.6)
-#
-# Linux 2.4.32 supports sendfile64 only on i386 and mips (only 32-bit archs matter)
-%ifnarch ppc sparc sparc64
-%define                with_sendfile64         1
-%endif
-Summary:       Apache Portable Runtime
-Summary(pl):   Apache Portable Runtime - przeno¶na biblioteka uruchomieniowa
-Name:          apr
-Version:       1.2.2
-Release:       2.6
-Epoch:         1
-License:       Apache v2.0
-Group:         Libraries
-Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5: c43d923b02cf1983106d694976be89c1
-Patch0:                %{name}-link.patch
-Patch1:                %{name}-metuxmpm.patch
-Patch2:                %{name}-no-epoll.patch
-Patch3:                %{name}-libtool.patch
-URL:           http://apr.apache.org/
-BuildRequires: autoconf >= 2.13
-BuildRequires: automake
-BuildRequires: libtool >= 1.3.3
-BuildRequires: libuuid-devel
-BuildRequires: sed >= 4.0
-BuildRequires: python
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%define                _includedir     /usr/include/apr
-%define                _datadir        /usr/share/apr
-
-%description
-The mission of the Apache Portable Runtime (APR) project is to create
-and maintain software libraries that provide a predictable and
-consistent interface to underlying platform-specific implementations.
-The primary goal is to provide an API to which software developers may
-code and be assured of predictable if not identical behaviour
-regardless of the platform on which their software is built, relieving
-them of the need to code special-case conditions to work around or
-take advantage of platform-specific deficiencies or features.
-
-%description -l pl
-Celem projektu APR (Apache Portable Runtime) jest stworzenie i
-utrzymywanie bibliotek dostarczaj±cych przewidywalnego i spójnego
-interfejsu do le¿±cych u podstaw implementacji zale¿nych od platformy.
-G³ównym celem jest dostarczenie API, którego mog± u¿ywaæ programi¶ci
-maj±c pewno¶æ, ¿e zachowuje siê w sposób przewidywalny, je¶li nie
-identyczny, niezale¿nie od platformy na jakiej oprogramowanie jest
-budowane oraz bez potrzeby kodowania specjalnych warunków do
-obchodzenia lub wykorzystywania specyficznych dla platform ró¿nic lub
-mo¿liwo¶ci.
-
-%package devel
-Summary:       Header files and development documentation for apr
-Summary(pl):   Pliki nag³ówkowe i dokumentacja programisty do apr
-Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      libuuid-devel
-Requires:      automake
-Requires:      libtool
-
-%description devel
-Header files and development documentation for apr.
-
-%description devel -l pl
-Pliki nag³ówkowe i dokumentacja programisty do apr.
-
-%package static
-Summary:       Static apr library
-Summary(pl):   Statyczna biblioteka apr
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
-
-%description static
-Static apr library.
-
-%description static -l pl
-Statyczna biblioteka apr.
-
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%{!?with_epoll:%patch2 -p1}
-%patch3 -p1
-
-%build
-install /usr/share/automake/config.* build
-./buildconf
-%configure \
-       %{!?with_tcpnodelaycork:apr_cv_tcp_nodelay_with_cork=no} \
-       %{!?with_sendfile64:ac_cv_func_sendfile64=no} \
-       --with-devrandom=/dev/urandom \
-%ifarch %{ix86} %{i8664}
-%ifnarch i386
-       --enable-nonportable-atomics \
-%endif
-%endif
-       --enable-threads
-%{__make}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-ln -sf %{_bindir}/libtool $RPM_BUILD_ROOT%{_datadir}/libtool
-
-mv -f $RPM_BUILD_ROOT%{_datadir}/build-1 $RPM_BUILD_ROOT%{_datadir}/build
-install build/{*apr*.m4,*.awk,*.sh,gen-build.py} $RPM_BUILD_ROOT%{_datadir}/build
-ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_datadir}/build
-ln -snf /usr/share/libtool/ltmain.sh $RPM_BUILD_ROOT%{_datadir}/build
-ln -snf /usr/bin/libtool $RPM_BUILD_ROOT%{_datadir}/build
-ln -sf build $RPM_BUILD_ROOT%{_datadir}/build-1
-
-sed -i -e 's@^\(APR_SOURCE_DIR=\).*@\1"%{_datadir}"@' \
-       $RPM_BUILD_ROOT%{_bindir}/apr-1-config
-sed -i -e 's@^\(apr_builddir\|apr_builders\)=.*@\1=%{_datadir}/build-1@' \
-       $RPM_BUILD_ROOT%{_datadir}/build/apr_rules.mk
-sed -i -e '1s@#!.*python@#!%{__python}@' $RPM_BUILD_ROOT%{_datadir}/build/gen-build.py
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
-
-%files
-%defattr(644,root,root,755)
-%doc CHANGES docs/*.html
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_libdir}/apr.exp
-%{_includedir}
-%dir %{_datadir}
-%dir %{_datadir}/build
-%{_datadir}/build/*.mk
-%{_datadir}/build/*.m4
-%{_datadir}/build/*.awk
-%attr(755,root,root) %{_datadir}/build/config.*
-%attr(755,root,root) %{_datadir}/build/*.sh
-%attr(755,root,root) %{_datadir}/build/libtool
-%attr(755,root,root) %{_datadir}/build/gen-build.py
-%{_datadir}/build-1
-%{_pkgconfigdir}/apr-1.pc
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a