rpms/lash/devel lash-linking.patch,NONE,1.1 lash.spec,1.25,1.26

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/lash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1694

Modified Files:
	lash.spec 
Added Files:
	lash-linking.patch 
Log Message:
* Wed Feb 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5.4-9
- Fix DSO-linking failure


lash-linking.patch:
 control/Makefile.am |    2 +-
 control/Makefile.in |    2 +-
 panel/Makefile.am   |    2 +-
 panel/Makefile.in   |    2 +-
 synth/Makefile.am   |    2 +-
 synth/Makefile.in   |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE lash-linking.patch ---
diff -rupN lash-0.5.4.old/clients/control/Makefile.am lash-0.5.4/clients/control/Makefile.am
--- lash-0.5.4.old/clients/control/Makefile.am	2007-01-13 13:20:03.000000000 -0500
+++ lash-0.5.4/clients/control/Makefile.am	2010-02-10 03:08:04.000000000 -0500
@@ -18,6 +18,6 @@ lash_control_CFLAGS = $(LASH_CFLAGS)
 
 lash_control_LDADD = \
 	$(top_builddir)/liblash/liblash.la \
-	$(LASH_LIBS) @READLINE_LIBS@
+	$(LASH_LIBS) @READLINE_LIBS@ -luuid
 
 endif
diff -rupN lash-0.5.4.old/clients/control/Makefile.in lash-0.5.4/clients/control/Makefile.in
--- lash-0.5.4.old/clients/control/Makefile.in	2007-11-14 17:00:09.000000000 -0500
+++ lash-0.5.4/clients/control/Makefile.in	2010-02-10 03:09:26.000000000 -0500
@@ -236,7 +236,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
 @HAVE_READLINE_TRUE at lash_control_CFLAGS = $(LASH_CFLAGS)
 @HAVE_READLINE_TRUE at lash_control_LDADD = \
 @HAVE_READLINE_TRUE@	$(top_builddir)/liblash/liblash.la \
- at HAVE_READLINE_TRUE@	$(LASH_LIBS) @READLINE_LIBS@
+ at HAVE_READLINE_TRUE@	$(LASH_LIBS) @READLINE_LIBS@ -luuid
 
 all: all-am
 
diff -rupN lash-0.5.4.old/clients/panel/Makefile.am lash-0.5.4/clients/panel/Makefile.am
--- lash-0.5.4.old/clients/panel/Makefile.am	2005-09-13 01:22:59.000000000 -0400
+++ lash-0.5.4/clients/panel/Makefile.am	2010-02-10 03:17:10.000000000 -0500
@@ -13,7 +13,7 @@ lash_panel_CFLAGS = \
 
 lash_panel_LDADD = \
 	$(top_builddir)/liblash/liblash.la \
-	$(GTK2_LIBS)
+	$(GTK2_LIBS) -luuid
 
 if HAVE_GTK2
   bin_PROGRAMS = lash_panel
diff -rupN lash-0.5.4.old/clients/panel/Makefile.in lash-0.5.4/clients/panel/Makefile.in
--- lash-0.5.4.old/clients/panel/Makefile.in	2007-11-14 17:00:09.000000000 -0500
+++ lash-0.5.4/clients/panel/Makefile.in	2010-02-10 03:17:23.000000000 -0500
@@ -230,7 +230,7 @@ lash_panel_CFLAGS = \
 
 lash_panel_LDADD = \
 	$(top_builddir)/liblash/liblash.la \
-	$(GTK2_LIBS)
+	$(GTK2_LIBS) -luuid
 
 all: all-am
 
diff -rupN lash-0.5.4.old/clients/synth/Makefile.am lash-0.5.4/clients/synth/Makefile.am
--- lash-0.5.4.old/clients/synth/Makefile.am	2005-09-13 01:22:59.000000000 -0400
+++ lash-0.5.4/clients/synth/Makefile.am	2010-02-10 03:22:39.000000000 -0500
@@ -20,4 +20,4 @@ lash_synth_LDADD = \
 	$(JACK_LIBS) \
 	$(ALSA_LIBS) \
 	$(GTK2_LIBS) \
-	-lpthread
+	-lpthread -lm
diff -rupN lash-0.5.4.old/clients/synth/Makefile.in lash-0.5.4/clients/synth/Makefile.in
--- lash-0.5.4.old/clients/synth/Makefile.in	2007-11-14 17:00:10.000000000 -0500
+++ lash-0.5.4/clients/synth/Makefile.in	2010-02-10 03:22:51.000000000 -0500
@@ -238,7 +238,7 @@ lash_synth_LDADD = \
 	$(JACK_LIBS) \
 	$(ALSA_LIBS) \
 	$(GTK2_LIBS) \
-	-lpthread
+	-lpthread -lm
 
 all: all-am
 


Index: lash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lash/devel/lash.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- lash.spec	6 Aug 2009 00:57:50 -0000	1.25
+++ lash.spec	10 Feb 2010 08:33:00 -0000	1.26
@@ -3,13 +3,16 @@
 Summary:      LASH Audio Session Handler
 Name:         lash
 Version:      0.5.4
-Release:      8%{?dist}
+Release:      9%{?dist}
 License:      GPLv2+
 Group:        System Environment/Libraries
 URL:          http://www.nongnu.org/lash/
 Source0:      http://download.savannah.gnu.org/releases/lash/lash-%{version}.tar.gz
 Source1:      %{name}-panel.desktop
 Patch0:       lash-0.5.3-no-static-lib.patch
+# Fix DSO-linking failure
+# Upstream bugtracker is closed for some reason. Sent via email:
+Patch1:       lash-linking.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
@@ -63,6 +66,7 @@ LASH.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1 -b .linking
 
 %build
 export am_cv_python_pythondir=%{python_sitearch}
@@ -160,6 +164,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/lash.py*
 
 %changelog
+* Wed Feb 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5.4-9
+- Fix DSO-linking failure
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.5.4-8
 - Update .desktop file