diff --git a/freealut-multiarch.patch b/freealut-multiarch.patch new file mode 100644 index 0000000..0057db2 --- /dev/null +++ b/freealut-multiarch.patch @@ -0,0 +1,57 @@ +--- admin/pkgconfig/freealut-config.in.orig 2008-01-02 23:12:54.000000000 +0100 ++++ admin/pkgconfig/freealut-config.in 2008-01-02 23:15:49.000000000 +0100 +@@ -4,7 +4,6 @@ + exec_prefix="@exec_prefix@" + bindir="@bindir@" + includedir="@includedir@" +-libdir="@libdir@" + PACKAGE_VERSION="@PACKAGE_VERSION@" + + freealut_dynamic_ldflags="-lalut" +@@ -19,8 +18,6 @@ + echo_bindir=no + includedir_set=no + echo_includedir=no +-libdir_set=no +-echo_libdir=no + echo_version=no + echo_cflags=no + static_libs=no +@@ -85,10 +82,8 @@ + ;; + --libdir=*) + libdir="${optarg}" +- libdir_set="yes" + ;; + --libdir) +- echo_libdir="yes" + ;; + --version) + echo_version="yes" +@@ -138,14 +133,6 @@ + echo "${includedir}" + fi + +-if test "${libdir_set}" = "no" && test "${exec_prefix_set}" = "yes"; then +- libdir="${exec_prefix}/lib" +-fi +- +-if test "$echo_libdir" = "yes"; then +- echo "${libdir}" +-fi +- + if test "$echo_version" = "yes"; then + echo "${PACKAGE_VERSION}" + fi +@@ -160,11 +147,6 @@ + fi + + if test "$echo_libs" = "yes"; then +- if test "${libdir}" = "/usr/lib" ; then +- libpathflag="" +- else +- libpathflag="-L${libdir}" +- fi + if test "${static_libs}" = "yes"; then + ldflags="${freealut_static_ldflags}" + else diff --git a/freealut.spec b/freealut.spec index 9c7bf42..d430a89 100644 --- a/freealut.spec +++ b/freealut.spec @@ -1,6 +1,6 @@ Name: freealut Version: 1.1.0 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Implementation of OpenAL's ALUT standard Group: System Environment/Libraries @@ -8,9 +8,11 @@ License: LGPLv2 URL: http://openal.org/ Source0: http://openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz Patch0: freealut-openal.patch +Patch1: freealut-multiarch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openal-devel +BuildRequires: libtool %description freealut is a free implementation of OpenAL's ALUT standard. See the file @@ -29,6 +31,8 @@ Development headers and libraries needed for freealut development %prep %setup -q %patch0 +%patch1 +autoreconf %build %configure --disable-static @@ -40,6 +44,19 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/libalut.la +# don't have dsp devices in buildroot +#%check +#pushd test_suite +#./test_errorstuff || exit $? +#./test_fileloader || exit $? +#./test_memoryloader || exit $? +#./test_retrostuff || exit $? +#./test_version || exit $? +#./test_waveforms || exit $? +#popd + +touch -r ChangeLog $RPM_BUILD_ROOT/%{_bindir}/freealut-config + %clean rm -rf $RPM_BUILD_ROOT @@ -60,16 +77,25 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/freealut.pc %changelog +* Wed Jan 02 2008 Andreas Bierfert +- 1.1.0-5 +- fix #341161 multiarch conflicts + * Wed Aug 22 2007 Andreas Bierfert -- 1.0.1-3 +- 1.1.0-4 - fix license tag +- rebuild for buildid + +* Mon Mar 12 2007 Andreas Bierfert +1.1.0-3 +- fix #231132 * Fri Sep 15 2006 Andreas Bierfert -1.0.1-2 +1.1.0-2 - FE6 rebuild * Tue Jun 13 2006 Andreas Bierfert -1.0.1-1 +1.1.0-1 - version upgrade * Fri Feb 17 2006 Andreas Bierfert