From ffe7c67d71245083413c186592d2355fe2900e29da9a72792f7dc1333e8299c8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 15 Apr 2009 22:54:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/liblrdf?expand=0&rev=7 --- liblrdf-symbol-conflict.diff | 18 +++++++++++++ liblrdf.changes | 5 ++++ liblrdf.spec | 50 +++++++++++++++++++++++------------- 3 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 liblrdf-symbol-conflict.diff diff --git a/liblrdf-symbol-conflict.diff b/liblrdf-symbol-conflict.diff new file mode 100644 index 0000000..cc4c154 --- /dev/null +++ b/liblrdf-symbol-conflict.diff @@ -0,0 +1,18 @@ +--- old/liblrdf-0.4.0/src/lrdf_md5.h 2004-11-09 04:12:32.000000000 +0100 ++++ liblrdf-0.4.0/src/lrdf_md5.h 2009-04-04 11:55:43.000000000 +0200 +@@ -32,6 +32,15 @@ + #ifndef __MD5_H__ + #define __MD5_H__ + ++/* Change function names to prevent symbol conflicts */ ++#define md5_init _lrdf_md5_init ++#define md5_buffer _lrdf_md5_buffer ++#define md5_sig_from_string _lrdf_md5_sig_from_string ++#define md5_finish _lrdf_md5_finish ++#define md5_process _lrdf_md5_process ++#define md5_sig_to_string _lrdf_md5_sig_to_string ++#define md5_get_result _lrdf_md5_get_result ++ + /* + * Size of a standard MD5 signature in bytes. This definition is for + * external programs only. The MD5 routines themselves reference the diff --git a/liblrdf.changes b/liblrdf.changes index ae7205d..7bfe020 100644 --- a/liblrdf.changes +++ b/liblrdf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 15 18:01:01 CEST 2009 - tiwai@suse.de + +- fix conflict of symbols (bnc#492257) + ------------------------------------------------------------------- Wed Dec 19 23:20:09 CET 2007 - crrodriguez@suse.de diff --git a/liblrdf.spec b/liblrdf.spec index 65c25f7..7574ad4 100644 --- a/liblrdf.spec +++ b/liblrdf.spec @@ -1,23 +1,32 @@ # # spec file for package liblrdf (Version 0.4.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: liblrdf BuildRequires: ladspa-devel libraptor-devel libxml2-devel pkgconfig Summary: A library to Manipulate RDF Files for LADSPA Plug-Ins Version: 0.4.0 -Release: 121 +Release: 123 License: GPL v2 or later Group: System/Libraries Source: %{name}-%{version}.tar.bz2 +Patch: liblrdf-symbol-conflict.diff Url: http://liblrdf.sf.net BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,6 +44,7 @@ Authors: Steve Harris %package -n liblrdf2 +License: GPL v2 or later Group: System/Libraries Summary: A library to Manipulate RDF Files for LADSPA Plug-Ins Provides: %{name} = %{version} @@ -54,6 +64,7 @@ Authors: Steve Harris %package devel +License: GPL v2 or later Summary: Development package for the liblrdf library Group: Development/Libraries/C and C++ Requires: liblrdf2 = %{version} libraptor-devel @@ -70,6 +81,7 @@ Authors: %prep %setup -q +%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -102,32 +114,34 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/lib*.la %changelog -* Wed Dec 19 2007 - crrodriguez@suse.de +* Wed Apr 15 2009 tiwai@suse.de +- fix conflict of symbols (bnc#492257) +* Thu Dec 20 2007 crrodriguez@suse.de - use library packaging policy -* Wed Dec 19 2007 - crrodriguez@suse.de +* Thu Dec 20 2007 crrodriguez@suse.de - remove static libraries and "la" files - fix -devel pakcage dependencies (missing libraptor-devel) -* Thu May 03 2007 - wstephenson@suse.de +* Thu May 03 2007 wstephenson@suse.de - libraptor1-devel -> libraptor-devel -* Thu May 03 2007 - lrupp@suse.de +* Thu May 03 2007 lrupp@suse.de - require libraptor1-devel -* Tue Apr 17 2007 - tiwai@suse.de +* Tue Apr 17 2007 tiwai@suse.de - fix buildrequires ladspa -> ladspa-devel -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Jan 24 2005 - tiwai@suse.de +* Mon Jan 24 2005 tiwai@suse.de - updated to version 0.4.0. -* Thu Aug 05 2004 - tiwai@suse.de +* Thu Aug 05 2004 tiwai@suse.de - updated to version 0.3.7. -* Fri Feb 27 2004 - tiwai@suse.de +* Fri Feb 27 2004 tiwai@suse.de - removed the binareis from examples directory for installation. -* Thu Feb 26 2004 - tiwai@suse.de +* Thu Feb 26 2004 tiwai@suse.de - updated to version 0.3.5. -* Tue Jan 13 2004 - tiwai@suse.de +* Tue Jan 13 2004 tiwai@suse.de - build as non-root. -* Fri Jan 09 2004 - tiwai@suse.de +* Fri Jan 09 2004 tiwai@suse.de - updated to version 0.3.2. -* Fri Jun 06 2003 - tiwai@suse.de +* Fri Jun 06 2003 tiwai@suse.de - updated to version 0.3.1. -* Wed Apr 02 2003 - tiwai@suse.de +* Wed Apr 02 2003 tiwai@suse.de - initial version: 0.2.4.