- one more try, release 0.3

[packages/apr-compat.git] / apr-compat.spec

diff --git a/apr-compat.spec b/apr-compat.spec
index 7b0087a2705c506cb8110cebe6b10a22c77da33b..e6f6a84af58ffe496c04c5675434c4e5eb86ee4b 100644 (file)
--- a/apr-compat.spec
+++ b/apr-compat.spec
@@ -1,19 +1,19 @@
 Summary:       Apache Portable Runtime
 Summary(pl):   Apache Portable Runtime - przeno¶na biblioteka uruchomieniowa
 Name:          apr
-Version:       0.9.4
-Release:       2
+Version:       0.9.5
+Release:       0.3
 Epoch:         1
 License:       GPL
 Group:         Libraries
-Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
+Source0:       http://www.apache.org/dist/apr/%{name}-0.9.4.tar.gz
 # Source0-md5: 0f1e6765532dd581a58d69b35adeecfe
 Patch0:                %{name}-link.patch
+Patch1:                %{name}-0.9.4_0.9.5.patch
 URL:           http://apr.apache.org/
 BuildRequires: autoconf >= 2.13
 BuildRequires: libtool >= 1.3.3
 BuildRequires: perl-base
-Conflicts:     apr < 1:0.9
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _includedir     /usr/include/apr
@@ -45,7 +45,6 @@ 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}
-Conflicts:     apr-devel < 1:0.9
 
 %description devel
 Header files and development documentation for apr.
@@ -58,7 +57,6 @@ Summary:      Static apr library
 Summary(pl):   Statyczna biblioteka apr
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
-Conflicts:     apr-static < 1:0.9
 
 %description static
 Static apr library.
@@ -67,8 +65,9 @@ Static apr library.
 Statyczna biblioteka apr.
 
 %prep
-%setup -q
-%patch -p1 -b .orig
+%setup -q -n %{name}-0.9.4
+%patch0 -p1 -b .orig
+%patch1 -p1
 
 %build
 ./buildconf
@@ -86,8 +85,9 @@ ln -sf %{_bindir}/libtool $RPM_BUILD_ROOT%{_datadir}/libtool
 
 install build/{*apr*.m4,*.awk,*.sh,config.*} $RPM_BUILD_ROOT%{_datadir}/build
 
-%{__perl} -pi -e "s#$RPM_BUILD_DIR/%{name}-%{version}#%{_datadir}#g" $RPM_BUILD_ROOT%{_bindir}/*
-%{__perl} -pi -e "s#$RPM_BUILD_DIR/%{name}-%{version}.*#%{_datadir}/build#g" $RPM_BUILD_ROOT%{_datadir}/build/*
+%{__perl} -pi -e 's@^(APR_SOURCE_DIR=).*@$1"%{_datadir}"@' $RPM_BUILD_ROOT%{_bindir}/apr-config
+%{__perl} -pi -e 's@^(apr_builddir|apr_builders)=.*@$1=%{_datadir}/build@' \
+       $RPM_BUILD_ROOT%{_datadir}/build/apr_rules.mk
 
 %clean
 rm -rf $RPM_BUILD_ROOT