diff --git a/dbus-tqt-trinity.spec b/dbus-tqt-trinity.spec index 54a3e3d..0f0ade7 100644 --- a/dbus-tqt-trinity.spec +++ b/dbus-tqt-trinity.spec @@ -19,11 +19,9 @@ Development libraries and headers for dbus-tqt-trinity %prep %autosetup -n %{name}-%{version} - %define trinity_dir /opt/trinity %define sysconfdir /etc/trinity %build -export PKG_CONFIG_PATH=%trinity_dir/lib/pkgconfig cd ../ mkdir tqt.build cd tqt.build @@ -34,18 +32,19 @@ cmake \ -DCMAKE_INSTALL_PREFIX=%{buildroot}%{trinity_dir} -DMAN_INSTALL_DIR=%{buildroot}%{trinity_dir}/man \ -DBUILD_ALL="ON" \ -DQT_VERSION=3 \ --DPKG_CONFIG_PATH=%{trinity_dir}/lib/pkgconfig \ +-DPKG_CONFIG_PATH=%{trinity_dir}/lib64/pkgconfig \ ../%{name}-%{version}/ -export LD_LIBRARY_PATH=%{trinity_dir}/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=%{trinity_dir}/lib64:$LD_LIBRARY_PATH make %{?_smp_mflags} - - %install cd ../tqt.build/ -export LD_LIBRARY_PATH=%{trinity_dir}/lib:$LD_LIBRARY_PATH -make install -sed -i 's#buildroot##g' %buildroot%trinity_dir/lib64/*.la +export LD_LIBRARY_PATH=%{trinity_dir}/lib64:$LD_LIBRARY_PATH +make install + +export buildroot=%buildroot +sed -i "s#$buildroot##g" %buildroot%trinity_dir/lib64/*.la +sed -i "s#$buildroot##g" %buildroot%trinity_dir/lib64/pkgconfig/*.pc %check %files