LOG Disable uclibc build by default

liblzo.spec

@@ -1,18 +1,18 @@
 %define major 2
 %define apiver 2
 %define libname %mklibname lzo %{apiver} %{major}
-%define develname %mklibname lzo -d
+%define devname %mklibname lzo -d
 
-%bcond_without	uclibc
+%bcond_with	uclibc
 
 Summary:	Data compression library with very fast (de-)compression
 Name:		liblzo
 Version:	2.06
-Release:	%mkrel 1
-License:	GPLv2
+Release:	2
+License:	GPLv2+
 Group:		System/Libraries
-URL:		http://www.oberhumer.com/opensource/lzo/
-Source0:	http://www.oberhumer.com/opensource/lzo/download/lzo-%version.tar.gz
+Url:		http://www.oberhumer.com/opensource/lzo/
+Source0:	http://www.oberhumer.com/opensource/lzo/download/lzo-%{version}.tar.gz
 %if %{with uclibc}
 BuildRequires:	uClibc-devel
 %endif
@@ -24,10 +24,11 @@ Decompression requires no memory. In addition there are slower
 compression levels achieving a quite competitive compression ratio while 
 still decompressing at this very high speed.
 
+#----------------------------------------------------------------------------
+
 %package -n	%{libname}
 Summary:	Data compression library with very fast (de-)compression
 Group:		System/Libraries
-Provides:	%{name}
 
 %description -n %{libname}
 LZO is a portable lossless data compression library written in ANSI C.
@@ -36,20 +37,37 @@ Decompression requires no memory. In addition there are slower
 compression levels achieving a quite competitive compression ratio while
 still decompressing at this very high speed.
 
-%package -n	%{develname}
+%files -n %{libname}
+%doc AUTHORS NEWS README THANKS doc/LZO.TXT doc/LZO.FAQ
+%{_libdir}/liblzo%{apiver}.so.%{major}*
+
+#----------------------------------------------------------------------------
+
+%package -n	%{devname}
 Summary:	Headers files of liblzo library
 Group:		Development/C
-Requires:	%{libname} = %{version}
-Provides:	%{name}2-devel = %{version}-%{release}
-Provides:	%{name}-devel = %{version}-%{release}
-Obsoletes:	%mklibname lzo 2_2 -d
+Requires:	%{libname} = %{EVRD}
+Provides:	%{name}2-devel = %{EVRD}
+Provides:	%{name}-devel = %{EVRD}
 
-%description -n %{develname}
+%description -n %{devname}
 LZO is a portable lossless data compression library written in ANSI C.
 It offers pretty fast compression and *very* fast decompression.
 Decompression requires no memory. In addition there are slower
 compression levels achieving a quite competitive compression ratio while
-still decompressing at this very high speed.                    
+still decompressing at this very high speed.
+
+%files -n %{devname}
+%doc doc/LZOAPI.TXT doc/LZOTEST.TXT
+%{_bindir}/lzotest
+%{_libdir}/*.a
+%if %{with uclibc}
+%{uclibc_root}%{_libdir}/*.a
+%endif
+%{_libdir}/*.so
+%{_includedir}/*
+
+#----------------------------------------------------------------------------
 
 %prep
 %setup -qn lzo-%{version}
@@ -58,12 +76,12 @@ still decompressing at this very high speed.
 export CONFIGURE_TOP=`pwd`
 %if %{with uclibc}
 mkdir -p uclibc
-cd uclibc
+pushd uclibc
 %configure2_5x	CC="%{uclibc_cc}" \
 		CFLAGS="%{uclibc_cflags}" \
 		--disable-shared
 %make
-cd ..
+popd
 %endif
 
 mkdir -p shared
@@ -72,30 +90,16 @@ cd shared
 %make
 cd ..
 
-%check
-cd shared
-make check
-make test
-
 %install
-rm -rf %{buildroot}
 %if %{with uclibc}
 install -m644 uclibc/src/.libs/liblzo2.a -D %{buildroot}%{uclibc_root}%{_libdir}/liblzo.a
 %endif
+
 %makeinstall_std -C shared
 install -m755 shared/lzotest/lzotest -D %{buildroot}%{_bindir}/lzotest
 rm -rf %{buildroot}%{_datadir}/doc/lzo
 
-%files -n %{libname}
-%doc AUTHORS NEWS README THANKS doc/LZO.TXT doc/LZO.FAQ
-%{_libdir}/*%{apiver}.so.%{major}*
-
-%files -n %{develname}
-%doc doc/LZOAPI.TXT doc/LZOTEST.TXT
-%{_bindir}/lzotest
-%{_libdir}/*.a
-%if %{with uclibc}
-%{uclibc_root}%{_libdir}/*.a
-%endif
-%{_libdir}/*.so
-%{_includedir}/* 
+%check
+cd shared
+make check
+make test