diff --git a/README.md b/README.md index ca252da..8788656 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# libEMF +# libemf 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. diff --git a/libEMF-1.0-gcc3.patch b/libEMF-1.0-gcc3.patch deleted file mode 100644 index 5c811ae..0000000 --- a/libEMF-1.0-gcc3.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -pur libEMF-1.0/libemf/libemf.cpp libEMF-1.0-gcc3/libemf/libemf.cpp ---- libEMF-1.0/libemf/libemf.cpp 2002-01-29 04:37:54.000000000 +0100 -+++ libEMF-1.0-gcc3/libemf/libemf.cpp 2005-07-28 14:27:11.000000000 +0200 -@@ -48,7 +48,7 @@ namespace EMF { - 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 @@ extern "C" { - if ( dc->fp ) { - - std::for_each( dc->records.begin(), dc->records.end(), -- std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ), -+ std::bind2nd( mem_fun1( &EMF::METARECORD::serialize ), - dc->ds ) ); - fclose( dc->fp ); - -@@ -896,7 +896,7 @@ extern "C" { - if ( dc->fp ) { - - std::for_each( dc->records.begin(), dc->records.end(), -- std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ), -+ std::bind2nd( mem_fun1( &EMF::METARECORD::serialize ), - dc->ds ) ); - } - -@@ -1032,7 +1032,7 @@ extern "C" { - 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 @@ extern "C" { - 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 ); -@@ -1108,7 +1108,7 @@ extern "C" { - 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 -pur libEMF-1.0/libemf/libemf.h libEMF-1.0-gcc3/libemf/libemf.h ---- libEMF-1.0/libemf/libemf.h 2002-01-29 05:54:27.000000000 +0100 -+++ libEMF-1.0-gcc3/libemf/libemf.h 2005-07-28 14:27:49.000000000 +0200 -@@ -21,10 +21,12 @@ - #ifndef _LIBEMF_H - #define _LIBEMF_H 1 - -+#include - #include - #include - #include - #include -+#include - #include - - #include diff --git a/libEMF.spec b/libemf.spec similarity index 86% rename from libEMF.spec rename to libemf.spec index 64da644..0b02617 100644 --- a/libEMF.spec +++ b/libemf.spec @@ -1,21 +1,21 @@ -Name: libEMF +Name: libemf Version: 1.0.13 -Release: 1mamba +Release: 2mamba Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234) Group: System/Libraries Vendor: openmamba Distribution: openmamba -Packager: Aleph0 -URL: http://libemf.sourceforge.net +Packager: Silvan Calarco +URL: https://libemf.sourceforge.net/ Source: https://sourceforge.net/projects/libemf/files/libemf/%{version}/libemf-%{version}.tar.gz -Patch: %{name}-1.0-gcc3.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libgcc BuildRequires: libstdc++6-devel ## AUTOBUILDREQ-END -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Provides: libEMF +Obsoletes: libEMF < 1.0.13-2mamba %description LibEMF is a C/C++ library which provides a drawing toolkit based on ECMA-234. @@ -27,6 +27,8 @@ Group: Development/Libraries Summary: Static libraries and headers for %{name} Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: %{name}-tools = %{?epoch:%epoch:}%{version}-%{release} +Provides: libEMF-devel +Obsoletes: libEMF-devel < 1.0.13-2mamba %description devel LibEMF is a C/C++ library which provides a drawing toolkit based on ECMA-234. @@ -37,6 +39,8 @@ This package contains static libraries and header files needed for development. Group: Applications/Graphics Summary: Tools provided with %{name} Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Provides: libEMF-tools +Obsoletes: libEMF-tools < 1.0.13-2mamba %description tools LibEMF is a C/C++ library which provides a drawing toolkit based on ECMA-234. @@ -46,8 +50,7 @@ This package contains the tools provided with %{name}. %debug_package %prep -%setup -q -n libemf-%{version} -#%patch -p1 +%setup -q %build %configure @@ -60,9 +63,6 @@ This package contains the tools provided with %{name}. %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - %files %defattr(-,root,root) %{_libdir}/libEMF.so.* @@ -75,7 +75,6 @@ This package contains the tools provided with %{name}. %dir %{_includedir}/libEMF/wine %{_includedir}/libEMF/wine/*.h %{_libdir}/libEMF.a -%{_libdir}/libEMF.la %{_libdir}/libEMF.so %doc doc/html/* %doc ChangeLog INSTALL NEWS README @@ -86,6 +85,9 @@ This package contains the tools provided with %{name}. %doc COPYING %changelog +* Fri Dec 06 2024 Silvan Calarco 1.0.13-2mamba +- renamed from libEMF to libemf + * Sat Dec 05 2020 Silvan Calarco 1.0.13-1mamba - update to 1.0.13 - added debug package and -tools subpackage