rpms/razertool/F-12 razertool-0.0.7-libm.patch, NONE, 1.1 import.log, 1.1, 1.2 razertool.spec, 1.2, 1.3

Andreas Osowski th0br0 at fedoraproject.org
Sun Apr 18 08:56:48 UTC 2010


Author: th0br0

Update of /cvs/pkgs/rpms/razertool/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8580/F-12

Modified Files:
	import.log razertool.spec 
Added Files:
	razertool-0.0.7-libm.patch 
Log Message:
Fix for 564813: ImplicitDSOLinking

razertool-0.0.7-libm.patch:
 configure.in    |    4 ++++
 gtk/Makefile.am |    2 +-
 gtk/Makefile.in |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE razertool-0.0.7-libm.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for razertool >= 0.0.7, which
adds the missing (former implicit) linking to libm. And as implicit linking can
be dangerous, Fedora has changed this behaviour. For more information have a look
to Red Hat Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=564813

--- razertool-0.0.7/configure.in		2006-08-13 21:57:35.000000000 +0200
+++ razertool-0.0.7/configure.in.libm		2010-04-17 17:49:40.000000000 +0200
@@ -49,6 +49,10 @@
 ALL_LINGUAS=`cat "${srcdir}/po/LINGUAS"`
 AM_GLIB_GNU_GETTEXT
 
+dnl Math library
+AC_CHECK_LIB([m], [floor], AC_DEFINE(HAVE_LIBM, 1, Math lib) LIBM_LIBS="-lm", AC_MSG_ERROR(Missing working libm math lib))
+AC_SUBST(LIBM_LIBS)
+
 dnl output
 AM_CONDITIONAL(BUILD_GTK,test x$enable_gtk = xyes)
 
--- razertool-0.0.7/gtk/Makefile.am		2006-08-13 22:19:46.000000000 +0200
+++ razertool-0.0.7/gtk/Makefile.am.libm	2010-04-17 17:46:10.000000000 +0200
@@ -19,7 +19,7 @@
 	interface.c interface.h \
 	callbacks.c callbacks.h
 
-razertool_gtk_LDADD = $(top_builddir)/src/librazer.a @libusb_LIBS@ @GTKLIBS_LIBS@ $(INTLLIBS)
+razertool_gtk_LDADD = $(top_builddir)/src/librazer.a @libusb_LIBS@ @GTKLIBS_LIBS@ @LIBM_LIBS@ $(INTLLIBS)
 
 $(top_builddir)/src/%:
 	(cd $(top_builddir)/src && $(MAKE) $*)
--- razertool-0.0.7/gtk/Makefile.in		2007-02-15 07:55:23.000000000 +0100
+++ razertool-0.0.7/gtk/Makefile.in.libm	2010-04-17 17:51:07.000000000 +0200
@@ -195,7 +195,7 @@
 	interface.c interface.h \
 	callbacks.c callbacks.h
 
-razertool_gtk_LDADD = $(top_builddir)/src/librazer.a @libusb_LIBS@ @GTKLIBS_LIBS@ $(INTLLIBS)
+razertool_gtk_LDADD = $(top_builddir)/src/librazer.a @libusb_LIBS@ @GTKLIBS_LIBS@ -lm $(INTLLIBS)
 all: all-am
 
 .SUFFIXES:


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/razertool/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	30 Apr 2009 06:53:35 -0000	1.1
+++ import.log	18 Apr 2010 08:56:48 -0000	1.2
@@ -1 +1,2 @@
 razertool-0_0_7-5_fc10:HEAD:razertool-0.0.7-5.fc10.src.rpm:1241074339
+razertool-0_0_7-7_fc12:F-12:razertool-0.0.7-7.fc12.src.rpm:1271580950


Index: razertool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/razertool/F-12/razertool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- razertool.spec	27 Jul 2009 02:50:04 -0000	1.2
+++ razertool.spec	18 Apr 2010 08:56:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           razertool
 Version:        0.0.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tool for controlling Razer Copperhead(TM) mice
                                                                                 
 Group:          User Interface/X Hardware Support
@@ -9,6 +9,7 @@ URL:            http://razertool.sourcef
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
 Source1:        %{name}.desktop
 Source2:        15-%{name}.fdi
+Patch0:         %{name}-%{version}-libm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel 
@@ -26,6 +27,7 @@ Linux. It has both command-line and gtk+
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -61,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/hal/fdi/policy/10osvendor/15-%{name}.fdi
 
 %changelog
+* Sat Apr 17 2010 Andreas Osowski <th0br0 at mkdir.name> - 0.0.7-7
+- Fix for FTBFS 564813
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list