diff --git a/bzip2.spec b/bzip2.spec index 1dcb5c8..4b440a2 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -36,6 +36,7 @@ which will use the library. %package libs Summary: Libraries for applications using bzip2 Group: System Environment/Libraries +Conflicts: filesystem < 3 %description libs @@ -64,7 +65,7 @@ rm -rf ${RPM_BUILD_ROOT} chmod 644 bzlib.h mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/%{_lib},%{_libdir},%{_includedir}} cp -p bzlib.h $RPM_BUILD_ROOT%{_includedir} -install -m 755 libbz2.so.%{library_version} $RPM_BUILD_ROOT/%{_lib} +install -m 755 libbz2.so.%{library_version} $RPM_BUILD_ROOT/%{_libdir} install -m 755 bzip2-shared $RPM_BUILD_ROOT%{_bindir}/bzip2 install -m 755 bzip2recover bzgrep bzdiff bzmore $RPM_BUILD_ROOT%{_bindir}/ cp -p bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/ @@ -72,8 +73,8 @@ ln -s bzip2 $RPM_BUILD_ROOT%{_bindir}/bunzip2 ln -s bzip2 $RPM_BUILD_ROOT%{_bindir}/bzcat ln -s bzdiff $RPM_BUILD_ROOT%{_bindir}/bzcmp ln -s bzmore $RPM_BUILD_ROOT%{_bindir}/bzless -ln -s libbz2.so.%{library_version} $RPM_BUILD_ROOT/%{_lib}/libbz2.so.1 -ln -s ../../%{_lib}/libbz2.so.1 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so +ln -s libbz2.so.%{library_version} $RPM_BUILD_ROOT/%{_libdir}/libbz2.so.1 +ln -s libbz2.so.1 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so ln -s bzip2.1 $RPM_BUILD_ROOT%{_mandir}/man1/bzip2recover.1 ln -s bzip2.1 $RPM_BUILD_ROOT%{_mandir}/man1/bunzip2.1 ln -s bzip2.1 $RPM_BUILD_ROOT%{_mandir}/man1/bzcat.1 @@ -97,13 +98,13 @@ rm -rf ${RPM_BUILD_ROOT} %files libs %defattr(-,root,root,-) %doc LICENSE -/%{_lib}/*so.* +%{_libdir}/*so.* %files devel %defattr(-,root,root,-) %doc manual.html manual.pdf %{_includedir}/* -/%{_libdir}/*so +%{_libdir}/*so %changelog * Tue Feb 08 2011 Fedora Release Engineering - 1.0.6-3