diff --git a/libdeltacloud.spec b/libdeltacloud.spec index 3787ed3..b51eea8 100644 --- a/libdeltacloud.spec +++ b/libdeltacloud.spec @@ -9,6 +9,7 @@ Source0: http://people.redhat.com/clalance/libdeltacloud/%{version}/%{name}-%{ve BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libcurl-devel BuildRequires: libxml2-devel +Conflicts: filesystem < 3 %description Libdeltacloud is a library for accessing deltacloud via a @@ -28,26 +29,16 @@ applications that need to use the libdeltacloud library. %setup -q %build -%configure --libdir=/%{_lib} +%configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR="${RPM_BUILD_ROOT}" install -# Move the symlink -rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.so -mkdir -p $RPM_BUILD_ROOT%{_libdir} -VLIBNAME=$(ls $RPM_BUILD_ROOT/%{_lib}/%{name}.so.*.*.*) -LIBNAME=$(basename $VLIBNAME) -ln -s ../../%{_lib}/$LIBNAME $RPM_BUILD_ROOT%{_libdir}/%{name}.so - -# Move the pkgconfig file -mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir} - # Remove a couple things so they don't get picked up -rm -f $RPM_BUILD_ROOT/%{_lib}/libdeltacloud.la -rm -f $RPM_BUILD_ROOT/%{_lib}/libdeltacloud.a +rm -f $RPM_BUILD_ROOT%{_libdir}/libdeltacloud.la +rm -f $RPM_BUILD_ROOT%{_libdir}/libdeltacloud.a %clean rm -rf $RPM_BUILD_ROOT @@ -60,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING -%attr(0755,root,root) /%{_lib}/libdeltacloud.so.* +%attr(0755,root,root) %{_libdir}/libdeltacloud.so.* %files devel %defattr(-,root,root,-)