rpms/akode/devel akode-2.0.2-multilib.patch, NONE, 1.1 akode.spec, 1.15, 1.16
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Dec 24 03:41:24 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/akode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19261
Modified Files:
akode.spec
Added Files:
akode-2.0.2-multilib.patch
Log Message:
* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-2
- fix multilib conflicts (#340591)
akode-2.0.2-multilib.patch:
--- NEW FILE akode-2.0.2-multilib.patch ---
diff -up /dev/null akode-2.0.2/akode/akode.pc.in
--- /dev/null 2007-12-13 13:41:14.965729569 -0600
+++ akode-2.0.2/akode/akode.pc.in 2007-12-23 21:32:59.000000000 -0600
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: akode
+Description: aKode is a simple audio-decoding frame-work
+Version: 2.0.2
+Libs: -L${libdir} -lakode
+Cflags: -I${includedir}
+
diff -up akode-2.0.2/akode/configure.in.in.multilib akode-2.0.2/akode/configure.in.in
--- akode-2.0.2/akode/configure.in.in.multilib 2007-12-23 21:32:59.000000000 -0600
+++ akode-2.0.2/akode/configure.in.in 2007-12-23 21:32:59.000000000 -0600
@@ -1,5 +1,6 @@
dnl don't remove the below
dnl AC_OUTPUT(akode/akode-config)
+dnl AC_OUTPUT(akode/akode.pc)
AM_CONFIG_HEADER(akode/lib/akode_export.h)
diff -up akode-2.0.2/akode/akode-config.in.multilib akode-2.0.2/akode/akode-config.in
--- akode-2.0.2/akode/akode-config.in.multilib 2007-04-06 08:16:47.000000000 -0500
+++ akode-2.0.2/akode/akode-config.in 2007-12-23 21:37:40.000000000 -0600
@@ -15,9 +15,8 @@ EOH
}
prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+akode_libs="`pkg-config --libs akode`"
+akode_cflags="`pkg-config --cflags akode`"
flags=""
@@ -29,10 +28,10 @@ while test $# -gt 0
do
case $1 in
--libs)
- flags="$flags -L$libdir -lakode"
+ flags="$flags $akode_libs"
;;
--cflags)
- flags="$flags -I$includedir"
+ flags="$flags $akode_cflags"
;;
--version)
echo 2.0.2
diff -up akode-2.0.2/akode/Makefile.am.multilib akode-2.0.2/akode/Makefile.am
--- akode-2.0.2/akode/Makefile.am.multilib 2005-07-14 09:27:18.000000000 -0500
+++ akode-2.0.2/akode/Makefile.am 2007-12-23 21:32:59.000000000 -0600
@@ -1,3 +1,8 @@
bin_SCRIPTS = akode-config
SUBDIRS= lib plugins akodeplay
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = akode.pc
+
+EXTRA_DIST = akode.pc.in
Index: akode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akode/devel/akode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- akode.spec 24 Dec 2007 03:03:15 -0000 1.15
+++ akode.spec 24 Dec 2007 03:40:40 -0000 1.16
@@ -2,7 +2,7 @@
Summary: Audio-decoding framework
Name: akode
Version: 2.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -12,6 +12,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: akode-pulseaudio.patch
+Patch2: akode-2.0.2-multilib.patch
%if 0%{?fedora} > 4
%define _with_jack --with-jack
@@ -48,6 +49,7 @@
Summary: Headers for developing programs that will use %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
%description devel
%{summary}.
@@ -80,6 +82,7 @@
%setup -q -n %{name}-%{version}%{?beta}
%patch1 -p1 -b .pulseaudio
+%patch2 -p1 -b .multilib
#[ ! -f configure ] && \
make -f Makefile.cvs
@@ -142,6 +145,7 @@
%{_bindir}/akode-config
%{_includedir}/*
%{_libdir}/libakode.so
+%{_libdir}/pkgconfig/*.pc
%if "%{?_with_jack:1}" == "1"
%files jack
@@ -162,6 +166,9 @@
%changelog
+* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-2
+- fix multilib conflicts (#340591)
+
* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-1
- akode-2.0.2
More information about the scm-commits
mailing list