Hello community,
here is the log from the commit of package libEMF
checked in at Fri Feb 29 12:40:00 CET 2008.
--------
--- libEMF/libEMF.changes 2006-01-25 21:37:21.000000000 +0100
+++ /mounts/work_users/ro/STABLE/libEMF/libEMF.changes 2008-02-29 12:36:33.965350000 +0100
@@ -1,0 +2,5 @@
+Fri Feb 29 12:36:26 CET 2008 - ro@suse.de
+
+- fix build with current gcc
+
+-------------------------------------------------------------------
Old:
----
libEMF-gcc3-fix.diff
New:
----
libEMF-gcc4-fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libEMF.spec ++++++
--- /var/tmp/diff_new_pack.J20768/_old 2008-02-29 12:36:50.000000000 +0100
+++ /var/tmp/diff_new_pack.J20768/_new 2008-02-29 12:36:50.000000000 +0100
@@ -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
+License: LGPL v2.1 or later
Group: System/Libraries
-Autoreqprov: on
+AutoReqProv: on
Version: 1.0
-Release: 185
+Release: 254
Source0: %{name}-%{version}.tar.bz2
-Patch0: libEMF-gcc3-fix.diff
-URL: http://libemf.sourceforge.net/
+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)
+Summary: Library for Manipulation with Enhanced MetaFile (EMF, ECMA-234)
+
%package devel
Group: System/Libraries
-Autoreqprov: on
+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
%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 @@
--------
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 @@
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 @@
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.
++++++ libEMF-gcc3-fix.diff -> libEMF-gcc4-fix.diff ++++++
--- libEMF/libEMF-gcc3-fix.diff 2002-11-20 19:07:16.000000000 +0100
+++ /mounts/work_users/ro/STABLE/libEMF/libEMF-gcc4-fix.diff 2008-02-29 12:14:48.949519000 +0100
@@ -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 @@
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 @@
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 @@
// 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 @@
#include <vector>
#include <map>
#include <functional>
-+#include
#include <algorithm>
++#include <climits>
#include
+ #include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org