From dc9de6b820d06f003514ad7a8a10478634a427f1c13f1b56bfff38554b7b1629 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 29 Feb 2008 11:40:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libEMF?expand=0&rev=2 --- libEMF-gcc3-fix.diff => libEMF-gcc4-fix.diff | 28 ++---- libEMF.changes | 5 ++ libEMF.spec | 91 ++++++++++---------- 3 files changed, 58 insertions(+), 66 deletions(-) rename libEMF-gcc3-fix.diff => libEMF-gcc4-fix.diff (65%) diff --git a/libEMF-gcc3-fix.diff b/libEMF-gcc4-fix.diff similarity index 65% rename from libEMF-gcc3-fix.diff rename to libEMF-gcc4-fix.diff index 308d5eb..b3b209a 100644 --- a/libEMF-gcc3-fix.diff +++ b/libEMF-gcc4-fix.diff @@ -1,6 +1,5 @@ -diff -ru libEMF-1.0.orig/libemf/libemf.cpp libEMF-1.0/libemf/libemf.cpp ---- libEMF-1.0.orig/libemf/libemf.cpp 2002-01-29 04:37:54.000000000 +0100 -+++ libEMF-1.0/libemf/libemf.cpp 2002-11-20 19:03:37.000000000 +0100 +--- libemf/libemf.cpp ++++ libemf/libemf.cpp 2008/02/29 11:14:38 @@ -48,7 +48,7 @@ be32 = !be16; @@ -15,7 +14,7 @@ diff -ru libEMF-1.0.orig/libemf/libemf.cpp libEMF-1.0/libemf/libemf.cpp std::for_each( dc->records.begin(), dc->records.end(), - std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ), -+ std::bind2nd( mem_fun1( &EMF::METARECORD::serialize ), ++ std::bind2nd( std::mem_fun( &EMF::METARECORD::serialize ), dc->ds ) ); fclose( dc->fp ); @@ -24,7 +23,7 @@ diff -ru libEMF-1.0.orig/libemf/libemf.cpp libEMF-1.0/libemf/libemf.cpp std::for_each( dc->records.begin(), dc->records.end(), - std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ), -+ std::bind2nd( mem_fun1( &EMF::METARECORD::serialize ), ++ std::bind2nd( std::mem_fun( &EMF::METARECORD::serialize ), dc->ds ) ); } @@ -48,19 +47,9 @@ diff -ru libEMF-1.0.orig/libemf/libemf.cpp libEMF-1.0/libemf/libemf.cpp // Regardless, position ourselves at the next record. fseek( fp, next_position, SEEK_SET ); -@@ -1108,7 +1108,7 @@ - if ( dc == 0 ) return; - - std::for_each( dc->records.begin(), dc->records.end(), -- std::mem_fun( &EMF::METARECORD::edit ) ); -+ mem_fun( &EMF::METARECORD::edit ) ); - #endif /* ENABLE_EDITING */ - } - -diff -ru libEMF-1.0.orig/libemf/libemf.h libEMF-1.0/libemf/libemf.h ---- libEMF-1.0.orig/libemf/libemf.h 2002-01-29 05:54:27.000000000 +0100 -+++ libEMF-1.0/libemf/libemf.h 2002-11-20 19:08:00.000000000 +0100 -@@ -21,10 +21,12 @@ +--- libemf/libemf.h ++++ libemf/libemf.h 2008/02/29 11:14:38 +@@ -21,11 +21,13 @@ #ifndef _LIBEMF_H #define _LIBEMF_H 1 @@ -69,7 +58,8 @@ diff -ru libEMF-1.0.orig/libemf/libemf.h libEMF-1.0/libemf/libemf.h #include #include #include -+#include #include ++#include #include + #include diff --git a/libEMF.changes b/libEMF.changes index ba9b90a..e6529a1 100644 --- a/libEMF.changes +++ b/libEMF.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 29 12:36:26 CET 2008 - ro@suse.de + +- fix build with current gcc + ------------------------------------------------------------------- Wed Jan 25 21:37:21 CET 2006 - mls@suse.de diff --git a/libEMF.spec b/libEMF.spec index 7aeda5a..947b433 100644 --- a/libEMF.spec +++ b/libEMF.spec @@ -1,44 +1,46 @@ # # spec file for package libEMF (Version 1.0) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 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. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -Name: libEMF -BuildRequires: gcc-c++ -License: LGPL -Group: System/Libraries -Autoreqprov: on -Version: 1.0 -Release: 185 -Source0: %{name}-%{version}.tar.bz2 -Patch0: libEMF-gcc3-fix.diff -URL: http://libemf.sourceforge.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234) + +Name: libEMF +BuildRequires: gcc-c++ +License: LGPL v2.1 or later +Group: System/Libraries +AutoReqProv: on +Version: 1.0 +Release: 254 +Source0: %{name}-%{version}.tar.bz2 +Patch0: libEMF-gcc4-fix.diff +Url: http://libemf.sourceforge.net/ +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Summary: Library for Manipulation with Enhanced MetaFile (EMF, ECMA-234) + %package devel -Group: System/Libraries -Autoreqprov: on -Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234) -Requires: %name = %version +Group: System/Libraries +AutoReqProv: on +Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234) +Requires: %name = %version # add platforms with a wine port here -ExclusiveArch: axp %ix86 ppc sparc +ExclusiveArch: axp %ix86 ppc sparc %description -LibEMF is a C/C++ library which provides a drawing toolkit based on +LibEMF is a C/C++ library that provides a drawing toolkit based on ECMA-234. The general purpose of this library is to create vector -graphics files on POSIX systems which can be imported into -StarOffice/OpenOffice. The Enhanced MetaFile (EMF) is one of the two -color vector graphics format which is "vectorially" understood by -SO/OO. The EMF format also has the additional advantage that it can be -"broken" into its constituent components and edited like any other -SO/OO graphics object. +graphics files on POSIX systems that can be imported into StarOffice or +OpenOffice. The Enhanced MetaFile (EMF) is one of the two color vector +graphics format that is "vectorially" understood by SO and OO. The EMF +format also has the additional advantage that it can be "broken" into +its constituent components and edited like any other SO or OO graphics +object. @@ -46,7 +48,6 @@ Authors: -------- Allen Barnett - %description devel LibEMF is a C/C++ library which provides a drawing toolkit based on ECMA-234. The general purpose of this library is to create vector @@ -64,12 +65,16 @@ Authors: Allen Barnett %define prefix /usr + %prep %setup -%patch0 -p1 -%{?suse_update_config:%{suse_update_config}} +%patch0 +# set docdir to main-package name, will only work if only +# one subpackage has doc files +%define _docdir_fmt %{name} %build +%{?suse_update_config:%{suse_update_config}} export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" ./configure \ @@ -81,42 +86,34 @@ export CXXFLAGS="$RPM_OPT_FLAGS" make %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/%{name} -cp -R AUTHORS COPYING COPYING.LIB ChangeLog NEWS README doc/html $RPM_BUILD_ROOT/usr/share/doc/packages/%{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%dir /usr/share/doc/packages/%{name} -%doc /usr/share/doc/packages/%{name}/AUTHORS -%doc /usr/share/doc/packages/%{name}/COPYING -%doc /usr/share/doc/packages/%{name}/COPYING.LIB -%doc /usr/share/doc/packages/%{name}/ChangeLog -%doc /usr/share/doc/packages/%{name}/NEWS -%doc /usr/share/doc/packages/%{name}/README %{prefix}/bin/* %{_libdir}/*.so.* %files devel %defattr(-, root, root) +%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README +%doc doc/html %{prefix}/include/libEMF %{_libdir}/*.so %{_libdir}/*.*a -%defattr(-, root, root) -%doc /usr/share/doc/packages/%{name}/html -%changelog -n libEMF -* Wed Jan 25 2006 - mls@suse.de +%changelog +* Fri Feb 29 2008 ro@suse.de +- fix build with current gcc +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Thu Sep 29 2005 - dmueller@suse.de +* Thu Sep 29 2005 dmueller@suse.de - add norootforbuild -* Sat Aug 23 2003 - ro@suse.de +* Sat Aug 23 2003 ro@suse.de - added ExclusiveArch to specfile -* Sun Jun 15 2003 - coolo@suse.de +* Sun Jun 15 2003 coolo@suse.de - package %%_docdir -* Thu Nov 21 2002 - sbrabec@suse.cz +* Thu Nov 21 2002 sbrabec@suse.cz - New package.