diff --git a/libmikmod-config.patch b/libmikmod-config.patch new file mode 100644 index 0000000..de61b93 --- /dev/null +++ b/libmikmod-config.patch @@ -0,0 +1,21 @@ +Index: libmikmod-config.in +=================================================================== +--- libmikmod-config.in.orig ++++ libmikmod-config.in +@@ -44,13 +44,13 @@ while test $# -gt 0 ; do + if test $includedir != /usr/include ; then + includes=-I$includedir + fi +- echo $includes @REENTRANT@ ++ echo $includes + ;; + --ldadd) +- echo @LIB_LDADD@ ++ echo + ;; + --libs) +- echo -L@libdir@ -lmikmod @LIBRARY_LIB@ ++ echo -lmikmod + ;; + *) + echo "${usage}" 1>&2 diff --git a/libmikmod.changes b/libmikmod.changes index 222036c..e46d1e3 100644 --- a/libmikmod.changes +++ b/libmikmod.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed May 7 14:41:18 UTC 2014 - reddwarf@opensuse.org + +- Modify libmikmod-config.patch to also remove pthreads stuff from + cflags and ldadd. Now it's "equivalent" to the .pc file. + +------------------------------------------------------------------- +Tue May 6 09:22:13 UTC 2014 - schwab@suse.de + +- Add libmikmod-config.patch: + Remove @LIBRARY_LIB@ from libmikmod-config, which is only needed for + static linking, which is not possible anyway + ------------------------------------------------------------------- Mon Apr 7 10:39:46 UTC 2014 - idonmez@suse.com diff --git a/libmikmod.spec b/libmikmod.spec index 5e92164..de62dc7 100644 --- a/libmikmod.spec +++ b/libmikmod.spec @@ -30,6 +30,7 @@ Version: 3.3.6 Release: 0 Source: http://sourceforge.net/projects/mikmod/files/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: baselibs.conf +Patch1: libmikmod-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -84,6 +85,7 @@ mtm, xm, and it. %prep %setup -q +%patch1 %build %configure --disable-static --disable-oss