Accepting request 122444 from multimedia:libs

- Upgrade to version 1.0.6:
  * Added support for strokeandfillpath and setmiterlimit.
  * Minor fixes.
- Build for all architectures.
- Split according to the Shared Library Packaging Policy.

OBS-URL: https://build.opensuse.org/request/show/122444
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libEMF?expand=0&rev=12
This commit is contained in:
Stephan Kulow
2012-05-29 10:18:57 +00:00
committed by Git OBS Bridge
parent b410aae02c
commit 9442fa27fa
5 changed files with 69 additions and 122 deletions

3
libEMF-1.0.6.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a6b64628f174d17102c3a0714bf9834c72a412b36d750b701f23db5cf174b74
size 911093

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:adb3064d7a2206b4e8557c989239effef5e415079f48e3242be9195488c69344
size 540829

View File

@@ -1,65 +0,0 @@
--- libemf/libemf.cpp
+++ libemf/libemf.cpp 2008/02/29 11:14:38
@@ -48,7 +48,7 @@
be32 = !be16;
if ( be32 != be16 ) {
- cerr << "endian-ness not consistent between short's and int's!" << endl;
+ std::cerr << "endian-ness not consistent between short's and int's!" << std::endl;
::abort();
}
@@ -849,7 +849,7 @@
if ( dc->fp ) {
std::for_each( dc->records.begin(), dc->records.end(),
- std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ),
+ std::bind2nd( std::mem_fun( &EMF::METARECORD::serialize ),
dc->ds ) );
fclose( dc->fp );
@@ -896,7 +896,7 @@
if ( dc->fp ) {
std::for_each( dc->records.begin(), dc->records.end(),
- std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ),
+ std::bind2nd( std::mem_fun( &EMF::METARECORD::serialize ),
dc->ds ) );
}
@@ -1032,7 +1032,7 @@
if ( feof( fp ) ) break;
if ( emr.nSize == 0 ) {
- cerr << "GetEnhMetaFileW error: record size == 0. cannot continue" << endl;
+ std::cerr << "GetEnhMetaFileW error: record size == 0. cannot continue" << std::endl;
fclose( fp );
return 0;
}
@@ -1050,8 +1050,8 @@
dc->appendRecord( record );
}
else
- cerr << "GetEnhMetaFileW warning: read unknown record type " << emr.iType
- << " of size " << emr.nSize << endl;
+ std::cerr << "GetEnhMetaFileW warning: read unknown record type " << emr.iType
+ << " of size " << emr.nSize << std::endl;
// Regardless, position ourselves at the next record.
fseek( fp, next_position, SEEK_SET );
--- libemf/libemf.h
+++ libemf/libemf.h 2008/02/29 11:14:38
@@ -21,11 +21,13 @@
#ifndef _LIBEMF_H
#define _LIBEMF_H 1
+#include <iostream>
#include <cmath>
#include <vector>
#include <map>
#include <functional>
#include <algorithm>
+#include <climits>
#include <config.h>
#include <emf.h>

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri May 25 15:31:57 CEST 2012 - sbrabec@suse.cz
- Upgrade to version 1.0.6:
* Added support for strokeandfillpath and setmiterlimit.
* Minor fixes.
- Build for all architectures.
- Split according to the Shared Library Packaging Policy.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 4 04:29:11 CET 2009 - crrodriguez@suse.de Wed Mar 4 04:29:11 CET 2009 - crrodriguez@suse.de

View File

@@ -1,7 +1,7 @@
# #
# spec file for package libEMF (Version 1.0) # spec file for package libEMF
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -15,30 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: libEMF Name: libEMF
BuildRequires: gcc-c++ BuildRequires: gcc-c++
License: LGPL-2.1+ Version: 1.0.6
Group: System/Libraries Release: 0
AutoReqProv: on Source: %{name}-%{version}.tar.gz
Version: 1.0
Release: 295
Source0: %{name}-%{version}.tar.bz2
Patch0: libEMF-gcc4-fix.diff
Url: http://libemf.sourceforge.net/ Url: http://libemf.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build 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)
# add platforms with a wine port here License: LGPL-2.1+ ; GPL-2.0+
ExclusiveArch: axp %ix86 ppc sparc
%package devel
License: LGPL-2.1+
Group: System/Libraries Group: System/Libraries
AutoReqProv: on
Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234)
Requires: %name = %version glibc-devel
%description %description
LibEMF is a C/C++ library that provides a drawing toolkit based on LibEMF is a C/C++ library that provides a drawing toolkit based on
@@ -50,11 +37,44 @@ format also has the additional advantage that it can be "broken" into
its constituent components and edited like any other SO or OO graphics its constituent components and edited like any other SO or OO graphics
object. object.
%package -n libEMF1
Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234)
License: LGPL-2.1+
Group: System/Libraries
%description -n libEMF1
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
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.
Authors: %package utils
-------- Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234)
Allen Barnett <libemf@lignumcomputing.com> License: GPL-2.0+
Group: Productivity/Graphics/Other
# split-provides for upgrade from openSUSE <= 12.1 and SLE <= 11
Provides: %{name}:%{_bindir}/printemf
%description utils
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
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.
%package devel
Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234)
License: LGPL-2.1+ ; GPL-2.0+
Group: Development/Libraries/C and C++
Requires: glibc-devel
Requires: libEMF1 = %{version}
%description devel %description devel
LibEMF is a C/C++ library which provides a drawing toolkit based on LibEMF is a C/C++ library which provides a drawing toolkit based on
@@ -66,56 +86,39 @@ SO/OO. The EMF format also has the additional advantage that it can be
"broken" into its constituent components and edited like any other "broken" into its constituent components and edited like any other
SO/OO graphics object. SO/OO graphics object.
Authors:
--------
Allen Barnett <libemf@lignumcomputing.com>
%prep %prep
%setup -q %setup -q
%patch0
# set docdir to main-package name, will only work if only
# one subpackage has doc files
%define _docdir_fmt %{name}
%build %build
%configure --disable-static --with-pic %configure\
--disable-static
%{__make} %{?jobs:-j%jobs} %{__make} %{?jobs:-j%jobs}
%install %install
make DESTDIR=$RPM_BUILD_ROOT install %makeinstall
%{__rm} -f %{buildroot}%{_libdir}/*.la %{__rm} %{buildroot}%{_libdir}/*.la
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %post -n libEMF1 -p /sbin/ldconfig
%postun -n libEMF1 -p /sbin/ldconfig
%files -n libEMF1
%defattr(-, root, root) %defattr(-, root, root)
%{_bindir}/* %doc COPYING.LIB
%{_libdir}/*.so.* %{_libdir}/*.so.*
%files utils
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/*
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
%doc doc/html %doc doc/html
%{_includedir}/libEMF %{_includedir}/libEMF
%{_libdir}/*.so %{_libdir}/*.so
%changelog %changelog
* Wed Mar 04 2009 crrodriguez@suse.de
- remove static libraries and "la" files
* Wed Aug 13 2008 ro@suse.de
- move ExclusiveArch to main package
* 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
- add norootforbuild
* Sat Aug 23 2003 ro@suse.de
- added ExclusiveArch to specfile
* Sun Jun 15 2003 coolo@suse.de
- package %%_docdir
* Thu Nov 21 2002 sbrabec@suse.cz
- New package.