diff --git a/expat.spec b/expat.spec index 836303f..ac56756 100644 --- a/expat.spec +++ b/expat.spec @@ -11,6 +11,7 @@ URL: http://www.libexpat.org/ License: MIT BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, libtool, check-devel +Conflicts: filesystem < 3 %description This is expat, the C library for parsing XML, written by James Clark. Expat @@ -40,7 +41,7 @@ rm -rf autom4te*.cache rm conftools/libtool.m4 libtoolize --copy --force --automake && aclocal && autoheader && autoconf export CFLAGS="$RPM_OPT_FLAGS -fPIC" -%configure --libdir=/%{_lib} --disable-static +%configure --disable-static make %{?_smp_mflags} %install @@ -51,13 +52,7 @@ chmod 644 README COPYING Changes doc/* examples/* make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_libdir} -mv $RPM_BUILD_ROOT/%{_lib}/libexpat.so $RPM_BUILD_ROOT%{_libdir} - -rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.la - -lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*` -ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so +rm -f $RPM_BUILD_ROOT/%{_libdir}/libexpat.la %check make check @@ -72,7 +67,7 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-,root,root) %doc README COPYING %{_bindir}/* -/%{_lib}/lib*.so.* +%{_libdir}/lib*.so.* %{_mandir}/*/* %files devel