diff --git a/.gitignore b/.gitignore index 536f2f8..53c6a89 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -libtheora-1.1.0.tar.xz -/libtheora-1.1.1.tar.xz +libtheora-1.1.1.tar.xz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index ea86f9d..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} diff --git a/libtheora.spec b/libtheora.spec index 3df8af7..8a2b8eb 100644 --- a/libtheora.spec +++ b/libtheora.spec @@ -1,3 +1,4 @@ +%bcond transfig %{undefined rhel} # enable bootstrap mode (e.g. disables doc generation) #global bootstrap 1 @@ -5,7 +6,7 @@ Name: libtheora Epoch: 1 Version: 1.1.1 -Release: 21%{?dist} +Release: 39%{?dist} Summary: Theora Video Compression Codec License: BSD URL: http://www.theora.org @@ -15,6 +16,7 @@ Patch0: libtheora-1.1.1-fix-pp_sharp_mod-calc.patch Patch1: libtheora-1.1.1-libpng16.patch Patch2: libtheora-1.1.1-libm.patch +BuildRequires: make BuildRequires: autoconf automake libtool BuildRequires: libogg-devel >= 2:1.1 BuildRequires: libvorbis-devel @@ -23,7 +25,10 @@ BuildRequires: SDL-devel libpng-devel Obsoletes: %{name}-devel-docs < %{epoch}:%{version}-%{release} %else BuildRequires: doxygen -BuildRequires: tetex-latex transfig +BuildRequires: tetex-latex +%if %{with transfig} +BuildRequires: transfig +%endif %endif %description @@ -39,12 +44,6 @@ in the future to improve over what is possible with VP3. Summary: Development tools for Theora applications Requires: libogg-devel >= 2:1.1 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -# the new experimental decoder is now part of the regular libtheora -# we do not obsolete theora-exp itself as that had a different soname and we -# do not want to break deps, however we do now provide the same headers as -# theora-exp-devel did. -Obsoletes: theora-exp-devel -Provides: theora-exp-devel %description devel The libtheora-devel package contains the header files needed to develop @@ -75,19 +74,18 @@ with theora bitstreams. %patch1 -p0 -b .libpng16 %patch2 -p1 -# no custom CFLAGS please -sed -i 's/CFLAGS="$CFLAGS $cflags_save"/CFLAGS="$cflags_save"/g' configure - # Update config.guess/sub to fix builds on new architectures (aarch64/ppc64le) -cp /usr/lib/rpm/config.* . +cp /usr/lib/rpm/redhat/config.* . %build ./autogen.sh +# no custom CFLAGS please +sed -i 's/CFLAGS="$CFLAGS $cflags_save"/CFLAGS="$cflags_save"/g' configure %configure --enable-shared --disable-static # Don't use rpath! sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +%{make_build} %if ! 0%{?bootstrap} make -C doc/spec %{?_smp_mflags} @@ -95,12 +93,12 @@ make -C doc/spec %{?_smp_mflags} %install -%make_install +%{make_install} -rm $RPM_BUILD_ROOT/%{_libdir}/*.la -rm -r $RPM_BUILD_ROOT/%{_docdir}/* +find %{buildroot} -type f -name "*.la" -delete +rm -r %{buildroot}/%{_docdir}/* -mkdir -p $RPM_BUILD_ROOT/%{_bindir} +mkdir -p %{buildroot}/%{_bindir} install -m 755 examples/.libs/dump_video $RPM_BUILD_ROOT/%{_bindir}/theora_dump_video install -m 755 examples/.libs/encoder_example $RPM_BUILD_ROOT/%{_bindir}/theora_encode install -m 755 examples/.libs/player_example $RPM_BUILD_ROOT/%{_bindir}/theora_player @@ -130,6 +128,62 @@ install -m 755 examples/.libs/png2theora $RPM_BUILD_ROOT/%{_bindir}/png2theora %changelog +* Tue Oct 29 2024 Troy Dawson - 1:1.1.1-39 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1:1.1.1-38 +- Bump release for June 2024 mass rebuild + +* Fri May 03 2024 Wim Taymans - 1:1.1.1-37 +- Remove transfig dependency for RHEL + +* Thu Jan 25 2024 Fedora Release Engineering - 1:1.1.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1:1.1.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1:1.1.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1:1.1.1-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1:1.1.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1:1.1.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1:1.1.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1:1.1.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Aug 03 2020 Peter Robinson - 1:1.1.1-28 +- Use new macros, update config.\* locations + +* Sat Aug 01 2020 Fedora Release Engineering - 1:1.1.1-27 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1:1.1.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1:1.1.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1:1.1.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1:1.1.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1:1.1.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1:1.1.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild