From 1ea3c23f48317fb5208305afbc18b295e0340ca7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mar 06 2008 14:02:14 +0000 Subject: - New upstream release 0.7.8 --- diff --git a/.cvsignore b/.cvsignore index f3ff88d..7d38145 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libebml-0.7.7.tar.bz2 +libebml-0.7.8.tar.bz2 diff --git a/libebml-0.7.7-gcc43.patch b/libebml-0.7.7-gcc43.patch deleted file mode 100644 index 5db08d3..0000000 --- a/libebml-0.7.7-gcc43.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up libebml-0.7.7/ebml/EbmlEndian.h~ libebml-0.7.7/ebml/EbmlEndian.h ---- libebml-0.7.7/ebml/EbmlEndian.h~ 2008-01-08 22:53:31.000000000 +0100 -+++ libebml-0.7.7/ebml/EbmlEndian.h 2008-01-08 22:53:31.000000000 +0100 -@@ -39,6 +39,7 @@ - #define LIBEBML_ENDIAN_H - - #include -+#include - - #include "EbmlConfig.h" // contains _ENDIANESS_ - -diff -up libebml-0.7.7/ebml/EbmlBinary.h~ libebml-0.7.7/ebml/EbmlBinary.h ---- libebml-0.7.7/ebml/EbmlBinary.h~ 2008-01-08 22:50:40.000000000 +0100 -+++ libebml-0.7.7/ebml/EbmlBinary.h 2008-01-08 22:50:40.000000000 +0100 -@@ -38,6 +38,7 @@ - #define LIBEBML_BINARY_H - - #include -+#include - - #include "EbmlTypes.h" - #include "EbmlElement.h" -diff -up libebml-0.7.7/ebml/c/libebml_t.h~ libebml-0.7.7/ebml/c/libebml_t.h ---- libebml-0.7.7/ebml/c/libebml_t.h~ 2008-01-08 22:53:02.000000000 +0100 -+++ libebml-0.7.7/ebml/c/libebml_t.h 2008-01-08 22:53:02.000000000 +0100 -@@ -123,9 +123,9 @@ typedef enum open_mode { - MODE_SAFE - } open_mode; - --#if !defined(min) -+/* #if !defined(min) - #define min(x,y) ((x)<(y) ? (x) : (y)) --#endif -+#endif */ - - #ifdef __cplusplus - } diff --git a/libebml.spec b/libebml.spec index 9348211..da49393 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,12 +1,11 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 0.7.7 -Release: 5%{?dist} +Version: 0.7.8 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 -Patch0: libebml-0.7.7-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) %description @@ -31,7 +30,9 @@ will use the Extensible Binary Meta Language library. %prep %setup -q -%patch0 -p1 +iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.tmp +touch -r ChangeLog ChangeLog.tmp +mv ChangeLog.tmp ChangeLog %build @@ -43,6 +44,7 @@ rm -rf $RPM_BUILD_ROOT make -C make/linux \ prefix=$RPM_BUILD_ROOT%{_prefix} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ + INSTALL="install -p" \ install rm $RPM_BUILD_ROOT%{_libdir}/%{name}.a # Needed for proper stripping of the library (still in 0.7.6) @@ -70,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 6 2008 Hans de Goede 0.7.8-1 +- New upstream release 0.7.8 + * Tue Feb 19 2008 Fedora Release Engineering - 0.7.7-5 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index f0c7031..e17a10a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c8456a50fd82c1c9755917d0182c49e libebml-0.7.7.tar.bz2 +6278109f52e4f9d2c8a8dfc0d668b587 libebml-0.7.8.tar.bz2