September 2022 - rpmfusion-commits

by Leigh Scott

commit 6cf8868d25e3760eea3484c170f971b758a269ba Author: Leigh Scott <leigh123linux(a)gmail.com> Date: Fri Sep 9 09:46:05 2022 +0100 Fix for rpkg-1.65 change fix_for_rpkg_change.patch | 37 +++++++++++++++++++++++++++++++++++++ rfpkg.spec | 6 +++++- 2 files changed, 42 insertions(+), 1 deletion(-) --- diff --git a/fix_for_rpkg_change.patch b/fix_for_rpkg_change.patch new file mode 100644 index 0000000..86c4c1c --- /dev/null +++ b/fix_for_rpkg_change.patch @@ -0,0 +1,37 @@ +diff -uNrp a/rfpkg/__init__.py b/rfpkg/__init__.py +--- a/rfpkg/__init__.py 2021-10-23 05:52:51.000000000 +0100 ++++ b/rfpkg/__init__.py 2022-09-09 09:42:04.837792272 +0100 +@@ -158,22 +158,22 @@ class Commands(pyrpkg.Commands): + raise pyrpkg.rpkgError('Could not find the release/dist from branch name ' + '%s\nPlease specify with --release' % + self.branch_merge) +- self._rpmdefines = ["--define '_sourcedir %s'" % self.path, +- "--define '_specdir %s'" % self.path, +- "--define '_builddir %s'" % self.path, +- "--define '_srcrpmdir %s'" % self.path, +- "--define '_rpmdir %s'" % self.path, +- "--define 'dist .%s'" % self._disttag, +- "--define '%s %s'" % (self._distvar, ++ self._rpmdefines = ["--define", "_sourcedir %s" % self.path, ++ "--define", "_specdir %s" % self.path, ++ "--define", "_builddir %s" % self.path, ++ "--define", "_srcrpmdir %s" % self.path, ++ "--define", "_rpmdir %s" % self.path, ++ "--define", "dist .%s" % self._disttag, ++ "--define", "%s %s" % (self._distvar, + self._distval), +- "--eval '%%undefine %s'" % self._distunset, +- "--define '%s 1'" % self._disttag] ++ "--eval", "%%undefine %s" % self._distunset, ++ "--define", "%s 1'" % self._disttag] + if self._runtime_disttag: + if self._disttag != self._runtime_disttag: + # This means that the runtime is known, and is different from + # the target, so we need to unset the _runtime_disttag +- self._rpmdefines.append("--eval '%%undefine %s'" % +- self._runtime_disttag) ++ self._rpmdefines.extend(["--eval", "%%undefine %s" % ++ self._runtime_disttag]) + + def load_target(self): + """This creates the target attribute based on branch merge""" diff --git a/rfpkg.spec b/rfpkg.spec index e4bfb25..a70d482 100644 --- a/rfpkg.spec +++ b/rfpkg.spec @@ -5,7 +5,7 @@ Name: rfpkg Version: 1.27.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: RPM Fusion utility for working with dist-git License: GPLv2+ Group: Applications/System @@ -18,6 +18,7 @@ Patch3: 0003-Fix-the-download-of-old-sources-with-md5-hash.patch # See https://github.com/rpmfusion-infra/rfpkg/pull/25 Patch4: 0001-Remove-register_retire-from-rfpkg.patch Patch5: 0001-disable-multilibs-builds-on-el8-9-and-9-next.patch +Patch6: fix_for_rpkg_change.patch BuildArch: noarch @@ -152,6 +153,9 @@ nosetests %changelog +* Fri Sep 09 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.27.0-7 +- Fix for rpkg-1.65 change + * Tue Sep 06 2022 Sérgio Basto <sergio(a)serjux.com> - 1.27.0-6 - Disable multilibs builds on el8, 9 and 9-next

2 years, 2 months

1
0
0 / 0

[ffmpeg/f37] (4 commits) ...Change f37 so we can get some testing done before release

by Leigh Scott

Summary of changes: 66205b1... Fixup for el (*) e72bb6d... Enable everything we can for el9 (*) 15c0273... Switch from glslang to shaderc (*) 6369da3... Change f37 so we can get some testing done before release (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 2 months

1
0
0 / 0

[ffmpeg] Change f37 so we can get some testing done before release

by Leigh Scott

commit 6369da34c8541d506b156f765cb83a48f589be9b Author: Leigh Scott <leigh123linux(a)gmail.com> Date: Thu Sep 8 09:08:03 2022 +0100 Change f37 so we can get some testing done before release ffmpeg.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- diff --git a/ffmpeg.spec b/ffmpeg.spec index ee9cd27..b0fc9ca 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -229,7 +229,7 @@ and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. %package libs Summary: Libraries for %{name} -%if 0%{?fedora} && 0%{?fedora} < 38 +%if 0%{?rhel} Conflicts: libavcodec-free Conflicts: libavfilter-free Conflicts: libavformat-free @@ -249,7 +249,7 @@ This package contains the libraries for %{name} %package -n libavdevice%{?flavor} Summary: Special devices muxing/demuxing library -%if 0%{?fedora} && 0%{?fedora} < 38 +%if 0%{?rhel} Conflicts: libavdevice-free %endif Requires: %{name}-libs%{_isa} = %{version}-%{release} @@ -392,7 +392,7 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/ %build %{?_with_cuda:export PATH=${PATH}:%{_cuda_bindir}} %{ff_configure}\ -%if 0%{?fedora} && 0%{?fedora} > 37 +%if 0%{?fedora} --libdir=%{_libdir}/%{name} \ --shlibdir=%{_libdir}/%{name} \ %else @@ -457,7 +457,7 @@ rm -r %{buildroot}%{_datadir}/%{name}/examples install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %endif -%if 0%{?fedora} && 0%{?fedora} > 37 +%if 0%{?fedora} install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/ echo -e "%{_libdir}/%{name}\n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig @@ -483,7 +483,7 @@ mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig %files libs %doc CREDITS README.md %license COPYING.* -%if 0%{?fedora} && 0%{?fedora} > 37 +%if 0%{?fedora} %{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf %{_libdir}/%{name}/lib*.so.* %exclude %{_libdir}/%{name}/libavdevice%{?build_suffix}.so.* @@ -496,7 +496,7 @@ mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig } %files -n libavdevice%{?flavor} -%if 0%{?fedora} && 0%{?fedora} > 37 +%if 0%{?fedora} %{_libdir}/%{name}/libavdevice%{?build_suffix}.so.* %else %{_libdir}/libavdevice%{?build_suffix}.so.* @@ -509,7 +509,7 @@ mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig %doc %{_docdir}/%{name}/*.{css,html} %{_includedir}/%{name} %{_libdir}/pkgconfig/lib*.pc -%if 0%{?fedora} > 37 +%%if 0%{?fedora} %{_libdir}/%{name}/lib*.so %else %{_libdir}/lib*.so

2 years, 2 months

1
0
0 / 0

[rpmfusion-packager/f37] add comment

by Sérgio M. Basto

Summary of changes: 6cebea0... add comment (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 2 months

1
0
0 / 0

[rfpkg/el9] (5 commits) ...Disable multilibs builds on el8, 9 and 9-next

by Sérgio M. Basto

Summary of changes: 0afd315... Rebuilt for Python 3.11 (*) d8293c3... Add patch to remove duplicate retire parser because of inco (*) 875e9a2... Organize BR and Requires (*) 2b9cfc3... Requires revision (*) 051ad3d... Disable multilibs builds on el8, 9 and 9-next (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 2 months

1
0
0 / 0

[rfpkg/f35] (5 commits) ...Disable multilibs builds on el8, 9 and 9-next

by Sérgio M. Basto

Summary of changes: 0afd315... Rebuilt for Python 3.11 (*) d8293c3... Add patch to remove duplicate retire parser because of inco (*) 875e9a2... Organize BR and Requires (*) 2b9cfc3... Requires revision (*) 051ad3d... Disable multilibs builds on el8, 9 and 9-next (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 2 months

1
0
0 / 0

[rfpkg/f36] (5 commits) ...Disable multilibs builds on el8, 9 and 9-next

by Sérgio M. Basto

Summary of changes: 0afd315... Rebuilt for Python 3.11 (*) d8293c3... Add patch to remove duplicate retire parser because of inco (*) 875e9a2... Organize BR and Requires (*) 2b9cfc3... Requires revision (*) 051ad3d... Disable multilibs builds on el8, 9 and 9-next (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 2 months

1
0
0 / 0

[rfpkg/f37] (2 commits) ...Disable multilibs builds on el8, 9 and 9-next

by Sérgio M. Basto

Summary of changes: 2b9cfc3... Requires revision (*) 051ad3d... Disable multilibs builds on el8, 9 and 9-next (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 2 months

1
0
0 / 0

[rpmfusion-packager/f35] (3 commits) ...add comment

by Sérgio M. Basto

Summary of changes: 56ef164... Rebuilt for Python 3.11 (*) 154770e... Only requires rfpkg, rfpkg will requires the rest (*) 6cebea0... add comment (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 2 months

1
0
0 / 0

[rpmfusion-packager] add comment

by Sérgio M. Basto

Summary of changes: 6cebea0... add comment (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits September 2022