- updated to 1.0.0 (patches need check).

- release 0.1.

Changed files:
    apr.spec -> 1.22

diff --git a/apr.spec b/apr.spec
index bae4d2ba710836f0ee2da8874e73dea58a833667..c6733cd4a1d932d12341afd4a5b0e31875ff1bfa 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -1,17 +1,17 @@
 Summary:       Apache Portable Runtime
 Summary(pl):   Apache Portable Runtime - przeno¶na biblioteka uruchomieniowa
 Name:          apr
-Version:       0.9.5
-Release:       8
+Version:       1.0.0
+Release:       0.1
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
-Source0:       http://www.apache.org/dist/apr/%{name}-0.9.4.tar.gz
-# Source0-md5: 0f1e6765532dd581a58d69b35adeecfe
-Patch0:                %{name}-0.9.4_0.9.5.patch.gz
-Patch1:                %{name}-link.patch
+Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
+# Source0-md5: ccd5c21292581be4ba9db10ad5cc8ced
+#Patch0:               %{name}-0.9.4_0.9.5.patch.gz
+#Patch1:               %{name}-link.patch
 Patch2:                %{name}-metuxmpm.patch
-Patch3:                %{name}-modes.patch
+#Patch3:               %{name}-modes.patch     -- obsolete
 URL:           http://apr.apache.org/
 BuildRequires: autoconf >= 2.13
 BuildRequires: automake
@@ -68,11 +68,10 @@ Static apr library.
 Statyczna biblioteka apr.
 
 %prep
-%setup -q -n %{name}-0.9.4
-%patch0 -p1
-%patch1 -p1
+%setup -q
+#patch0 -p1
+#patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 install /usr/share/automake/config.* build
@@ -89,11 +88,11 @@ rm -rf $RPM_BUILD_ROOT
 
 ln -sf %{_bindir}/libtool $RPM_BUILD_ROOT%{_datadir}/libtool
 
-install build/{*apr*.m4,*.awk,*.sh,config.*} $RPM_BUILD_ROOT%{_datadir}/build
+install build/{*apr*.m4,*.awk,*.sh,config.*} $RPM_BUILD_ROOT%{_datadir}/build-1
 
 %{__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
+%{__perl} -pi -e 's@^(apr_builddir|apr_builders)=.*@$1=%{_datadir}/build-1@' \
+       $RPM_BUILD_ROOT%{_datadir}/build-1/apr_rules.mk
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,13 +113,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
+%dir %{_datadir}/build-1
+%{_datadir}/build-1/*.mk
+%{_datadir}/build-1/*.m4
+%{_datadir}/build-1/*.awk
+%attr(755,root,root) %{_datadir}/build-1/config.*
+%attr(755,root,root) %{_datadir}/build-1/*.sh
+%attr(755,root,root) %{_datadir}/build-1/libtool
+%{_pkgconfigdir}/apr-1.pc
 
 %files static
 %defattr(644,root,root,755)