diff --git a/ustr-import-multilib2.patch b/ustr-import-multilib2.patch index 8f7b1b1..48e3523 100644 --- a/ustr-import-multilib2.patch +++ b/ustr-import-multilib2.patch @@ -1,11 +1,11 @@ -commit 4d5d688defa0f0909fb05e1e288f9ffbbb050e7d +commit 95d99aa5fe596bd3c06aee7dfec69d8c88d2827e Author: James Antill Date: Sun Feb 10 17:46:10 2008 -0500 Fix minor problems diff --git a/Makefile b/Makefile -index 2158dff..17558cf 100644 +index 2158dff..ca0478a 100644 --- a/Makefile +++ b/Makefile @@ -403,12 +403,13 @@ ustr-import-multilib: ustr-import-multilib.in @@ -19,7 +19,7 @@ index 2158dff..17558cf 100644 $(DESTDIR)$(includedir)/ustr-conf-debug-$$mlib.h; \ mv -f $(DESTDIR)$(includedir)/ustr-conf.h \ - $(DESTDIR)$(includedir)/ustr-conf-$$mlib.h -+ $(DESTDIR)$(includedir)/ustr-conf-$$mlib.h \ ++ $(DESTDIR)$(includedir)/ustr-conf-$$mlib.h; \ mv -f $(DESTDIR)$(bindir)/ustr-import \ $(DESTDIR)$(MBINDIR)/ustr-import-$$mlib install -m 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS_MULTI_LIB) diff --git a/ustr.spec b/ustr.spec index 19103e1..49c05e2 100644 --- a/ustr.spec +++ b/ustr.spec @@ -128,7 +128,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ustr-%{version} %{_bindir}/ustr-import %if %{multilib_inst} -%{_libexecdir}/ustr-import* +%{_libexecdir}/ustr-%{version}/ustr-import* %endif %{_includedir}/ustr.h %{_includedir}/ustr-*.h