new release

.gitignore

@@ -5,3 +5,4 @@
 /libcdr-0.0.9.tar.xz
 /libcdr-0.0.10.tar.xz
 /libcdr-0.0.11.tar.xz
+/libcdr-0.0.12.tar.xz

0001-Override-encodings-in-stlt.patch

@@ -1,50 +0,0 @@
-From 5bcf082f8b15d5af258b4c16dca7177b6762f2b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
-Date: Fri, 1 Mar 2013 14:05:37 +0100
-Subject: [PATCH] Override encodings in stlt
-
----
- src/lib/CDRParser.cpp | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
-index 99526c0..08dcccf 100644
---- a/src/lib/CDRParser.cpp
-+++ b/src/lib/CDRParser.cpp
-@@ -2415,7 +2415,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, unsigned length)
-     }
-     unsigned numFonts = readU32(input);
-     CDR_DEBUG_MSG(("CDRParser::readStlt numFonts 0x%x\n", numFonts));
--    std::map<unsigned,unsigned> fontIds;
-+    std::map<unsigned,unsigned short> fontIds;
-+    std::map<unsigned,unsigned short> fontEncodings;
-     std::map<unsigned,double> fontSizes;
-     for (i=0; i<numFonts; ++i)
-     {
-@@ -2424,7 +2425,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, unsigned length)
-         input->seek(12, WPX_SEEK_CUR);
-       else
-         input->seek(20, WPX_SEEK_CUR);
--      fontIds[fontStyleId] = readU32(input);
-+      fontIds[fontStyleId] = readU16(input);
-+      fontEncodings[fontStyleId] = readU16(input);
-       input->seek(8, WPX_SEEK_CUR);
-       fontSizes[fontStyleId] = readCoordinate(input);
-       if (m_version < 1000)
-@@ -2578,9 +2580,12 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, unsigned length)
-         }
-         if (!fontRecordId)
-           continue;
--        std::map<unsigned, unsigned>::const_iterator iterFontId = fontIds.find(fontRecordId);
-+        std::map<unsigned, unsigned short>::const_iterator iterFontId = fontIds.find(fontRecordId);
-         if (iterFontId != fontIds.end())
-           tmpCharStyle.m_fontId = iterFontId->second;
-+        std::map<unsigned, unsigned short>::const_iterator iterCharSet = fontEncodings.find(fontRecordId);
-+        if (iterCharSet != fontEncodings.end())
-+          tmpCharStyle.m_charSet = iterCharSet->second;
-         std::map<unsigned, double>::const_iterator iterFontSize = fontSizes.find(fontRecordId);
-         if (iterFontSize != fontSizes.end())
-           tmpCharStyle.m_fontSize = iterFontSize->second;
--- 
-1.8.1
-

libcdr.spec

@@ -1,5 +1,5 @@
 Name: libcdr
-Version: 0.0.11
+Version: 0.0.12
 Release: 1%{?dist}
 Summary: A library providing ability to interpret and import Corel Draw drawings
 
@@ -15,8 +15,6 @@ BuildRequires: libwpd-devel
 BuildRequires: libwpg-devel
 BuildRequires: zlib-devel
 
-Patch0: 0001-Override-encodings-in-stlt.patch
-
 %description
 Libcdr is library providing ability to interpret and import Corel Draw
 drawings into various applications. You can find it being used in
@@ -46,12 +44,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description tools
 Tools to transform Corel Draw drawings into other formats.
-Currently supported: XHTML, raw.
+Currently supported: XHTML, text, raw.
 
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -66,8 +63,6 @@ make %{?_smp_mflags} V=1
 %install
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}/%{_libdir}/*.la
-# these binaries do nothing currently
-rm -f %{buildroot}/%{_bindir}/cmx2*
 
 
 %post -p /sbin/ldconfig
@@ -77,7 +72,7 @@ rm -f %{buildroot}/%{_bindir}/cmx2*
 
 
 %files
-%doc AUTHORS ChangeLog COPYING.*
+%doc AUTHORS ChangeLog COPYING.* README
 %{_libdir}/%{name}-0.0.so.*
 
 
@@ -95,10 +90,17 @@ rm -f %{buildroot}/%{_bindir}/cmx2*
 
 %files tools
 %{_bindir}/cdr2raw
+%{_bindir}/cdr2text
 %{_bindir}/cdr2xhtml
+%{_bindir}/cmx2raw
+%{_bindir}/cmx2text
+%{_bindir}/cmx2xhtml
 
 
 %changelog
+* Mon Apr 08 2013 David Tardon <dtardon@redhat.com> - 0.0.12-1
+- new release
+
 * Sat Mar 02 2013 David Tardon <dtardon@redhat.com> - 0.0.11-1
 - new release
 

sources

@@ -1 +1 @@
-8e4ac49ea221be6ffac86e20770eb9bd  libcdr-0.0.11.tar.xz
+646bc10e2e78951dcc9995a5e23281b7  libcdr-0.0.12.tar.xz