From a1c1ab09e988213e78b7de185dfd36a449d00d72 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:42:10 +0000 Subject: [PATCH 01/76] Setup of module libebml --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..63126e1 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: libebml +# $Id$ +NAME := libebml +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 387a567127b168b4dd239d995dea5704fff2df4a Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:42:12 +0000 Subject: [PATCH 02/76] auto-import changelog data from libebml-0.6.5-0.fdr.1.rh80.src.rpm 0.6.5-0.fdr.1 - Updated to 0.6.5 0.6.4-0.fdr.2 - Added licenses file as doc Thu Sep 04 2003 Dams - Initial build. --- .cvsignore | 1 + libebml.spec | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 65 insertions(+) create mode 100644 libebml.spec diff --git a/.cvsignore b/.cvsignore index e69de29..29641de 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libebml-0.6.5.tar.gz diff --git a/libebml.spec b/libebml.spec new file mode 100644 index 0000000..146c45f --- /dev/null +++ b/libebml.spec @@ -0,0 +1,63 @@ +Summary: The Extensible Binary Meta Language library +Name: libebml +Version: 0.6.5 +Release: 0.fdr.1.rh80 +Epoch: 0 +License: GPL/QPL +Group: Development/Libraries +URL: http://ebml.sourceforge.net/ +# http://dl.matroska.org/downloads/libebml/libebml-0.6.4.tar.gz +Source0: %{name}-%{version}.tar.gz +Provides: %{name}-devel = %{epoch}:%{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) + +# ----------------------------------------------------------------------------- + +%description +Extensible Binary Meta Language access library A library for reading +and writing files with the Extensible Binary Meta Language, a binary +pendant to XML. + +# ----------------------------------------------------------------------------- + +%prep +%setup -q + +# ----------------------------------------------------------------------------- + +%build +make -C make/linux %{?_smp_mflags} prefix=%{_prefix} + +# ----------------------------------------------------------------------------- + +%install +rm -rf $RPM_BUILD_ROOT +make install -C make/linux prefix=$RPM_BUILD_ROOT%{_prefix} + +# ----------------------------------------------------------------------------- + +%clean +rm -rf $RPM_BUILD_ROOT + + +# ----------------------------------------------------------------------------- + +%files +%defattr(-,root,root,-) +%doc LICENSE.QPL LICENSE.GPL +%{_includedir}/ebml +%{_libdir}/libebml.a + +# ----------------------------------------------------------------------------- + +%changelog +* Sun Apr 4 2004 Dams 0:0.6.5-0.fdr.1 +- Updated to 0.6.5 + +* Sun Feb 29 2004 Dams 0:0.6.4-0.fdr.2 +- Added licenses file as doc + +* Thu Sep 4 2003 Dams +- Initial build. + + diff --git a/sources b/sources index e69de29..75718ae 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +417d2597e4310458a74e6db32fb13632 libebml-0.6.5.tar.gz From 7283c5ccf9965b01514ccd31cfa14eec4369ba62 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:42:18 +0000 Subject: [PATCH 03/76] auto-import changelog data from libebml-0.7.0-0.fdr.1.rh90.src.rpm 0.7.0-0.fdr.1 - Update to 0.7.0. - Improved 64-bit arch build fix. 0.6.5-0.fdr.2 - Change linux makefile to use lib64 ifarch x86_64 for sane build --- .cvsignore | 2 +- libebml.spec | 24 ++++++++++++++++-------- sources | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 29641de..6576782 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libebml-0.6.5.tar.gz +libebml-0.7.0.tar.bz2 diff --git a/libebml.spec b/libebml.spec index 146c45f..82b4422 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,13 +1,12 @@ Summary: The Extensible Binary Meta Language library Name: libebml -Version: 0.6.5 -Release: 0.fdr.1.rh80 +Version: 0.7.0 +Release: 0.fdr.1.rh90 Epoch: 0 -License: GPL/QPL +License: LGPL Group: Development/Libraries URL: http://ebml.sourceforge.net/ -# http://dl.matroska.org/downloads/libebml/libebml-0.6.4.tar.gz -Source0: %{name}-%{version}.tar.gz +Source0: http://dl.matroska.org/downloads/libebml/libebml-0.7.0.tar.bz2 Provides: %{name}-devel = %{epoch}:%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) @@ -22,17 +21,19 @@ pendant to XML. %prep %setup -q +chmod -x ChangeLog # ----------------------------------------------------------------------------- %build -make -C make/linux %{?_smp_mflags} prefix=%{_prefix} +make -C make/linux %{?_smp_mflags} # ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT -make install -C make/linux prefix=$RPM_BUILD_ROOT%{_prefix} +make -C make/linux \ + prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install # ----------------------------------------------------------------------------- @@ -44,13 +45,20 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc LICENSE.QPL LICENSE.GPL +%doc ChangeLog LICENSE.LGPL %{_includedir}/ebml %{_libdir}/libebml.a # ----------------------------------------------------------------------------- %changelog +* Mon Jul 12 2004 Ville Skyttä - 0:0.7.0-0.fdr.1 +- Update to 0.7.0. +- Improved 64-bit arch build fix. + +* Wed May 19 2004 Justin M. Forbes <64bit_fedora@comcast.net> 0:0.6.5-0.fdr.2 +- Change linux makefile to use lib64 ifarch x86_64 for sane build + * Sun Apr 4 2004 Dams 0:0.6.5-0.fdr.1 - Updated to 0.6.5 diff --git a/sources b/sources index 75718ae..fbde2f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -417d2597e4310458a74e6db32fb13632 libebml-0.6.5.tar.gz +c6a440f1f3fa4a49243437cc03a70658 libebml-0.7.0.tar.bz2 From 6779f5164642ffe27d83d28889f8b51a2a0759e9 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:42:24 +0000 Subject: [PATCH 04/76] auto-import changelog data from libebml-0.7.1-0.fdr.1.1.src.rpm 0.7.1-0.fdr.1 - Update to 0.7.1. - Honor $RPM_OPT_FLAGS. --- .cvsignore | 2 +- libebml.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6576782..6d909cd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libebml-0.7.0.tar.bz2 +libebml-0.7.1.tar.bz2 diff --git a/libebml.spec b/libebml.spec index 82b4422..78f1a8b 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,12 +1,12 @@ Summary: The Extensible Binary Meta Language library Name: libebml -Version: 0.7.0 -Release: 0.fdr.1.rh90 +Version: 0.7.1 +Release: 0.fdr.1.1 Epoch: 0 License: LGPL Group: Development/Libraries URL: http://ebml.sourceforge.net/ -Source0: http://dl.matroska.org/downloads/libebml/libebml-0.7.0.tar.bz2 +Source0: http://dl.matroska.org/downloads/libebml/libebml-0.7.1.tar.bz2 Provides: %{name}-devel = %{epoch}:%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) @@ -21,12 +21,11 @@ pendant to XML. %prep %setup -q -chmod -x ChangeLog # ----------------------------------------------------------------------------- %build -make -C make/linux %{?_smp_mflags} +CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} # ----------------------------------------------------------------------------- @@ -52,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Sun Aug 29 2004 Ville Skyttä - 0:0.7.1-0.fdr.1 +- Update to 0.7.1. +- Honor $RPM_OPT_FLAGS. + * Mon Jul 12 2004 Ville Skyttä - 0:0.7.0-0.fdr.1 - Update to 0.7.0. - Improved 64-bit arch build fix. diff --git a/sources b/sources index fbde2f8..613577d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6a440f1f3fa4a49243437cc03a70658 libebml-0.7.0.tar.bz2 +9f777f392d4b50c28151f0bd4e23733e libebml-0.7.1.tar.bz2 From e34fbd64c6c465f6c1c7e9b93fce6c587c95a926 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:42:30 +0000 Subject: [PATCH 05/76] auto-import libebml-0.7.1-0.fdr.1.2 from libebml-0.7.1-0.fdr.1.2.src.rpm --- libebml.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 78f1a8b..db4c6f9 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: The Extensible Binary Meta Language library Name: libebml Version: 0.7.1 -Release: 0.fdr.1.1 +Release: 0.fdr.1.2 Epoch: 0 License: LGPL Group: Development/Libraries From 0c82191e265f34484005d7b19265a6b40a62464b Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 11 Nov 2004 19:21:36 +0000 Subject: [PATCH 06/76] Release bumping to provide upgrade path from non-fedora.us packages. A few minor tweaks here and there. --- libebml.spec | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/libebml.spec b/libebml.spec index db4c6f9..941861e 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,56 +1,51 @@ Summary: The Extensible Binary Meta Language library Name: libebml -Version: 0.7.1 -Release: 0.fdr.1.2 -Epoch: 0 +Version: 0.7.2 +Release: 2 License: LGPL Group: Development/Libraries URL: http://ebml.sourceforge.net/ -Source0: http://dl.matroska.org/downloads/libebml/libebml-0.7.1.tar.bz2 -Provides: %{name}-devel = %{epoch}:%{version}-%{release} +Source: http://dl.matroska.org/downloads/libebml/libebml-%{version}.tar.bz2 +Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -# ----------------------------------------------------------------------------- - %description Extensible Binary Meta Language access library A library for reading and writing files with the Extensible Binary Meta Language, a binary pendant to XML. -# ----------------------------------------------------------------------------- %prep %setup -q -# ----------------------------------------------------------------------------- %build CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} -# ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT make -C make/linux \ prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install -# ----------------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT -# ----------------------------------------------------------------------------- %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc ChangeLog LICENSE.LGPL %{_includedir}/ebml %{_libdir}/libebml.a -# ----------------------------------------------------------------------------- %changelog +* Wed Nov 10 2004 Matthias Saou 0.7.2-2 +- Update to 0.7.2. +- Bump release to provide Extras upgrade path. + * Sun Aug 29 2004 Ville Skyttä - 0:0.7.1-0.fdr.1 - Update to 0.7.1. - Honor $RPM_OPT_FLAGS. From e080e4cdc65eb0bd2dc8469cea28e423b573eaf4 Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 04:22:21 +0000 Subject: [PATCH 07/76] Fix braindead typo from the original import --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 63126e1..c6ee024 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) From 30430a16b6960f4cfcb2a94153ad5f1db560745d Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Thu, 25 Nov 2004 21:17:17 +0000 Subject: [PATCH 08/76] Merge fedora.us update changes from Ville, libebml-0.7.2-0.fdr.1.2.src.rpm --- libebml.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libebml.spec b/libebml.spec index 941861e..f63915e 100644 --- a/libebml.spec +++ b/libebml.spec @@ -35,7 +35,7 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc ChangeLog LICENSE.LGPL %{_includedir}/ebml %{_libdir}/libebml.a diff --git a/sources b/sources index 613577d..c4d3273 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f777f392d4b50c28151f0bd4e23733e libebml-0.7.1.tar.bz2 +d3196c1b89772bcabfffe5717bda33bc libebml-0.7.2.tar.bz2 From 2440392e16f9d260892736e7b73e1165f28a1e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Feb 2005 18:28:52 +0000 Subject: [PATCH 09/76] 0.7.3 --- .cvsignore | 2 +- libebml.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6d909cd..08a3f8b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libebml-0.7.1.tar.bz2 +libebml-0.7.3.tar.bz2 diff --git a/libebml.spec b/libebml.spec index f63915e..0d96815 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,6 +1,6 @@ Summary: The Extensible Binary Meta Language library Name: libebml -Version: 0.7.2 +Version: 0.7.3 Release: 2 License: LGPL Group: Development/Libraries @@ -33,7 +33,6 @@ make -C make/linux \ rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc ChangeLog LICENSE.LGPL @@ -42,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 27 2005 Ville Skyttä - 0.7.3-2 +- 0.7.3. + * Wed Nov 10 2004 Matthias Saou 0.7.2-2 - Update to 0.7.2. - Bump release to provide Extras upgrade path. diff --git a/sources b/sources index c4d3273..672d8f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3196c1b89772bcabfffe5717bda33bc libebml-0.7.2.tar.bz2 +5d9fee0755cef7d7e88ee7065f3e728f libebml-0.7.3.tar.bz2 From 33a3ec2bc533f866ebdbf710ff583b301820ccdb Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sat, 5 Mar 2005 21:10:22 +0000 Subject: [PATCH 10/76] Further mass cleanup. One or more apply : - Remove (hopefully) all zero epoch remains. - Remove trailing spaces and tabs. - Keep consistency between tabs and spaces. - Clean up summary. --- libebml.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 0d96815..6e9045d 100644 --- a/libebml.spec +++ b/libebml.spec @@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT * Sun Feb 29 2004 Dams 0:0.6.4-0.fdr.2 - Added licenses file as doc -* Thu Sep 4 2003 Dams +* Thu Sep 4 2003 Dams - Initial build. From af9acbe1db68238a3ff117beb7ec541a03095c4a Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Sun, 22 May 2005 22:56:53 +0000 Subject: [PATCH 11/76] - rebuild on all arches --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 6e9045d..3e74239 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: The Extensible Binary Meta Language library Name: libebml Version: 0.7.3 -Release: 2 +Release: 3 License: LGPL Group: Development/Libraries URL: http://ebml.sourceforge.net/ @@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 22 2005 Jeremy Katz - 0.7.3-3 +- rebuild on all arches + * Sun Feb 27 2005 Ville Skyttä - 0.7.3-2 - 0.7.3. From fb54417cab28c7413f18a8a8f862d5827e6bc791 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 25 May 2005 20:42:35 +0000 Subject: [PATCH 12/76] - update to 0.7.5 (fixes x86_64 build) - incldue shared libs --- .cvsignore | 2 +- libebml.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 08a3f8b..4d1f1d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libebml-0.7.3.tar.bz2 +libebml-0.7.5.tar.bz2 diff --git a/libebml.spec b/libebml.spec index 3e74239..379f5b6 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: The Extensible Binary Meta Language library Name: libebml -Version: 0.7.3 -Release: 3 +Version: 0.7.5 +Release: 1 License: LGPL Group: Development/Libraries URL: http://ebml.sourceforge.net/ @@ -38,9 +38,14 @@ rm -rf $RPM_BUILD_ROOT %doc ChangeLog LICENSE.LGPL %{_includedir}/ebml %{_libdir}/libebml.a +%{_libdir}/libebml.so* %changelog +* Wed May 25 2005 Jeremy Katz - 0.7.5-1 +- update to 0.7.5 (fixes x86_64 build) +- incldue shared libs + * Sun May 22 2005 Jeremy Katz - 0.7.3-3 - rebuild on all arches diff --git a/sources b/sources index 672d8f1..80dbcbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d9fee0755cef7d7e88ee7065f3e728f libebml-0.7.3.tar.bz2 +6db55f4198a77779c983ee6c244fcf6a libebml-0.7.5.tar.bz2 From 0e980924e9d2edcc50037b7554df05128f7c7fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 5 Jun 2005 08:34:26 +0000 Subject: [PATCH 13/76] Split -devel, run ldconfig, fix *.so modes. --- libebml.spec | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/libebml.spec b/libebml.spec index 379f5b6..f0cb6ee 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,12 +1,11 @@ Summary: The Extensible Binary Meta Language library Name: libebml Version: 0.7.5 -Release: 1 +Release: 2 License: LGPL -Group: Development/Libraries +Group: System Environment/Libraries URL: http://ebml.sourceforge.net/ Source: http://dl.matroska.org/downloads/libebml/libebml-%{version}.tar.bz2 -Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) %description @@ -14,6 +13,14 @@ Extensible Binary Meta Language access library A library for reading and writing files with the Extensible Binary Meta Language, a binary pendant to XML. +%package devel +Summary: Development files for libebml +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +%{summary}. + %prep %setup -q @@ -27,21 +34,35 @@ CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make -C make/linux \ prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install +chmod +x $RPM_BUILD_ROOT%{_libdir}/libebml.so* %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + + %files %defattr(-,root,root,-) %doc ChangeLog LICENSE.LGPL -%{_includedir}/ebml +%{_libdir}/libebml.so.* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/ebml/ %{_libdir}/libebml.a -%{_libdir}/libebml.so* +%{_libdir}/libebml.so %changelog +* Sun Jun 5 2005 Ville Skyttä - 0.7.5-2 +- Split development files into a devel subpackage. +- Run ldconfig at post (un)install time. +- Fix shared library file modes. + * Wed May 25 2005 Jeremy Katz - 0.7.5-1 - update to 0.7.5 (fixes x86_64 build) - incldue shared libs From 202831494d4a9cd63b3d11224b31ba63450e4a2c Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 29 Nov 2005 09:46:41 +0000 Subject: [PATCH 14/76] Update to 0.7.6. --- .cvsignore | 2 +- libebml.spec | 35 +++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4d1f1d8..88d0507 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libebml-0.7.5.tar.bz2 +libebml-0.7.6.tar.bz2 diff --git a/libebml.spec b/libebml.spec index f0cb6ee..7e0b6fe 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,10 +1,10 @@ -Summary: The Extensible Binary Meta Language library +Summary: Extensible Binary Meta Language library Name: libebml -Version: 0.7.5 -Release: 2 +Version: 0.7.6 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries -URL: http://ebml.sourceforge.net/ +URL: http://www.matroska.org/ Source: http://dl.matroska.org/downloads/libebml/libebml-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) @@ -13,13 +13,19 @@ Extensible Binary Meta Language access library A library for reading and writing files with the Extensible Binary Meta Language, a binary pendant to XML. + %package devel -Summary: Development files for libebml +Summary: Development files for the Extensible Binary Meta Language library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -%{summary}. +Extensible Binary Meta Language access library A library for reading +and writing files with the Extensible Binary Meta Language, a binary +pendant to XML. + +This package contains the files required to rebuild applications which +will use the Extensible Binary Meta Language library. %prep @@ -33,8 +39,11 @@ CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make -C make/linux \ - prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install -chmod +x $RPM_BUILD_ROOT%{_libdir}/libebml.so* + prefix=$RPM_BUILD_ROOT%{_prefix} \ + libdir=$RPM_BUILD_ROOT%{_libdir} \ + install +# Needed for proper stripping of the library (still in 0.7.6) +chmod +x $RPM_BUILD_ROOT%{_libdir}/libebml.so.* %clean @@ -46,18 +55,24 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc ChangeLog LICENSE.LGPL %{_libdir}/libebml.so.* %files devel -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %{_includedir}/ebml/ %{_libdir}/libebml.a %{_libdir}/libebml.so %changelog +* Tue Nov 29 2005 Matthias Saou 0.7.6-1 +- Update to 0.7.6. +- Change URL to the project's one. +- Add a full description for the devel package. +- Some other minor spec file changes. + * Sun Jun 5 2005 Ville Skyttä - 0.7.5-2 - Split development files into a devel subpackage. - Run ldconfig at post (un)install time. diff --git a/sources b/sources index 80dbcbf..5d857ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6db55f4198a77779c983ee6c244fcf6a libebml-0.7.5.tar.bz2 +bb054799dfdf6bfa5dd2cf95416ff021 libebml-0.7.6.tar.bz2 From 89cd8d590955a0d9be574a717c91b8146a81d901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dams=20Nad=C3=A9?= Date: Thu, 16 Mar 2006 18:38:40 +0000 Subject: [PATCH 15/76] libebml: release bump --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 7e0b6fe..c2e91a1 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 0.7.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 16 2006 Dams - 0.7.6-2.fc5 +- Release bump + * Tue Nov 29 2005 Matthias Saou 0.7.6-1 - Update to 0.7.6. - Change URL to the project's one. From 3e7ffa39671dc8faa97d3e9af16a9061d7dd30af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dams=20Nad=C3=A9?= Date: Wed, 12 Apr 2006 14:34:42 +0000 Subject: [PATCH 16/76] libebml/devel: updated to 0.7.7 --- .cvsignore | 2 +- libebml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 88d0507..f3ff88d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libebml-0.7.6.tar.bz2 +libebml-0.7.7.tar.bz2 diff --git a/libebml.spec b/libebml.spec index c2e91a1..8e52ecb 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 0.7.6 -Release: 2%{?dist} +Version: 0.7.7 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 12 2006 Dams - 0.7.7-1 +- Updated to 0.7.7 + * Thu Mar 16 2006 Dams - 0.7.6-2.fc5 - Release bump diff --git a/sources b/sources index 5d857ed..f0c7031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb054799dfdf6bfa5dd2cf95416ff021 libebml-0.7.6.tar.bz2 +7c8456a50fd82c1c9755917d0182c49e libebml-0.7.7.tar.bz2 From 270ea0e2e8409d68dbf85774c8d0d8af25746083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:35:21 +0000 Subject: [PATCH 17/76] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From f25133f1ce3a3f3a4082a3a0c46894f2ab8a1da9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 28 Aug 2006 11:46:11 +0000 Subject: [PATCH 18/76] - Taking over as maintainer since Anvil has other priorities - Drop static lib from -devel package - FE6 Rebuild --- libebml.spec | 18 ++++++++++++------ needs.rebuild | 1 - 2 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 needs.rebuild diff --git a/libebml.spec b/libebml.spec index 8e52ecb..595b475 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,11 +1,11 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 0.7.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ -Source: http://dl.matroska.org/downloads/libebml/libebml-%{version}.tar.bz2 +Source: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) %description @@ -42,8 +42,9 @@ make -C make/linux \ prefix=$RPM_BUILD_ROOT%{_prefix} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ install +rm $RPM_BUILD_ROOT%{_libdir}/%{name}.a # Needed for proper stripping of the library (still in 0.7.6) -chmod +x $RPM_BUILD_ROOT%{_libdir}/libebml.so.* +chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %clean @@ -51,22 +52,27 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %files %defattr(-,root,root,0755) %doc ChangeLog LICENSE.LGPL -%{_libdir}/libebml.so.* +%{_libdir}/%{name}.so.* %files devel %defattr(-,root,root,0755) %{_includedir}/ebml/ -%{_libdir}/libebml.a -%{_libdir}/libebml.so +%{_libdir}/%{name}.so %changelog +* Mon Aug 28 2006 Hans de Goede 0.7.7-2 +- Taking over as maintainer since Anvil has other priorities +- Drop static lib from -devel package +- FE6 Rebuild + * Wed Apr 12 2006 Dams - 0.7.7-1 - Updated to 0.7.7 diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From f51b199f68a00547bebdd41655cd9a207bda5208 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 13 Aug 2007 17:01:45 +0000 Subject: [PATCH 19/76] - Update License tag for new Licensing Guidelines compliance --- libebml.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libebml.spec b/libebml.spec index 595b475..d20c643 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,8 +1,8 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 0.7.7 -Release: 2%{?dist} -License: LGPL +Release: 3%{?dist} +License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 13 2007 Hans de Goede 0.7.7-3 +- Update License tag for new Licensing Guidelines compliance + * Mon Aug 28 2006 Hans de Goede 0.7.7-2 - Taking over as maintainer since Anvil has other priorities - Drop static lib from -devel package From 69474b16035697f5ae7b4c1d1cc983cd2a2b8924 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 8 Jan 2008 21:55:05 +0000 Subject: [PATCH 20/76] - Fix building with gcc 4.3 --- libebml-0.7.7-gcc43.patch | 37 +++++++++++++++++++++++++++++++++++++ libebml.spec | 7 ++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 libebml-0.7.7-gcc43.patch diff --git a/libebml-0.7.7-gcc43.patch b/libebml-0.7.7-gcc43.patch new file mode 100644 index 0000000..5db08d3 --- /dev/null +++ b/libebml-0.7.7-gcc43.patch @@ -0,0 +1,37 @@ +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 d20c643..7fce920 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,11 +1,12 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 0.7.7 -Release: 3%{?dist} +Release: 4%{?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 @@ -30,6 +31,7 @@ will use the Extensible Binary Meta Language library. %prep %setup -q +%patch0 -p1 %build @@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 8 2008 Hans de Goede 0.7.7-4 +- Fix building with gcc 4.3 + * Mon Aug 13 2007 Hans de Goede 0.7.7-3 - Update License tag for new Licensing Guidelines compliance From c5cbcb0967efa367f878bbe1c6cc144a4d91c9d8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 09:00:24 +0000 Subject: [PATCH 21/76] - Autorebuild for GCC 4.3 --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 7fce920..9348211 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 0.7.7 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.7.7-5 +- Autorebuild for GCC 4.3 + * Tue Jan 8 2008 Hans de Goede 0.7.7-4 - Fix building with gcc 4.3 From 1ea3c23f48317fb5208305afbc18b295e0340ca7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 6 Mar 2008 14:02:14 +0000 Subject: [PATCH 22/76] - New upstream release 0.7.8 --- .cvsignore | 2 +- libebml-0.7.7-gcc43.patch | 37 ------------------------------------- libebml.spec | 13 +++++++++---- sources | 2 +- 4 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 libebml-0.7.7-gcc43.patch 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 From 08a541db09d471d1c66bf78193962fb060ebe847 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 14:29:34 +0000 Subject: [PATCH 23/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index da49393..5f7b286 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 0.7.8 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.7.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Mar 6 2008 Hans de Goede 0.7.8-1 - New upstream release 0.7.8 From 001288ac8972ebc62320163fa212bab951a17dce Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 05:33:22 +0000 Subject: [PATCH 24/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 5f7b286..90b49cb 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 0.7.8 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.7.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.7.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 3a7285dd4f002b4c5cade49130c2965c41f9db52 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:50:54 +0000 Subject: [PATCH 25/76] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c6ee024..3251c09 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libebml SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 8f4f3aef0cae3dec6c7a5454fec04344910da254 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 25 May 2010 09:41:39 +0000 Subject: [PATCH 26/76] - New upstream release 0.8.0 (#595421) --- .cvsignore | 2 +- libebml.spec | 32 ++++++++++++++++++-------------- sources | 2 +- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7d38145..011c8ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libebml-0.7.8.tar.bz2 +libebml-0.8.0.tar.bz2 diff --git a/libebml.spec b/libebml.spec index 90b49cb..b4a7c83 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,12 +1,12 @@ -Summary: Extensible Binary Meta Language library -Name: libebml -Version: 0.7.8 -Release: 3%{?dist} -License: LGPLv2+ -Group: System Environment/Libraries -URL: http://www.matroska.org/ -Source: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) +Summary: Extensible Binary Meta Language library +Name: libebml +Version: 0.8.0 +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) %description Extensible Binary Meta Language access library A library for reading @@ -14,12 +14,12 @@ and writing files with the Extensible Binary Meta Language, a binary pendant to XML. -%package devel -Summary: Development files for the Extensible Binary Meta Language library -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +%package devel +Summary: Development files for the Extensible Binary Meta Language library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} -%description devel +%description devel Extensible Binary Meta Language access library A library for reading and writing files with the Extensible Binary Meta Language, a binary pendant to XML. @@ -30,6 +30,7 @@ will use the Extensible Binary Meta Language library. %prep %setup -q +sed -i 's/\r//' ChangeLog LICENSE.LGPL iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.tmp touch -r ChangeLog ChangeLog.tmp mv ChangeLog.tmp ChangeLog @@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 25 2010 Hans de Goede 0.8.0-1 +- New upstream release 0.8.0 (#595421) + * Fri Jul 24 2009 Fedora Release Engineering - 0.7.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index e17a10a..bc37228 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6278109f52e4f9d2c8a8dfc0d668b587 libebml-0.7.8.tar.bz2 +e99f95eaac49958f0a962e67bc4ac4f2 libebml-0.8.0.tar.bz2 From 770450616ea807f55eaec4e075915abe7c82933c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 18 Jun 2010 10:33:31 +0000 Subject: [PATCH 27/76] - New upstream release 1.0.0 (#605571) --- .cvsignore | 2 +- libebml.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 011c8ef..0bc20f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libebml-0.8.0.tar.bz2 +libebml-1.0.0.tar.bz2 diff --git a/libebml.spec b/libebml.spec index b4a7c83..f05947b 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,6 +1,6 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 0.8.0 +Version: 1.0.0 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 18 2010 Hans de Goede 1.0.0-1 +- New upstream release 1.0.0 (#605571) + * Tue May 25 2010 Hans de Goede 0.8.0-1 - New upstream release 0.8.0 (#595421) diff --git a/sources b/sources index bc37228..3e0c7f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e99f95eaac49958f0a962e67bc4ac4f2 libebml-0.8.0.tar.bz2 +6d438f03d8928d83a2d120ed02705f03 libebml-1.0.0.tar.bz2 From d7cf81590c2d0e1d343b729a24fbb872f4547c17 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:53:05 +0000 Subject: [PATCH 28/76] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 3251c09..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libebml -# $Id$ -NAME := libebml -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 9d05cd0b8f6fa24e5709b5788df02f0c52309a52 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:28:51 -0600 Subject: [PATCH 29/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index f05947b..bbbfbf7 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jun 18 2010 Hans de Goede 1.0.0-1 - New upstream release 1.0.0 (#605571) From c1fe0901946b679ffb8e9ac43be72655385c7189 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 15 Feb 2011 09:50:04 +0100 Subject: [PATCH 30/76] Update to 1.2.0 --- .gitignore | 1 + libebml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0bc20f5..331c98e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libebml-1.0.0.tar.bz2 +/libebml-1.2.0.tar.bz2 diff --git a/libebml.spec b/libebml.spec index bbbfbf7..3a3b53d 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.0.0 -Release: 2%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 14 2011 Nicolas Chauvet - 1.2.0-1 +- New upstream release 1.2.0 + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 3e0c7f6..82090d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d438f03d8928d83a2d120ed02705f03 libebml-1.0.0.tar.bz2 +26fbaa556bb497c1134d33b84ab34443 libebml-1.2.0.tar.bz2 From 6332257d282913f642b21427b198b19d0587674b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 14 Jul 2011 10:24:48 +0200 Subject: [PATCH 31/76] Update to 1.2.1 --- .gitignore | 1 + libebml.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 331c98e..8e88110 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libebml-1.0.0.tar.bz2 /libebml-1.2.0.tar.bz2 +/libebml-1.2.1.tar.bz2 diff --git a/libebml.spec b/libebml.spec index 3a3b53d..1aab473 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,6 +1,6 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 14 2011 Nicolas Chauvet - 1.2.1-1 +- Update to 1.2.1 + * Mon Feb 14 2011 Nicolas Chauvet - 1.2.0-1 - New upstream release 1.2.0 diff --git a/sources b/sources index 82090d2..68416c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26fbaa556bb497c1134d33b84ab34443 libebml-1.2.0.tar.bz2 +13c5a10e260e703d3a7f003fdc995183 libebml-1.2.1.tar.bz2 From 3c10aabd859b59f96a66184741d2f12fbc8ee04a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 20 Nov 2011 20:15:59 +0100 Subject: [PATCH 32/76] Update to 1.2.2 --- .gitignore | 1 + libebml.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8e88110..c5004a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.2.0.tar.bz2 /libebml-1.2.1.tar.bz2 +/libebml-1.2.2.tar.bz2 diff --git a/libebml.spec b/libebml.spec index 1aab473..b47b9ec 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,6 +1,6 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 20 2011 Nicolas Chauvet - 1.2.2-1 +- Update to 1.2.2 + * Thu Jul 14 2011 Nicolas Chauvet - 1.2.1-1 - Update to 1.2.1 diff --git a/sources b/sources index 68416c8..69b8860 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13c5a10e260e703d3a7f003fdc995183 libebml-1.2.1.tar.bz2 +726cc2bd1a525929ff35ff9854c0ebab libebml-1.2.2.tar.bz2 From 946baa6191039ada48412923c141bf29e192c058 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 01:36:06 -0600 Subject: [PATCH 33/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index b47b9ec..0cf2afe 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Nov 20 2011 Nicolas Chauvet - 1.2.2-1 - Update to 1.2.2 From b4c67d89063ee6dc8f5f5f566badb88f504a3ab3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 14:38:02 -0500 Subject: [PATCH 34/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 0cf2afe..0d4516b 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.2.2 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 1.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 3975fbb298e298d9ee310803d5291b0684712571 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 22:15:29 -0600 Subject: [PATCH 35/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 0d4516b..e43ab18 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.2.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 1.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 5aaed6d73113fb30d3aebc559b37e2872338bdb0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 20 Mar 2013 13:30:16 +0100 Subject: [PATCH 36/76] Update to 1.3.0 pending SONAME Change, to be built later --- .gitignore | 1 + libebml.spec | 16 ++++++---------- sources | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index c5004a6..17fe726 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.2.0.tar.bz2 /libebml-1.2.1.tar.bz2 /libebml-1.2.2.tar.bz2 +/libebml-1.3.0.tar.bz2 diff --git a/libebml.spec b/libebml.spec index e43ab18..567a10b 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,12 +1,11 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.2.2 -Release: 4%{?dist} +Version: 1.3.0 +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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) %description Extensible Binary Meta Language access library A library for reading @@ -41,7 +40,6 @@ CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make -C make/linux \ prefix=$RPM_BUILD_ROOT%{_prefix} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ @@ -52,27 +50,25 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}.a chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* -%clean -rm -rf $RPM_BUILD_ROOT - - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,0755) %doc ChangeLog LICENSE.LGPL %{_libdir}/%{name}.so.* %files devel -%defattr(-,root,root,0755) %{_includedir}/ebml/ %{_libdir}/%{name}.so %changelog +* Wed Mar 20 2013 Nicolas Chauvet - 1.3.0-1 +- Update to 1.3.0 +- Spec file clean-up + * Thu Feb 14 2013 Fedora Release Engineering - 1.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 69b8860..8c3da5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -726cc2bd1a525929ff35ff9854c0ebab libebml-1.2.2.tar.bz2 +efec729bf5a51e649e1d9d1f61c0ae7a libebml-1.3.0.tar.bz2 From ef188e464056fff74f4826c5086b050cfa32f7ce Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:16:05 -0500 Subject: [PATCH 37/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 567a10b..d249244 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -65,6 +65,9 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Mar 20 2013 Nicolas Chauvet - 1.3.0-1 - Update to 1.3.0 - Spec file clean-up From ce1461f9b5b0ce42ce5af415f74438b3d666bb61 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:09:53 -0500 Subject: [PATCH 38/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index d249244..1780965 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -65,6 +65,9 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 7584111db98cda3ffb93270270c259767a805e68 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 03:02:34 +0000 Subject: [PATCH 39/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 1780965..aa7f237 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -65,6 +65,9 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From d42b3063100915d876c801d523c5b10dd7ee0bcd Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 15 Jan 2015 11:19:28 +0100 Subject: [PATCH 40/76] Update to 1.3.1 (rhbz#1182372) --- .gitignore | 1 + libebml.spec | 23 +++++++++++------------ sources | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 17fe726..14c6a68 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.2.1.tar.bz2 /libebml-1.2.2.tar.bz2 /libebml-1.3.0.tar.bz2 +/libebml-1.3.1.tar.bz2 diff --git a/libebml.spec b/libebml.spec index aa7f237..f2eda90 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.0 -Release: 4%{?dist} +Version: 1.3.1 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -16,7 +16,7 @@ pendant to XML. %package devel Summary: Development files for the Extensible Binary Meta Language library Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Extensible Binary Meta Language access library A library for reading @@ -36,18 +36,13 @@ mv ChangeLog.tmp ChangeLog %build -CXXFLAGS="$RPM_OPT_FLAGS" make -C make/linux %{?_smp_mflags} +%configure --disable-static +make %{?_smp_mflags} %install -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) -chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* +%make_install +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %post -p /sbin/ldconfig @@ -62,9 +57,13 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.* %files devel %{_includedir}/ebml/ %{_libdir}/%{name}.so +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jan 15 2015 Hans de Goede - 1.3.1-1 +- Update to 1.3.1 (rhbz#1182372) + * Sun Aug 17 2014 Fedora Release Engineering - 1.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 8c3da5e..b66ca4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efec729bf5a51e649e1d9d1f61c0ae7a libebml-1.3.0.tar.bz2 +2d5a0e502fabedfded2a890c6b5513a5 libebml-1.3.1.tar.bz2 From baf6aa8394b8c02471d9f1634efe3d21175cec3a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 2 Mar 2015 00:40:34 +0100 Subject: [PATCH 41/76] rebuilt for gcc-5.0 --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index f2eda90..4e8c4d3 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Sun Mar 01 2015 Dominik Mierzejewski - 1.3.1-2 +- rebuilt for gcc-5.0 + * Thu Jan 15 2015 Hans de Goede - 1.3.1-1 - Update to 1.3.1 (rhbz#1182372) From 465f2363342273b884ac9e639e28293459c229bc Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sat, 11 Apr 2015 23:16:51 +0200 Subject: [PATCH 42/76] rebuilt for gcc-5.0.0-0.22.fc23 --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 4e8c4d3..7cc08d5 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Sat Apr 11 2015 Dominik Mierzejewski - 1.3.1-3 +- rebuilt for gcc-5.0.0-0.22.fc23 + * Sun Mar 01 2015 Dominik Mierzejewski - 1.3.1-2 - rebuilt for gcc-5.0 From c981f68a0ed8f1f2afa7b4da65de6f90b73831f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 15:10:48 +0000 Subject: [PATCH 43/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 7cc08d5..89f5491 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.1 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Apr 11 2015 Dominik Mierzejewski - 1.3.1-3 - rebuilt for gcc-5.0.0-0.22.fc23 From 7fb215744e099923566c4fd099c81670a5edc7ff Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 22 Oct 2015 15:30:25 +0200 Subject: [PATCH 44/76] update to 1.3.3 - required by libmatroska 1.4.4 --- .gitignore | 1 + libebml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 14c6a68..8471ed5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.2.2.tar.bz2 /libebml-1.3.0.tar.bz2 /libebml-1.3.1.tar.bz2 +/libebml-1.3.3.tar.bz2 diff --git a/libebml.spec b/libebml.spec index 89f5491..20f9fbf 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.1 -Release: 4%{?dist} +Version: 1.3.3 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Thu Oct 22 2015 Dominik Mierzejewski - 1.3.3-1 +- update to 1.3.3 (required by libmatroska 1.4.4) + * Wed Jun 17 2015 Fedora Release Engineering - 1.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index b66ca4d..5cf00a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d5a0e502fabedfded2a890c6b5513a5 libebml-1.3.1.tar.bz2 +a8b270482620970d9891958618b54d77 libebml-1.3.3.tar.bz2 From 34929a61c1e092c8469594b4a889a7ec2fc43bf6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 03:05:07 +0000 Subject: [PATCH 45/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 20f9fbf..c210d75 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Oct 22 2015 Dominik Mierzejewski - 1.3.3-1 - update to 1.3.3 (required by libmatroska 1.4.4) From c87de445415b17ea8de79b4390ce8b9075beb6c1 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 18 Feb 2016 13:48:48 +0100 Subject: [PATCH 46/76] minor fixes - don't convert ChangeLog to UTF8, it already is - use HTTPS in URLs --- libebml.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libebml.spec b/libebml.spec index c210d75..088dff4 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,11 +1,11 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries -URL: http://www.matroska.org/ -Source: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 +URL: https://www.matroska.org/ +Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 %description Extensible Binary Meta Language access library A library for reading @@ -29,10 +29,6 @@ will use the Extensible Binary Meta Language library. %prep %setup -q -sed -i 's/\r//' ChangeLog LICENSE.LGPL -iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.tmp -touch -r ChangeLog ChangeLog.tmp -mv ChangeLog.tmp ChangeLog %build @@ -61,6 +57,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Thu Feb 18 2016 Dominik Mierzejewski - 1.3.3-3 +- don't convert ChangeLog to UTF8, it already is +- use HTTPS in URLs + * Thu Feb 04 2016 Fedora Release Engineering - 1.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 03f2339e957224315f4794cc0e22da67eb477360 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 20 Aug 2016 02:27:49 +0200 Subject: [PATCH 47/76] update to 1.3.4 (#1352294) --- .gitignore | 1 + libebml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8471ed5..1ec9dee 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.3.0.tar.bz2 /libebml-1.3.1.tar.bz2 /libebml-1.3.3.tar.bz2 +/libebml-1.3.4.tar.bz2 diff --git a/libebml.spec b/libebml.spec index 088dff4..27d2347 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.3 -Release: 3%{?dist} +Version: 1.3.4 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -57,6 +57,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Fri Aug 19 2016 Dominik Mierzejewski - 1.3.4-1 +- update to 1.3.4 (#1352294) + * Thu Feb 18 2016 Dominik Mierzejewski - 1.3.3-3 - don't convert ChangeLog to UTF8, it already is - use HTTPS in URLs diff --git a/sources b/sources index 5cf00a5..0df1339 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8b270482620970d9891958618b54d77 libebml-1.3.3.tar.bz2 +58c848f85127032f23ab47b672484f45 libebml-1.3.4.tar.bz2 From e6d365a6084bb3b7078ce5d19d17ec2d5b299d13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:34:50 +0000 Subject: [PATCH 48/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 27d2347..a1c3891 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -57,6 +57,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Aug 19 2016 Dominik Mierzejewski - 1.3.4-1 - update to 1.3.4 (#1352294) From 2a71427e300e6b8429dd4aac289b850fb68fc2be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:45:39 +0000 Subject: [PATCH 49/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index a1c3891..14f84da 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -57,6 +57,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 352597a6b7c2788a74fad6ebe60063a2200e62fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:23:26 +0000 Subject: [PATCH 50/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 14f84da..a3c58e8 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.4 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -57,6 +57,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.3.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 409f47513dc75b39a310acfce7096360ceb88c23 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 23 Aug 2017 12:20:34 +0200 Subject: [PATCH 51/76] update to 1.3.5 (#1483228) --- .gitignore | 1 + libebml.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1ec9dee..13dce04 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.3.1.tar.bz2 /libebml-1.3.3.tar.bz2 /libebml-1.3.4.tar.bz2 +/libebml-1.3.5.tar.xz diff --git a/libebml.spec b/libebml.spec index a1c3891..9574886 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,11 +1,11 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.4 -Release: 2%{?dist} +Version: 1.3.5 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ -Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 +Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz %description Extensible Binary Meta Language access library A library for reading @@ -57,6 +57,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Aug 23 2017 Dominik Mierzejewski - 1.3.5-1 +- update to 1.3.5 (#1483228) + * Fri Feb 10 2017 Fedora Release Engineering - 1.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 0df1339..90a9469 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58c848f85127032f23ab47b672484f45 libebml-1.3.4.tar.bz2 +SHA512 (libebml-1.3.5.tar.xz) = cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24 From 27f46c4006609046e4df2784207a6156dc654653 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:31:01 +0000 Subject: [PATCH 52/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 388b8d2..ddef259 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.5 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -57,6 +57,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 23 2017 Dominik Mierzejewski - 1.3.5-1 - update to 1.3.5 (#1483228) From 090d6e0521535c9a5b2452e2c12e278e111ae6c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:01:36 +0000 Subject: [PATCH 53/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index ddef259..233e2f4 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.5 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -57,6 +57,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 3b33ea8343ebffd4f9e853025e8ad0fc835fbb5b Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 23 Jul 2018 15:46:11 +0200 Subject: [PATCH 54/76] update to 1.3.6 (#1570224) add BR: gcc for https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot switch build system to cmake add missing dependencies to -devel subpackage use license and ldconfig_scriptlets macros --- .gitignore | 1 + libebml.spec | 27 ++++++++++++++++++++------- sources | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 13dce04..d503e30 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.3.3.tar.bz2 /libebml-1.3.4.tar.bz2 /libebml-1.3.5.tar.xz +/libebml-1.3.6.tar.xz diff --git a/libebml.spec b/libebml.spec index 388b8d2..6313669 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,11 +1,13 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.5 +Version: 1.3.6 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz +BuildRequires: cmake +BuildRequires: gcc-c++ %description Extensible Binary Meta Language access library A library for reading @@ -17,6 +19,8 @@ pendant to XML. Summary: Development files for the Extensible Binary Meta Language library Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: cmake-filesystem +Requires: pkgconfig %description devel Extensible Binary Meta Language access library A library for reading @@ -32,31 +36,40 @@ will use the Extensible Binary Meta Language library. %build -%configure --disable-static +%cmake make %{?_smp_mflags} %install %make_install -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%doc ChangeLog LICENSE.LGPL +%license LICENSE.LGPL +%doc ChangeLog %{_libdir}/%{name}.so.* %files devel %{_includedir}/ebml/ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/ebml/EbmlConfig.cmake +%{_libdir}/cmake/ebml/EbmlConfigVersion.cmake +%{_libdir}/cmake/ebml/EbmlTargets-noconfig.cmake +%{_libdir}/cmake/ebml/EbmlTargets.cmake %changelog +* Mon Jul 23 2018 Dominik Mierzejewski - 1.3.6-1 +- update to 1.3.6 (#1570224) +- add BR: gcc for https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot +- switch build system to cmake +- add missing dependencies to -devel subpackage +- use license and ldconfig_scriptlets macros + * Wed Aug 23 2017 Dominik Mierzejewski - 1.3.5-1 - update to 1.3.5 (#1483228) diff --git a/sources b/sources index 90a9469..a9eb27c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libebml-1.3.5.tar.xz) = cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24 +SHA512 (libebml-1.3.6.tar.xz) = 6a31a56dcde39642848f25353a462f4621d6cfd3bc9ef62add1b00d098c6a80b3c2b50ecf4d6dd50650c609eb39a6150c6d1b69ea3a77a3928bd3300af7dd91f From 7f096cae140a19c1241a75287f2f1333d52aa71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 23 Jan 2019 09:28:49 +0100 Subject: [PATCH 55/76] Append curdir to CMake invokation. (#1668512) --- libebml.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libebml.spec b/libebml.spec index 33bc592..124e040 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ @@ -36,7 +36,7 @@ will use the Extensible Binary Meta Language library. %build -%cmake +%cmake . make %{?_smp_mflags} @@ -63,6 +63,9 @@ make %{?_smp_mflags} %changelog +* Wed Jan 23 2019 Björn Esser - 1.3.6-2 +- Append curdir to CMake invokation. (#1668512) + * Mon Jul 23 2018 Dominik Mierzejewski - 1.3.6-1 - update to 1.3.6 (#1570224) - add BR: gcc for https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot From f0fa9d5e477099abd784fb61952724891ab14d78 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:51 +0100 Subject: [PATCH 56/76] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libebml.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libebml.spec b/libebml.spec index 124e040..1fdbe56 100644 --- a/libebml.spec +++ b/libebml.spec @@ -3,7 +3,6 @@ Name: libebml Version: 1.3.6 Release: 2%{?dist} License: LGPLv2+ -Group: System Environment/Libraries URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz BuildRequires: cmake @@ -17,7 +16,6 @@ pendant to XML. %package devel Summary: Development files for the Extensible Binary Meta Language library -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: cmake-filesystem Requires: pkgconfig From cd5ea1d86d507c3e76a74a1a884e89ceaae3c09f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:00:06 +0000 Subject: [PATCH 57/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 1fdbe56..b55c5ab 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.6 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -61,6 +61,9 @@ make %{?_smp_mflags} %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jan 23 2019 Björn Esser - 1.3.6-2 - Append curdir to CMake invokation. (#1668512) From 15a03499a7bdd53fed82b29a233e099b810c3666 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 8 Jun 2019 00:27:30 +0200 Subject: [PATCH 58/76] update to 1.3.7 - unbundle utf8cpp --- .gitignore | 1 + libebml-use-system-utf8cpp.patch | 12 ++++++++++++ libebml.spec | 10 +++++++++- sources | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 libebml-use-system-utf8cpp.patch diff --git a/.gitignore b/.gitignore index d503e30..12cdb6d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.3.4.tar.bz2 /libebml-1.3.5.tar.xz /libebml-1.3.6.tar.xz +/libebml-1.3.7.tar.xz diff --git a/libebml-use-system-utf8cpp.patch b/libebml-use-system-utf8cpp.patch new file mode 100644 index 0000000..3003e1a --- /dev/null +++ b/libebml-use-system-utf8cpp.patch @@ -0,0 +1,12 @@ +diff -up libebml-1.3.7/src/EbmlUnicodeString.cpp.utf8cpp libebml-1.3.7/src/EbmlUnicodeString.cpp +--- libebml-1.3.7/src/EbmlUnicodeString.cpp.utf8cpp 2019-03-12 20:27:42.000000000 +0100 ++++ libebml-1.3.7/src/EbmlUnicodeString.cpp 2019-06-07 22:54:39.002363241 +0200 +@@ -39,7 +39,7 @@ + + #include "ebml/EbmlUnicodeString.h" + +-#include "lib/utf8-cpp/source/utf8/checked.h" ++#include + + START_LIBEBML_NAMESPACE + diff --git a/libebml.spec b/libebml.spec index 33bc592..43ea347 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,13 +1,15 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.6 +Version: 1.3.7 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz +Patch0: %{name}-use-system-utf8cpp.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: utf8cpp-devel %description Extensible Binary Meta Language access library A library for reading @@ -33,6 +35,8 @@ will use the Extensible Binary Meta Language library. %prep %setup -q +%patch0 -p1 -b .utf8cpp +rm -r src/lib/utf8-cpp %build @@ -63,6 +67,10 @@ make %{?_smp_mflags} %changelog +* Fri Jun 07 2019 Dominik Mierzejewski - 1.3.7-1 +- update to 1.3.7 +- unbundle utf8cpp + * Mon Jul 23 2018 Dominik Mierzejewski - 1.3.6-1 - update to 1.3.6 (#1570224) - add BR: gcc for https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot diff --git a/sources b/sources index a9eb27c..405aaa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libebml-1.3.6.tar.xz) = 6a31a56dcde39642848f25353a462f4621d6cfd3bc9ef62add1b00d098c6a80b3c2b50ecf4d6dd50650c609eb39a6150c6d1b69ea3a77a3928bd3300af7dd91f +SHA512 (libebml-1.3.7.tar.xz) = ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1 From 4841da28783937e1ca52d9eff9a32af81c395832 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 9 Jun 2019 22:08:16 +0200 Subject: [PATCH 59/76] support both EL7 and Fedora Use %cmake3 macro and %{_libdir}/cmake as dependency because there's no cmake3-filesystem package in EL7. Also, fix unowned %{_libdir}/cmake/ebml directory. --- libebml.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libebml.spec b/libebml.spec index 43ea347..538487d 100644 --- a/libebml.spec +++ b/libebml.spec @@ -7,7 +7,7 @@ Group: System Environment/Libraries URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz Patch0: %{name}-use-system-utf8cpp.patch -BuildRequires: cmake +BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: utf8cpp-devel @@ -21,7 +21,7 @@ pendant to XML. Summary: Development files for the Extensible Binary Meta Language library Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: cmake-filesystem +Requires: %{_libdir}/cmake Requires: pkgconfig %description devel @@ -40,7 +40,7 @@ rm -r src/lib/utf8-cpp %build -%cmake +%cmake3 . make %{?_smp_mflags} @@ -60,6 +60,7 @@ make %{?_smp_mflags} %{_includedir}/ebml/ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc +%dir %{_libdir}/cmake/ebml %{_libdir}/cmake/ebml/EbmlConfig.cmake %{_libdir}/cmake/ebml/EbmlConfigVersion.cmake %{_libdir}/cmake/ebml/EbmlTargets-noconfig.cmake @@ -70,6 +71,7 @@ make %{?_smp_mflags} * Fri Jun 07 2019 Dominik Mierzejewski - 1.3.7-1 - update to 1.3.7 - unbundle utf8cpp +- fix unowned %%{_libdir}/cmake/ebml directory * Mon Jul 23 2018 Dominik Mierzejewski - 1.3.6-1 - update to 1.3.6 (#1570224) From 8cfe9bfa6250eefba6e48939c67b1fae94082c36 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 9 Jun 2019 22:27:55 +0200 Subject: [PATCH 60/76] Add ABI version to library file name This avoids inadvertent SONAME bumps. --- libebml.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 538487d..d78e3df 100644 --- a/libebml.spec +++ b/libebml.spec @@ -54,7 +54,7 @@ make %{?_smp_mflags} %files %license LICENSE.LGPL %doc ChangeLog -%{_libdir}/%{name}.so.* +%{_libdir}/%{name}.so.4* %files devel %{_includedir}/ebml/ From 4ac6f773b7483017aa70baf88699541c28e35ff2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:08:42 +0000 Subject: [PATCH 61/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 946a911..c886eaf 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -66,6 +66,9 @@ make %{?_smp_mflags} %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.3.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 07 2019 Dominik Mierzejewski - 1.3.7-1 - update to 1.3.7 - unbundle utf8cpp From 9b83812f88bcc5daf403f3e5626dc4ef0a8868d2 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 11 Sep 2019 09:25:42 +0200 Subject: [PATCH 62/76] update to 1.3.9 (#1688001) --- .gitignore | 1 + libebml.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 12cdb6d..7c35fd6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.3.5.tar.xz /libebml-1.3.6.tar.xz /libebml-1.3.7.tar.xz +/libebml-1.3.9.tar.xz diff --git a/libebml.spec b/libebml.spec index d78e3df..fc6cee1 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,6 +1,6 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.7 +Version: 1.3.9 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -60,14 +60,17 @@ make %{?_smp_mflags} %{_includedir}/ebml/ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%dir %{_libdir}/cmake/ebml -%{_libdir}/cmake/ebml/EbmlConfig.cmake -%{_libdir}/cmake/ebml/EbmlConfigVersion.cmake -%{_libdir}/cmake/ebml/EbmlTargets-noconfig.cmake -%{_libdir}/cmake/ebml/EbmlTargets.cmake +%dir %{_libdir}/cmake/EBML +%{_libdir}/cmake/EBML/EBMLConfig.cmake +%{_libdir}/cmake/EBML/EBMLConfigVersion.cmake +%{_libdir}/cmake/EBML/EBMLTargets-noconfig.cmake +%{_libdir}/cmake/EBML/EBMLTargets.cmake %changelog +* Tue Sep 10 2019 Dominik Mierzejewski - 1.3.9-1 +- update to 1.3.9 (#1688001) + * Fri Jun 07 2019 Dominik Mierzejewski - 1.3.7-1 - update to 1.3.7 - unbundle utf8cpp diff --git a/sources b/sources index 405aaa0..47a4ccb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libebml-1.3.7.tar.xz) = ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1 +SHA512 (libebml-1.3.9.tar.xz) = a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e From 31be0ec26a0646530c948458194066c65000f224 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 25 Dec 2019 02:13:08 +0100 Subject: [PATCH 63/76] update to 1.3.10 (#1782287) --- .gitignore | 1 + libebml.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7c35fd6..92d6f32 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.3.6.tar.xz /libebml-1.3.7.tar.xz /libebml-1.3.9.tar.xz +/libebml-1.3.10.tar.xz diff --git a/libebml.spec b/libebml.spec index c0ddff5..a7bc09d 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,6 +1,6 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.9 +Version: 1.3.10 Release: 1%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ @@ -66,6 +66,9 @@ make %{?_smp_mflags} %changelog +* Tue Dec 24 2019 Dominik Mierzejewski - 1.3.10-1 +- update to 1.3.10 (#1782287) + * Tue Sep 10 2019 Dominik Mierzejewski - 1.3.9-1 - update to 1.3.9 (#1688001) diff --git a/sources b/sources index 47a4ccb..be4404b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libebml-1.3.9.tar.xz) = a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e +SHA512 (libebml-1.3.10.tar.xz) = c7ba20664161e811a10847f888a833abaa2b7a4d43ddbef6ae927f391f5d1eff45bc703f13a52ccfc793521e3b22cbac2fd93550cd95119a4060153683b29c49 From 3be9d7fdb93ea54087d589571e22ca7560a6ab1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 08:59:18 +0000 Subject: [PATCH 64/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 30903c9..735c081 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.3.10 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -66,6 +66,9 @@ make %{?_smp_mflags} %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.3.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Dec 24 2019 Dominik Mierzejewski - 1.3.10-1 - update to 1.3.10 (#1782287) From f09fb2eaedf21d8438ea458368778eeac4b48d59 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 17 Jul 2020 10:49:53 +0200 Subject: [PATCH 65/76] update to 1.4.0 (#1851593), ABI bump --- .gitignore | 1 + libebml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 92d6f32..faa1955 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.3.7.tar.xz /libebml-1.3.9.tar.xz /libebml-1.3.10.tar.xz +/libebml-1.4.0.tar.xz diff --git a/libebml.spec b/libebml.spec index 30903c9..d3487eb 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,6 +1,6 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.10 +Version: 1.4.0 Release: 1%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ @@ -52,7 +52,7 @@ make %{?_smp_mflags} %files %license LICENSE.LGPL %doc ChangeLog -%{_libdir}/%{name}.so.4* +%{_libdir}/%{name}.so.5* %files devel %{_includedir}/ebml/ @@ -66,6 +66,9 @@ make %{?_smp_mflags} %changelog +* Tue Jul 07 2020 Dominik Mierzejewski - 1.4.0-1 +- update to 1.4.0 (#1851593), ABI bump + * Tue Dec 24 2019 Dominik Mierzejewski - 1.3.10-1 - update to 1.3.10 (#1782287) diff --git a/sources b/sources index be4404b..8cd3513 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libebml-1.3.10.tar.xz) = c7ba20664161e811a10847f888a833abaa2b7a4d43ddbef6ae927f391f5d1eff45bc703f13a52ccfc793521e3b22cbac2fd93550cd95119a4060153683b29c49 +SHA512 (libebml-1.4.0.tar.xz) = db78ee560a44b90b4df12ba23a00f8ccb0d3626f44296af6b79a492a00126690582764c6be6c9e9851302a0d0d70edfbe000cc217c5532abe862a821624af230 From de89fc385857f9ccb7698e233c2f68d665a37ead Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:32:33 +0000 Subject: [PATCH 66/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 81839f1..f84aec6 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -66,6 +66,9 @@ make %{?_smp_mflags} %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 07 2020 Dominik Mierzejewski - 1.4.0-1 - update to 1.4.0 (#1851593), ABI bump From 7a27ff1467aa237bfe6494689745deda4bfe5c2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 03:55:04 +0000 Subject: [PATCH 67/76] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index f84aec6..5ff7e80 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.4.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -66,6 +66,10 @@ make %{?_smp_mflags} %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.4.0-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d4bd039df5ab4a56a174c9f13800786f960dd916 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 10 Aug 2020 11:00:22 +0200 Subject: [PATCH 68/76] Fix FTBFS, straight-forward cmake macro fix (rhbz#1863992) --- libebml.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libebml.spec b/libebml.spec index 5ff7e80..a1a4b9c 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.4.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -38,12 +38,12 @@ rm -r src/lib/utf8-cpp %build -%cmake3 . -make %{?_smp_mflags} +%cmake3 +%cmake3_build %install -%make_install +%cmake3_install %ldconfig_scriptlets @@ -66,6 +66,9 @@ make %{?_smp_mflags} %changelog +* Mon Aug 10 2020 Hans de Goede - 1.4.0-4 +- Fix FTBFS, straight-forward cmake macro fix (rhbz#1863992) + * Sat Aug 01 2020 Fedora Release Engineering - 1.4.0-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ab17a962e2baa9c68651d189ad334d0438212f5d Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 25 Jan 2021 14:05:57 +0100 Subject: [PATCH 69/76] update to 1.4.1 (#1912485) fixes heap use-after-free when parsing malformed file (https://gitlab.com/mbunkus/mkvtoolnix/-/issues/2989) --- .gitignore | 1 + libebml.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index faa1955..6efa09f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.3.9.tar.xz /libebml-1.3.10.tar.xz /libebml-1.4.0.tar.xz +/libebml-1.4.1.tar.xz diff --git a/libebml.spec b/libebml.spec index 81839f1..5a0801d 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,6 +1,6 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ @@ -66,6 +66,10 @@ make %{?_smp_mflags} %changelog +* Mon Jan 25 2021 Dominik Mierzejewski - 1.4.1-1 +- update to 1.4.1 (#1912485) +- fixes heap use-after-free when parsing malformed file (https://gitlab.com/mbunkus/mkvtoolnix/-/issues/2989) + * Tue Jul 07 2020 Dominik Mierzejewski - 1.4.0-1 - update to 1.4.0 (#1851593), ABI bump diff --git a/sources b/sources index 8cd3513..b139163 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libebml-1.4.0.tar.xz) = db78ee560a44b90b4df12ba23a00f8ccb0d3626f44296af6b79a492a00126690582764c6be6c9e9851302a0d0d70edfbe000cc217c5532abe862a821624af230 +SHA512 (libebml-1.4.1.tar.xz) = ddde4975546ba4214cd22db37992c2b5130a731da1b34e171cca8d7f39d981b9643a193d06be1a1e156b316e51419d1eb4c1cfe40511a52b245152e69a507e4b From 50752b872b2da910be2e9f985cd67b81653b37aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:57:36 +0000 Subject: [PATCH 70/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 3a904e3..ce971df 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -66,6 +66,9 @@ rm -r src/lib/utf8-cpp %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 25 2021 Dominik Mierzejewski - 1.4.1-1 - update to 1.4.1 (#1912485) - fixes heap use-after-free when parsing malformed file (https://gitlab.com/mbunkus/mkvtoolnix/-/issues/2989) From abd46b2059e556908404843b04f76abbd0c78170 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 24 Feb 2021 23:11:37 +0100 Subject: [PATCH 71/76] update to 1.4.2 (#1930172) fixes CVE-2021-3405 (#1926991) --- .gitignore | 1 + libebml.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6efa09f..a417517 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ libebml-1.0.0.tar.bz2 /libebml-1.3.10.tar.xz /libebml-1.4.0.tar.xz /libebml-1.4.1.tar.xz +/libebml-1.4.2.tar.xz diff --git a/libebml.spec b/libebml.spec index 5a0801d..83eed1c 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,6 +1,6 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ @@ -66,6 +66,10 @@ make %{?_smp_mflags} %changelog +* Wed Feb 24 2021 Dominik Mierzejewski - 1.4.2-1 +- update to 1.4.2 (#1930172) +- fixes CVE-2021-3405 (#1926991) + * Mon Jan 25 2021 Dominik Mierzejewski - 1.4.1-1 - update to 1.4.1 (#1912485) - fixes heap use-after-free when parsing malformed file (https://gitlab.com/mbunkus/mkvtoolnix/-/issues/2989) diff --git a/sources b/sources index b139163..e818fab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libebml-1.4.1.tar.xz) = ddde4975546ba4214cd22db37992c2b5130a731da1b34e171cca8d7f39d981b9643a193d06be1a1e156b316e51419d1eb4c1cfe40511a52b245152e69a507e4b +SHA512 (libebml-1.4.2.tar.xz) = b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5 From 5ff3415971b7a8675c5238cebe4184ab7abfb0b6 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 1 Mar 2021 11:50:49 +0100 Subject: [PATCH 72/76] fix build with GCC-11 --- libebml-gcc11.patch | 22 ++++++++++++++++++++++ libebml.spec | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 libebml-gcc11.patch diff --git a/libebml-gcc11.patch b/libebml-gcc11.patch new file mode 100644 index 0000000..859f763 --- /dev/null +++ b/libebml-gcc11.patch @@ -0,0 +1,22 @@ +diff -up libebml-1.4.2/src/EbmlString.cpp.gcc11 libebml-1.4.2/src/EbmlString.cpp +--- libebml-1.4.2/src/EbmlString.cpp.gcc11 2021-02-18 12:42:59.000000000 +0100 ++++ libebml-1.4.2/src/EbmlString.cpp 2021-03-01 11:42:02.122854703 +0100 +@@ -34,6 +34,7 @@ + \author Steve Lhomme + */ + #include ++#include + + #include "ebml/EbmlString.h" + +diff -up libebml-1.4.2/src/EbmlUnicodeString.cpp.gcc11 libebml-1.4.2/src/EbmlUnicodeString.cpp +--- libebml-1.4.2/src/EbmlUnicodeString.cpp.gcc11 2021-03-01 11:42:02.121854696 +0100 ++++ libebml-1.4.2/src/EbmlUnicodeString.cpp 2021-03-01 11:42:21.772995170 +0100 +@@ -36,6 +36,7 @@ + */ + + #include ++#include + + #include "ebml/EbmlUnicodeString.h" + diff --git a/libebml.spec b/libebml.spec index 8b21ecd..000f227 100644 --- a/libebml.spec +++ b/libebml.spec @@ -6,6 +6,8 @@ License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz Patch0: %{name}-use-system-utf8cpp.patch +# https://github.com/Matroska-Org/libebml/pull/81 +Patch1: %{name}-gcc11.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: utf8cpp-devel @@ -34,6 +36,7 @@ will use the Extensible Binary Meta Language library. %prep %setup -q %patch0 -p1 -b .utf8cpp +%patch1 -p1 -b .gcc11 rm -r src/lib/utf8-cpp @@ -69,6 +72,7 @@ rm -r src/lib/utf8-cpp * Wed Feb 24 2021 Dominik Mierzejewski - 1.4.2-1 - update to 1.4.2 (#1930172) - fixes CVE-2021-3405 (#1926991) +- fix build with GCC-11 * Tue Jan 26 2021 Fedora Release Engineering - 1.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3a603f6002004ab50e03d8f55951c2df4d8be00c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:15:59 +0000 Subject: [PATCH 73/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 000f227..2155885 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -69,6 +69,9 @@ rm -r src/lib/utf8-cpp %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Feb 24 2021 Dominik Mierzejewski - 1.4.2-1 - update to 1.4.2 (#1930172) - fixes CVE-2021-3405 (#1926991) From 113a4cf52d47ed0e71535085b78d28e9024c647f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:05:56 +0000 Subject: [PATCH 74/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libebml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libebml.spec b/libebml.spec index 2155885..4f9b55a 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz @@ -69,6 +69,9 @@ rm -r src/lib/utf8-cpp %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 119cdb5e5ef26322f31c8a43cde845825f5cf283 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 5 May 2022 18:17:04 +0200 Subject: [PATCH 75/76] Drop utf8cpp for now --- libebml.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libebml.spec b/libebml.spec index 4f9b55a..ab2a917 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,3 +1,7 @@ +%if 0%{?el9} +%global _without_utf8cpp 1 +%endif + Summary: Extensible Binary Meta Language library Name: libebml Version: 1.4.2 @@ -10,7 +14,7 @@ Patch0: %{name}-use-system-utf8cpp.patch Patch1: %{name}-gcc11.patch BuildRequires: cmake3 BuildRequires: gcc-c++ -BuildRequires: utf8cpp-devel +%{!?_without_utf8cpp:BuildRequires: utf8cpp-devel} %description Extensible Binary Meta Language access library A library for reading @@ -35,9 +39,11 @@ will use the Extensible Binary Meta Language library. %prep %setup -q +%{!?_without_utf8cpp: %patch0 -p1 -b .utf8cpp -%patch1 -p1 -b .gcc11 rm -r src/lib/utf8-cpp +} +%patch1 -p1 -b .gcc11dd %build From f9b8fafd6bcdd19a01779e07f0c67e2f087ccf49 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:03:44 +0300 Subject: [PATCH 76/76] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index e818fab..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libebml-1.4.2.tar.xz) = b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5