rpms/xchat-gnome/devel xchat-gnome-DSOLink.patch, NONE, 1.1 xchat-gnome.spec, 1.68, 1.69

Brian Pepple bpepple at fedoraproject.org
Sun Mar 7 21:02:43 UTC 2010


Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15165

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-DSOLink.patch 
Log Message:
* Sun Mar  7 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.26.1-9
- Add patch to fix DSOLinking. (#564820)


xchat-gnome-DSOLink.patch:
 fe-gnome/Makefile.am    |    1 +
 fe-gnome/Makefile.in    |    1 +
 libcontrast/Makefile.am |    1 +
 libcontrast/Makefile.in |    1 +
 4 files changed, 4 insertions(+)

--- NEW FILE xchat-gnome-DSOLink.patch ---
diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/Makefile.am xchat-gnome-0.26.1/src/fe-gnome/Makefile.am
--- xchat-gnome-0.26.1.OLD/src/fe-gnome/Makefile.am	2007-04-24 18:43:05.000000000 -0400
+++ xchat-gnome-0.26.1/src/fe-gnome/Makefile.am	2010-03-07 15:45:35.667276790 -0500
@@ -113,6 +113,7 @@ xchat_gnome_CFLAGS = \
 	$(AM_CFLAGS)
 
 xchat_gnome_LDFLAGS = \
+	-lX11		\
 	-export-dynamic	\
 	$(AM_LDFLAGS)
 
diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/Makefile.in xchat-gnome-0.26.1/src/fe-gnome/Makefile.in
--- xchat-gnome-0.26.1.OLD/src/fe-gnome/Makefile.in	2009-04-12 13:48:06.000000000 -0400
+++ xchat-gnome-0.26.1/src/fe-gnome/Makefile.in	2010-03-07 15:45:55.309526635 -0500
@@ -449,6 +449,7 @@ xchat_gnome_CFLAGS = \
 	$(AM_CFLAGS)
 
 xchat_gnome_LDFLAGS = \
+	-lX11		\
 	-export-dynamic	\
 	$(AM_LDFLAGS)
 
diff -urp xchat-gnome-0.26.1.OLD/src/libcontrast/Makefile.am xchat-gnome-0.26.1/src/libcontrast/Makefile.am
--- xchat-gnome-0.26.1.OLD/src/libcontrast/Makefile.am	2007-04-24 18:43:04.000000000 -0400
+++ xchat-gnome-0.26.1/src/libcontrast/Makefile.am	2010-03-07 15:56:15.164278726 -0500
@@ -12,6 +12,7 @@ libcontrast_la_CFLAGS =		\
 	$(AM_CFLAGS)
 
 libcontrast_la_LDFLAGS =	\
+	-lm			\
 	$(AM_LDFLAGS)		\
 	-static
 
diff -urp xchat-gnome-0.26.1.OLD/src/libcontrast/Makefile.in xchat-gnome-0.26.1/src/libcontrast/Makefile.in
--- xchat-gnome-0.26.1.OLD/src/libcontrast/Makefile.in	2009-04-12 13:48:06.000000000 -0400
+++ xchat-gnome-0.26.1/src/libcontrast/Makefile.in	2010-03-07 15:56:35.529527068 -0500
@@ -297,6 +297,7 @@ libcontrast_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libcontrast_la_LDFLAGS = \
+	-lm			\
 	$(AM_LDFLAGS)		\
 	-static
 


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- xchat-gnome.spec	18 Jan 2010 14:51:11 -0000	1.68
+++ xchat-gnome.spec	7 Mar 2010 21:02:43 -0000	1.69
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.26.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -16,6 +16,8 @@ Patch1:		xchat-topic-update.patch
 Patch2:		%{name}-crasher.patch
 # http://git.gnome.org/browse/xchat-gnome/commit/?id=ac131cab5e5429525aed592b504bae9d6ee92069
 Patch3:		status_fix.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=564820 
+Patch4:		%{name}-DSOLink.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,7 +61,7 @@ common settings will be included in the 
 %patch1 -p1 -b .topic
 %patch2 -p1 -b .crasher
 %patch3 -p1 -b .status
-
+%patch4 -p1 -b .dsolink
 
 %build
 %configure --disable-tcl		\
@@ -147,6 +149,9 @@ fi
 
 
 %changelog
+* Sun Mar  7 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.26.1-9
+- Add patch to fix DSOLinking. (#564820)
+
 * Mon Jan 18 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.26.1-8
 - Add patch to fix regression with bing unable to set status 'back'.
 



More information about the scm-commits mailing list