rpms/gaim-rhythmbox/FC-5 gaim-rhythmbox-1.5.0.1-libdir.diff, NONE, 1.1 gaim-rhythmbox.spec, 1.2, 1.3

Michel Alexandre Salim (salimma) fedora-extras-commits at redhat.com
Sun Jan 7 02:28:02 UTC 2007


Author: salimma

Update of /cvs/extras/rpms/gaim-rhythmbox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22502

Modified Files:
	gaim-rhythmbox.spec 
Added Files:
	gaim-rhythmbox-1.5.0.1-libdir.diff 
Log Message:
Fix missing path for liboscar.so


gaim-rhythmbox-1.5.0.1-libdir.diff:

--- NEW FILE gaim-rhythmbox-1.5.0.1-libdir.diff ---
--- gaim-rhythmbox-1.5.0.1/src/Makefile.in.lib	2005-09-12 15:10:00.000000000 -0400
+++ gaim-rhythmbox-1.5.0.1/src/Makefile.in	2007-01-06 17:59:26.000000000 -0500
@@ -217,6 +217,7 @@
 				$(gaim_LIBS)		\
 				$(libbonobo_LIBS)	\
 				$(gtk2_LIBS)		\
+				-R $(libdir)/gaim	\
 				-loscar
 
 nodist_gaim_rhythmbox_la_SOURCES = $(RB_interface_c)


Index: gaim-rhythmbox.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-5/gaim-rhythmbox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gaim-rhythmbox.spec	4 Nov 2006 15:38:58 -0000	1.2
+++ gaim-rhythmbox.spec	7 Jan 2007 02:27:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gaim-rhythmbox
 Version:        1.5.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rhythmbox plugin for GAIM
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@
 URL:            http://jon.oberheide.org/projects/gaim-rhythmbox/
 Source0:        http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}.tar.gz
 Patch0:         gaim-rhythmbox-configure.diff
+Patch1:         gaim-rhythmbox-1.5.0.1-libdir.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gaim-devel
@@ -15,7 +16,7 @@
 BuildRequires:  libbonobo-devel
 BuildRequires:  ORBit2-devel
 BuildRequires:  rhythmbox
-Requires:       gaim rhythmbox
+Requires:       rhythmbox
 
 %description
 The Gaim-Rhythmbox plugin will automatically update your Gaim user and
@@ -28,7 +29,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -b .gaim-rhythmbox-configure
+%patch0 -b .configure
+%patch1 -p1 -b .libdir
 
 
 %build
@@ -54,5 +56,8 @@
 
 
 %changelog
+* Sat Jan  6 2007 Michel Salim <michel.salim at gmail.com> 1.5.0.1-2
+- Remember run-time path to liboscar.so
+
 * Sat Nov  4 2006 Michel Salim <michel.salim at gmail.com> 1.5.0.1-1
 - Initial package




More information about the scm-commits mailing list