March 2022 - rpmfusion-commits

[game-data-packager] (2 commits) ...Merge branch 'master' of ssh://pkgs.rpmfusion.org/free/game-data-packager

by Alexandre Detiste

Summary of changes: 3387a57... new release / first build with Meson (*) 1b8f763... Merge branch 'master' of ssh://pkgs.rpmfusion.org/free/game (*) This commit already existed in another branch; no separate mail sent

2 years, 8 months

1
0
0 / 0

[game-data-packager/f35] new release / first build with Meson

by Alexandre Detiste

commit 3387a5759e0aed705c4eddd64faf7e3b447a68cb Author: Alexandre Detiste <alexandre.detiste(a)gmail.com> Date: Wed Mar 16 23:33:58 2022 +0100 new release / first build with Meson .gitignore | 1 + game-data-packager.spec | 32 ++++++++++++++++++++------------ sources | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-) --- diff --git a/.gitignore b/.gitignore index f25eb05..b84980a 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /game-data-packager_65.tar.xz /game-data-packager_66.tar.xz /game-data-packager_68.tar.xz +/game-data-packager_69.tar.xz diff --git a/game-data-packager.spec b/game-data-packager.spec index aab9de6..1fcaacf 100644 --- a/game-data-packager.spec +++ b/game-data-packager.spec @@ -9,6 +9,8 @@ # rfpkg push # rfpkg build +%global _vpath_srcdir %{name}-%{version}/ + #define gitdate 20160112 # git log --oneline -1 %define gitversion 50f64b6 @@ -18,7 +20,7 @@ %endif Name: game-data-packager -Version: 68 +Version: 69 Release: 1%{?gver}%{?dist} Summary: Installer for game data files License: GPLv2 and GPLv2+ @@ -32,6 +34,7 @@ Source: http://http.debian.net/debian/pool/contrib/g/game-data-packager/g BuildArch: noarch +BuildRequires: meson BuildRequires: desktop-file-utils BuildRequires: ImageMagick BuildRequires: inkscape @@ -80,21 +83,22 @@ This GUI let you select a WAD to play & show it's description. %prep -%autosetup +%autosetup -c # id-shr-extract is not packaged -sed -i '/wolf3d/d' tests/integration.py +#sed -i '/wolf3d/d' tests/integration.py # Mock: "Error: No Package found for lha" -sed -i '/spear/d' tests/integration.py +#sed -i '/spear/d' tests/integration.py %build -%configure -%make_build +%meson +%meson_build -#%check -#DEB_BUILD_TIME_TESTS=1 make check +%check +echo disabled +#DEB_BUILD_TIME_TESTS=1 % meson_test %install -%make_install +%meson_install find %{buildroot}%{_datadir}/game-data-packager/game_data_packager -name '*.py' -exec chmod 755 {} \; #E: python-bytecode-inconsistent-mtime python3 -m compileall %{buildroot}%{_datadir}/game-data-packager/game_data_packager/version.py @@ -117,8 +121,8 @@ rm -v %{buildroot}%{_mandir}/man6/quake*.6 desktop-file-validate %{buildroot}%{_datadir}/applications/doom2-masterlevels.desktop %files -%doc doc/adding_a_game.mdwn -%license COPYING +%doc %{name}-%{version}/doc/adding_a_game.mdwn +%license %{name}-%{version}/COPYING %{_mandir}/man6/game-data-packager.* %{_mandir}/fr/man6/game-data-packager.* %dir %{_sysconfdir}/game-data-packager/ @@ -129,13 +133,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/doom2-masterlevels.de %{_datadir}/game-data-packager/ %files -n doom2-masterlevels -%license COPYING +%license %{name}-%{version}/COPYING %{_mandir}/man6/doom2-masterlevels.* %{_bindir}/doom2-masterlevels %{_datadir}/applications/doom2-masterlevels.desktop %{_datadir}/pixmaps/doom2-masterlevels.png %changelog +* Wed Mar 16 2022 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 69-1 +- New upstream release +- Switch to Meson build system + * Fri Oct 08 2021 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 68-1 - New upstream release diff --git a/sources b/sources index 3f4eb53..53eda30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (game-data-packager_68.tar.xz) = d2028e2591157b4cbbec100fd9519a19d56501f74760fd40ad0c28a15c2acb8268c7cf742c94b972781e66bd938aabfe2c4f168f5da64a573e087004c136b19b +SHA512 (game-data-packager_69.tar.xz) = eee94d96b0395e9ac0d47195d8775c43ace2a10818b82713b91385f42fb483433aa73f67f7affe81e2af0a52dcdee7fc3d9a2e4d349d3b078a8ed8579d16fcae

2 years, 8 months

1
0
0 / 0

[rpmfusion-nonfree-release/el9] Release for EL-9

by Xavier Bachelot

commit dcf1fa0744ce4b60d8882ee8a84286ad69bcadb0 Author: Xavier Bachelot <xavier(a)bachelot.org> Date: Fri Mar 11 23:10:18 2022 +0100 Release for EL-9 rpmfusion-nonfree-next-testing.repo | 33 +++ rpmfusion-nonfree-next.repo | 33 +++ rpmfusion-nonfree-rawhide.repo | 30 --- rpmfusion-nonfree-release.spec | 375 +++++---------------------------- rpmfusion-nonfree-tainted.repo | 24 +-- rpmfusion-nonfree-updates-testing.repo | 24 +-- rpmfusion-nonfree-updates.repo | 26 +-- rpmfusion-nonfree.repo | 33 --- 8 files changed, 158 insertions(+), 420 deletions(-) --- diff --git a/rpmfusion-nonfree-next-testing.repo b/rpmfusion-nonfree-next-testing.repo new file mode 100644 index 0000000..43a2a1f --- /dev/null +++ b/rpmfusion-nonfree-next-testing.repo @@ -0,0 +1,33 @@ +[rpmfusion-nonfree-next-testing] +name=RPM Fusion for EL 9 - Nonfree - Next Test +#baseurl=http://download1.rpmfusion.org/nonfree/el/testing/next/9/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-test-9&arch=$basearch +enabled=0 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 + +[rpmfusion-nonfree-next-testing-debuginfo] +name=RPM Fusion for EL 9 - Nonfree - Next Test Debug +#baseurl=http://download1.rpmfusion.org/nonfree/el/testing/next/9/$basearch/debug/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-test-debug-9&arch=$basearch +enabled=0 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 + +[rpmfusion-nonfree-next-testing-source] +name=RPM Fusion for EL 9 - Nonfree - Next Test Source +#baseurl=http://download1.rpmfusion.org/nonfree/el/testing/next/9/SRPMS/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-test-source-9&arch=$basearch +enabled=0 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 + diff --git a/rpmfusion-nonfree-next.repo b/rpmfusion-nonfree-next.repo new file mode 100644 index 0000000..9853fa6 --- /dev/null +++ b/rpmfusion-nonfree-next.repo @@ -0,0 +1,33 @@ +[rpmfusion-nonfree-next] +name=RPM Fusion for EL 9 - Nonfree - Next +#baseurl=http://download1.rpmfusion.org/nonfree/el/next/9/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-9&arch=$basearch +enabled=1 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 + +[rpmfusion-nonfree-next-debuginfo] +name=RPM Fusion for EL 9 - Nonfree - Next Debug +#baseurl=http://download1.rpmfusion.org/nonfree/el/next/9/$basearch/debug/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-debug-9&arch=$basearch +enabled=0 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 + +[rpmfusion-nonfree-next-source] +name=RPM Fusion for EL 9 - Nonfree - Next Source +#baseurl=http://download1.rpmfusion.org/nonfree/el/next/9/SRPMS/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-source-9&arch=$basearch +enabled=0 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 + diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec index 9ffe3e0..e98b58c 100644 --- a/rpmfusion-nonfree-release.spec +++ b/rpmfusion-nonfree-release.spec @@ -1,42 +1,45 @@ #global _repo free %global _repo nonfree -%global israwhide 1 Name: rpmfusion-%{_repo}-release -Version: 37 -Release: 0.1 +Version: 9 +Release: 1 Summary: RPM Fusion (%{_repo}) Repository Configuration License: BSD URL: http://rpmfusion.org -Source1: rpmfusion-%{_repo}.repo +Source0: RPM-GPG-KEY-rpmfusion-%{_repo}-el-9 Source2: rpmfusion-%{_repo}-updates.repo Source3: rpmfusion-%{_repo}-updates-testing.repo -Source4: rpmfusion-%{_repo}-rawhide.repo Source5: rpmfusion-%{_repo}-tainted.repo -Source33: RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-2020 +#Source6: rpmfusion-%{_repo}-next.repo +#Source7: rpmfusion-%{_repo}-next-testing.repo BuildArch: noarch -Requires: system-release(%{version}) -Provides: rpmfusion-%{_repo}-repos(%{version}) +Requires: redhat-release >= %{version} +Requires: epel-release >= %{version} -%if 0%{?israwhide} -Obsoletes: %{name}-rawhide < %{version}-%{release} -Provides: %{name}-rawhide = %{version}-%{release} -%endif - -%description -RPM Fusion %{_repo} package repository files for yum and dnf -along with gpg public keys +%if "%{_repo}" == "nonfree" +Requires: rpmfusion-free-release >= %{version} -%if ! 0%{?israwhide} -%package rawhide -Summary: RPM Fusion Rawhide %{_repo} repo definitions -Requires: %{name} = %{version}-%{release} +%description +RPM Fusion repository contains open source and other distributable software for +EL + EPEL. It is the merger of the Dribble, FreshRPMs and Livna repositories. + +This package contains the RPM Fusion GPG key as well as Yum package manager +configuration files for RPM Fusion's "nonfree" repository, which holds +software that is not considered as Open Source Software according to the +Fedora packaging guidelines. +%else +%description +RPM Fusion repository contains open source and other distributable software for +EL + EPEL. It is the merger of the Dribble, FreshRPMs and Livna repositories. -%description rawhide -This package provides the RPM Fusion rawhide %{_repo} repo definitions. +This package contains the RPM Fusion GPG key as well as Yum package manager +configuration files for RPM Fusion's "free" repository, which holds only +software that is considered as Open Source Software according to the Fedora +packaging guidelines. %endif %package tainted @@ -46,6 +49,15 @@ Requires: %{name} = %{version}-%{release} %description tainted This package provides the RPM Fusion %{_repo} Tainted repo definitions. +#%%package next +#Summary: RPM Fusion %{_repo} Next repo definition +#Requires: %{name} = %{version}-%{release} +#Recommends: (%{name}-next if centos-stream-release) +# +#%%description next +#This package provides the RPM Fusion %{_repo} Next repo definitions. + + %prep echo "Nothing to prep" @@ -53,334 +65,57 @@ echo "Nothing to prep" echo "Nothing to build" %install - # Create dirs install -d -m755 \ %{buildroot}%{_sysconfdir}/pki/rpm-gpg \ %{buildroot}%{_sysconfdir}/yum.repos.d # GPG Key -%{__install} -Dp -m644 \ - %{SOURCE33} \ +%{__install} -Dp -m644 %{SOURCE0} \ %{buildroot}%{_sysconfdir}/pki/rpm-gpg -# Avoid using basearch in name for the key. Introduced in F18 -ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-35 -ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-36 -ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-37 - -# Links for the keys -ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-latest -ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-rawhide - - # Yum .repo files %{__install} -p -m644 \ - %{SOURCE1} \ %{SOURCE2} \ %{SOURCE3} \ - %{SOURCE4} \ %{SOURCE5} \ %{buildroot}%{_sysconfdir}/yum.repos.d %files %config %{_sysconfdir}/pki/rpm-gpg/* -%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-updates*.repo -%if ! 0%{?israwhide} -%files rawhide -%endif -%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-rawhide.repo - %files tainted %config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo -%changelog -* Sun Feb 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 37-0.1 -- Bump for 37 - -* Sat Aug 14 2021 Leigh Scott <leigh123linux(a)gmail.com> - 36-0.1 -- Bump for 36 - -* Thu Feb 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 35-0.1 -- Bump for 35 - -* Fri Aug 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 34-0.1 -- Bump for 34 - -* Fri Feb 21 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 33-0.2 -- Rebuild for 2020 key - -* Mon Feb 17 2020 Leigh Scott <leigh123linux(a)gmail.com> - 33-0.1 -- Bump for 33 - -* Mon Oct 21 2019 Leigh Scott <leigh123linux(a)gmail.com> - 32-0.2 -- Remove f30 key -- Add f33 key - -* Tue Aug 20 2019 Leigh Scott <leigh123linux(a)gmail.com> - 32-0.1 -- Bump for 32 +#%%files next +#%%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-next*.repo -* Tue Apr 09 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 31-0.2 -- Remove f29 key -- Add f32 key - -* Sun Mar 31 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 31-0.1 -- Bump for 31 +%changelog +* Fri Mar 11 2022 Xavier Bachelot <xavier(a)bachelot.org> - 9-1 +- Release for EL-9 -* Thu Oct 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.2 -- Remove f28 key -- Add f31 key +* Thu Nov 25 2021 Xavier Bachelot <xavier(a)bachelot.org> - 8-1 +- Create sub-package for next repos -* Thu Aug 23 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.1 -- Bump for 30 +* Wed Jan 09 2019 Xavier Bachelot <xavier(a)bachelot.org> - 8-0.1 +- Release for EL-8. -* Tue Apr 17 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 29-0.4 -- Remove compatibility symlink +* Tue Jun 19 2018 Xavier Bachelot <xavier(a)bachelot.org> - 7-4 +- Don't use $releasever, it's not expanding as expected on RHEL (RFBZ#4943). -* Mon Apr 16 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 29-0.3 -- Enable metadata -- Remove f27 key -- Add f30 key +* Tue Jun 19 2018 Xavier Bachelot <xavier(a)bachelot.org> - 7-3 +- Only include tainted repo definition in tainted sub-package. -* Mon Mar 19 2018 Xavier Bachelot <xavier(a)bachelot.org> - 29-0.2 +* Mon Mar 19 2018 Xavier Bachelot <xavier(a)bachelot.org> - 7-2 - Create sub-package for tainted repo. -* Mon Mar 05 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 29-0.1 -- Bump to 29 - -* Mon Nov 13 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 28-0.3 -- Add f29 key -- Remove f26 key - -* Wed Sep 06 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 28-0.1 -- Bump for 28 - -* Fri Jul 07 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 27-0.3 -- Bump for f26 key - -* Tue Mar 28 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 27-0.2 -- Bump for 27 - -* Tue Mar 28 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 26-0.5 -- Add Zypper compatibility, patch by Neal Gompa - rfbz#4481 - -* Fri Nov 18 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 26-0.4 -- Add f26/f27 keys -- Remove f23/f24 keys -- Clean-up Description -- Improve Requires/Provides -- Drop dependency on free from nonfree -- Add a rawhide sub-package - rfbz#3223 -- Mark gpg keys as %%config - -* Wed Nov 02 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 26-0.3 -- Add metalink over https - -* Wed Aug 24 2016 Sérgio Basto <sergio(a)serjux.com> - 26-0.2 -- Fix current symlink and f25 symlink - -* Sat Aug 06 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 26-0.1 -- Bump for f26 - -* Fri Jun 24 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 25-0.2 -- Bump for rawhide release - -* Sun May 15 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 25-0.1 -- Update to 25 - -* Sat May 14 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 24-0.1 -- Update to 24 - -* Sat Oct 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 23-0.1 -- Bump for branched/f23 - -* Sat May 23 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 22-1 -- Update to Final F-22 - -* Tue May 05 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 22-0.1 -- Bump for branched/f22 - -* Mon Dec 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 21-1 -- Update to Final F-21 - -* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 21-0.1 -- Bump for Rawhide/F-21 - -* Sun Dec 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20-1 -- Update to f20 final - -* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20-0.2 -- Add key for Rawhide/F-21 -- Spec file clean-up - -* Mon Mar 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20-0.1 -- Build for Rawhide/F-20 - -* Thu Mar 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 19-0.4 -- Fix GPG's key name - -* Wed Mar 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 19-0.3 -- Branch F-19 - -* Tue Jan 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 19-0.2 -- Add key for Rawhide/F-20 - -* Mon Aug 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 19-0.1 -- Build for Rawhide/F-19 - -* Wed Aug 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 18-0.2 -- Bump for Branched/F-18 - -* Fri May 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 18-0.1 -- Build for Rawhide/F-18 - -* Fri May 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-1 -- Update to final 17 - -* Tue Mar 06 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-0.5 -- Bump - -* Mon Feb 27 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-0.4 -- Split to development/17 -- Enable rpmfusion*-updates-testing - -* Sat Feb 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-0.3 -- Bump for branched F-17 - -* Sat Nov 19 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 17-0.1 -- build for rawhide/F-17 -- Drop key for F-15 - -* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 16-1.2 -- Fix compat key for F-15 -- Fix Installation of F-17 key - -* Thu Oct 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 16-1 -- Add keys for Rawhide/F-17 -- Build for F-16 - -* Sun Jun 05 2011 Thorsten Leemhuis <fedora at leemhuis.info> - 16.1 -- build for rawhide/F-16 - -* Sat May 28 2011 Thorsten Leemhuis <fedora at leemhuis.info> - 15-1 -- Add keys for Rawhide/F16 -- Build for F-15 - -* Sat Oct 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.4 -- drop ppc -- add key for F-15, drop the one for F-13 - -* Sun Oct 10 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.3 -- branching for F14: disable rawhide, enable everything and updates - -* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.2 -- fix compatibility symlink - -* Sat Apr 24 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.1 -- rebuild for rawhide - -* Fri Apr 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 13-1 -- add key for Rawhide/F14 -- remove key for F12 - -* Sun Nov 22 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 13-0.1 -- Bump for Fedora 13's rawhide. -- Put the version at 13 from the start. -- drop post script - -* Sun Nov 15 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 12-1 -- F12 release: disable rawhide, enable everything and updates -- remove key for F11 -- add key for F13 - -* Thu Jun 11 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11.90-1 -- build for rawhide (enable rawhide, disable all the other repos) - -* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11-1 -- F11 release: disable rawhide, enable everything and updates -- use "metadata_expire=7d" for everything repos -- Track in some changes from 10-{34} (myself): --- remove old comments to obsolete release packages from freshrpms, dribble and livna --- add proper links for rawhide --- add key for F12 --- some small adjustments to the spec --- add post script that switch old config files from serverside mirrorlists to - mirrormanager -- Track in some changes from 10-{23} (Till Maas): --- fix symlinks --- allow easy transition to F11 with new gpg key and naming structure - -* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10-4 -- add key for F12 -- some small adjustments to the spec -- add post script that switch old config files from serverside mirrorlists to - mirrormanager - -* Sat May 16 2009 Till Maas <opensource(a)till.name> - 10-3 -- fix symlinks - -* Sat May 16 2009 Till Maas <opensource(a)till.name> - 10-2 -- allow easy transition to F11 with new gpg key and naming structure - -* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.90-3 -- rebuild for new F11 features - -* Sat Mar 21 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10.90-2 -- add new key for SHA256 signatures -- use the same structure for keys as fedora does - -* Wed Nov 26 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 10.90-1 -- Initial build for Fedora 11. - -* Sat Nov 15 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 10-1 -- build for F-10 - -* Mon Nov 03 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-5 -- enable the proper mirrormanager server in the repo files - -* Sat Oct 04 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-4 -- require system-release instead of fedora-release - -* Tue Sep 30 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-3 -- s|download.rpmfusion.org|download1.rpmfusion.org|' *.repo -- s|basearch/debug/|basearch/os/debug/|" in *rawhide.repo - -* Sun Sep 28 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-2 -- Fix rpmfusion-rpmfusion typo (again) -- update summary to properly say free or nonfree - -* Sat Sep 27 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-1 -- Update for Fedora 10 rawhide -- enable devel repos, disable all the others - -* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-7 -- Use temporary mirrorlists for now, and baseurl for the debug & source repos - -* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-6 -- Fix rpmfusion-rpmfusion typo - -* Mon Aug 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-5 -- Use mirrors.rpmfusion.org instead of rpmfusion.org/mirrorlist -- Use download.rpmfusion.org instead of download1.rpmfusion.org - -* Fri Aug 15 2008 Stewart Adam <s.adam at diffingo.com> - 9-4 -- Only include provides/obsoletes for pre-merger release RPMs in nonfree -- Remove GPL doc - -* Thu Aug 14 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9-3 -- add conditionals and macros to use one spec file for both free and nonfree -- some cleanups - -* Wed Aug 13 2008 Stewart Adam <s.adam at diffingo.com> - 9-2 -- Split into free and non-free RPMs based on original release RPM -- Remove double BuildArch -- Remove GPL source -- Fix mirror URLs -- devel --> rawhide +* Thu Sep 15 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 7-1 +- Release for EL-7 -* Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 9-1 -- Initial RPM release +* Tue Jun 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 6-1 +- Release for EL-6 +* Sun May 01 2011 Robert Scheck <robert(a)fedoraproject.org> 6-0.1 +- Initial RPM release based on Thorsten Leemhuis' work for EL-5 diff --git a/rpmfusion-nonfree-tainted.repo b/rpmfusion-nonfree-tainted.repo index ee408aa..482d22c 100644 --- a/rpmfusion-nonfree-tainted.repo +++ b/rpmfusion-nonfree-tainted.repo @@ -1,33 +1,33 @@ [rpmfusion-nonfree-tainted] -name=RPM Fusion for Fedora $releasever - Nonfree tainted -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Nonfree tainted +#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/9/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-9&arch=$basearch enabled=1 metadata_expire=14d type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 [rpmfusion-nonfree-tainted-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree tainted - Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Nonfree tainted - Debug +#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/9/$basearch/debug/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-debug-9&arch=$basearch enabled=0 metadata_expire=7d type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 [rpmfusion-nonfree-tainted-source] -name=RPM Fusion for Fedora $releasever - Nonfree tainted - Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Nonfree tainted - Source +#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/9/SRPMS/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-source-9&arch=$basearch enabled=0 metadata_expire=7d type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 diff --git a/rpmfusion-nonfree-updates-testing.repo b/rpmfusion-nonfree-updates-testing.repo index 90ba1c0..42bdf2d 100644 --- a/rpmfusion-nonfree-updates-testing.repo +++ b/rpmfusion-nonfree-updates-testing.repo @@ -1,30 +1,30 @@ [rpmfusion-nonfree-updates-testing] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Nonfree - Test Updates +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/testing/9/$basearch/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=nonfree-el-updates-testing-9&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 [rpmfusion-nonfree-updates-testing-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-debug-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Nonfree - Test Updates Debug +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/testing/9/$basearch/debug/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=nonfree-el-updates-testing-debug-9&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 [rpmfusion-nonfree-updates-testing-source] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-source-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Nonfree - Test Updates Source +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/testing/9/SRPMS/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=nonfree-el-updates-testing-source-9&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 diff --git a/rpmfusion-nonfree-updates.repo b/rpmfusion-nonfree-updates.repo index f41d15e..625323f 100644 --- a/rpmfusion-nonfree-updates.repo +++ b/rpmfusion-nonfree-updates.repo @@ -1,30 +1,30 @@ [rpmfusion-nonfree-updates] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch -enabled=0 +name=RPM Fusion for EL 9 - Nonfree - Updates +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/9/$basearch/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=nonfree-el-updates-released-9&arch=$basearch +enabled=1 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 [rpmfusion-nonfree-updates-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Nonfree - Updates Debug +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/9/$basearch/debug/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=nonfree-el-updates-released-debug-9&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9 [rpmfusion-nonfree-updates-source] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Nonfree - Updates Source +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/9/SRPMS/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=nonfree-el-updates-released-source-9&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-9

2 years, 8 months

1
0
0 / 0

[rpmfusion-free-release/el9] Release for EL-9

by Xavier Bachelot

commit 4d2adf477a991cd7ad80930a59b3cf087ed06f9d Author: Xavier Bachelot <xavier(a)bachelot.org> Date: Fri Mar 11 18:05:33 2022 +0100 Release for EL-9 rpmfusion-free-next-testing.repo | 33 ++++ rpmfusion-free-next.repo | 33 ++++ rpmfusion-free-rawhide.repo | 30 --- rpmfusion-free-release.spec | 374 ++++++------------------------------ rpmfusion-free-tainted.repo | 24 +-- rpmfusion-free-updates-testing.repo | 24 +-- rpmfusion-free-updates.repo | 27 ++- rpmfusion-free.repo | 33 ---- 8 files changed, 158 insertions(+), 420 deletions(-) --- diff --git a/rpmfusion-free-next-testing.repo b/rpmfusion-free-next-testing.repo new file mode 100644 index 0000000..862b933 --- /dev/null +++ b/rpmfusion-free-next-testing.repo @@ -0,0 +1,33 @@ +[rpmfusion-free-next-testing] +name=RPM Fusion for EL 9 - Free - Next Test Updates +#baseurl=http://download1.rpmfusion.org/free/el/testing/next/9/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-el-next-testing-9&arch=$basearch +enabled=0 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 + +[rpmfusion-free-next-testing-debuginfo] +name=RPM Fusion for EL 9 - Free - Next Test Debug +#baseurl=http://download1.rpmfusion.org/free/el/testing/next/9/$basearch/debug/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-el-next-testing-debug-9&arch=$basearch +enabled=0 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 + +[rpmfusion-free-next-testing-source] +name=RPM Fusion for EL 9 - Free - Next Test Source +#baseurl=http://download1.rpmfusion.org/free/el/testing/next/9/SRPMS/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-el-next-testing-source-9&arch=$basearch +enabled=0 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 + diff --git a/rpmfusion-free-next.repo b/rpmfusion-free-next.repo new file mode 100644 index 0000000..e41ca1d --- /dev/null +++ b/rpmfusion-free-next.repo @@ -0,0 +1,33 @@ +[rpmfusion-free-next] +name=RPM Fusion for EL 9 - Free - Next +#baseurl=http://download1.rpmfusion.org/free/el/next/9/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-el-next-9&arch=$basearch +enabled=1 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 + +[rpmfusion-free-next-debuginfo] +name=RPM Fusion for EL 9 - Free - Next Debug +#baseurl=http://download1.rpmfusion.org/free/el/next/9/$basearch/debug/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-el-next-debug-9&arch=$basearch +enabled=0 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 + +[rpmfusion-free-next-source] +name=RPM Fusion for EL 9 - Free - Next Source +#baseurl=http://download1.rpmfusion.org/free/el/next/9/SRPMS/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-el-next-source-9&arch=$basearch +enabled=0 +metadata_expire=6h +type=rpm-md +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 + diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec index 05d2231..aa219c0 100644 --- a/rpmfusion-free-release.spec +++ b/rpmfusion-free-release.spec @@ -1,42 +1,45 @@ %global _repo free #global _repo nonfree -%global israwhide 1 Name: rpmfusion-%{_repo}-release -Version: 37 -Release: 0.1 +Version: 9 +Release: 1 Summary: RPM Fusion (%{_repo}) Repository Configuration License: BSD URL: http://rpmfusion.org -Source1: rpmfusion-%{_repo}.repo +Source0: RPM-GPG-KEY-rpmfusion-%{_repo}-el-9 Source2: rpmfusion-%{_repo}-updates.repo Source3: rpmfusion-%{_repo}-updates-testing.repo -Source4: rpmfusion-%{_repo}-rawhide.repo Source5: rpmfusion-%{_repo}-tainted.repo -Source33: RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-2020 +#Source6: rpmfusion-%{_repo}-next.repo +#Source7: rpmfusion-%{_repo}-next-testing.repo BuildArch: noarch -Requires: system-release(%{version}) -Provides: rpmfusion-%{_repo}-repos(%{version}) +Requires: redhat-release >= %{version} +Requires: epel-release >= %{version} -%if 0%{?israwhide} -Obsoletes: %{name}-rawhide < %{version}-%{release} -Provides: %{name}-rawhide = %{version}-%{release} -%endif - -%description -RPM Fusion %{_repo} package repository files for yum and dnf -along with gpg public keys +%if "%{_repo}" == "nonfree" +Requires: rpmfusion-free-release >= %{version} -%if ! 0%{?israwhide} -%package rawhide -Summary: RPM Fusion Rawhide %{_repo} repo definitions -Requires: %{name} = %{version}-%{release} +%description +RPM Fusion repository contains open source and other distributable software for +EL + EPEL. It is the merger of the Dribble, FreshRPMs and Livna repositories. + +This package contains the RPM Fusion GPG key as well as Yum package manager +configuration files for RPM Fusion's "nonfree" repository, which holds +software that is not considered as Open Source Software according to the +Fedora packaging guidelines. +%else +%description +RPM Fusion repository contains open source and other distributable software for +EL + EPEL. It is the merger of the Dribble, FreshRPMs and Livna repositories. -%description rawhide -This package provides the RPM Fusion rawhide %{_repo} repo definitions. +This package contains the RPM Fusion GPG key as well as Yum package manager +configuration files for RPM Fusion's "free" repository, which holds only +software that is considered as Open Source Software according to the Fedora +packaging guidelines. %endif %package tainted @@ -46,6 +49,15 @@ Requires: %{name} = %{version}-%{release} %description tainted This package provides the RPM Fusion %{_repo} Tainted repo definitions. +#%%package next +#Summary: RPM Fusion %{_repo} Next repo definition +#Requires: %{name} = %{version}-%{release} +#Recommends: (%{name}-next if centos-stream-release) +# +#%%description next +#This package provides the RPM Fusion %{_repo} Next repo definitions. + + %prep echo "Nothing to prep" @@ -53,333 +65,57 @@ echo "Nothing to prep" echo "Nothing to build" %install - # Create dirs install -d -m755 \ %{buildroot}%{_sysconfdir}/pki/rpm-gpg \ %{buildroot}%{_sysconfdir}/yum.repos.d # GPG Key -%{__install} -Dp -m644 \ - %{SOURCE33} \ +%{__install} -Dp -m644 %{SOURCE0} \ %{buildroot}%{_sysconfdir}/pki/rpm-gpg -# Avoid using basearch in name for the key. Introduced in F18 -ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-35 -ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-36 -ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-37 - -# Links for the keys -ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-latest -ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-rawhide - - # Yum .repo files %{__install} -p -m644 \ - %{SOURCE1} \ %{SOURCE2} \ %{SOURCE3} \ - %{SOURCE4} \ %{SOURCE5} \ %{buildroot}%{_sysconfdir}/yum.repos.d %files %config %{_sysconfdir}/pki/rpm-gpg/* -%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-updates*.repo -%if ! 0%{?israwhide} -%files rawhide -%endif -%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-rawhide.repo - %files tainted %config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo -%changelog -* Sun Feb 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 37-0.1 -- Bump for 37 - -* Sat Aug 14 2021 Leigh Scott <leigh123linux(a)gmail.com> - 36-0.1 -- Bump for 36 - -* Thu Feb 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 35-0.1 -- Bump for 35 -- Remove f32 key - -* Fri Aug 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 34-0.1 -- Bump for 34 -- Remove f31 key - -* Mon Feb 17 2020 Leigh Scott <leigh123linux(a)gmail.com> - 33-0.1 -- Bump for 33 - -* Mon Oct 21 2019 Leigh Scott <leigh123linux(a)gmail.com> - 32-0.2 -- Remove f30 key -- Add f33 key - -* Tue Aug 20 2019 Leigh Scott <leigh123linux(a)gmail.com> - 32-0.1 -- Bump for 32 - -* Mon Apr 08 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 31-0.2 -- Remove f29 key -- Add f32 key +#%%files next +#%%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-next*.repo -* Sun Mar 31 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 31-0.1 -- Bump for 31 +%changelog +* Fri Mar 11 2022 Xavier Bachelot <xavier(a)bachelot.org> - 9-1 +- Release for EL-9 -* Thu Oct 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.2 -- Remove f28 key -- Add f31 key +* Thu Nov 25 2021 Xavier Bachelot <xavier(a)bachelot.org> - 8-1 +- Create sub-package for next repos -* Thu Aug 23 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.1 -- Bump for 30 +* Wed Jan 09 2019 Xavier Bachelot <xavier(a)bachelot.org> - 8-0.1 +- Release for EL-8. -* Tue Apr 17 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 29-0.4 -- Remove compatibility symlink +* Tue Jun 19 2018 Xavier Bachelot <xavier(a)bachelot.org> - 7-4 +- Don't use $releasever, it's not expanding as expected on RHEL. -* Mon Apr 16 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 29-0.3 -- Enable metadata -- Remove f27 key -- Add f30 key +* Tue Jun 19 2018 Xavier Bachelot <xavier(a)bachelot.org> - 7-3 +- Only include tainted repo definition in tainted sub-package. -* Mon Mar 19 2018 Xavier Bachelot <xavier(a)bachelot.org> - 29-0.2 +* Mon Mar 19 2018 Xavier Bachelot <xavier(a)bachelot.org> - 7-2 - Create sub-package for tainted repo. -* Mon Mar 05 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 29-0.1 -- Bump to 29 - -* Mon Nov 13 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 28-0.3 -- Add f29 key -- Remove f26 key - -* Wed Sep 06 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 28-0.1 -- Bump for 28 - -* Fri Jul 07 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 27-0.3 -- Bump for f26 key - -* Tue Mar 28 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 27-0.2 -- Bump for 27 - -* Tue Mar 28 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 26-0.5 -- Add Zypper compatibility, patch by Neal Gompa - rfbz#4481 - -* Fri Nov 18 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 26-0.4 -- Add f26/f27 keys -- Remove f23/f24 keys -- Clean-up Description -- Improve Requires/Provides -- Drop dependency on free from nonfree -- Add a rawhide sub-package - rfbz#3223 -- Mark gpg keys as %%config - -* Wed Nov 02 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 26-0.3 -- Add metalink over https - -* Wed Aug 24 2016 Sérgio Basto <sergio(a)serjux.com> - 26-0.2 -- Fix current symlink and f25 symlink - -* Sat Aug 06 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 26-0.1 -- Bump for f26 - -* Fri Jun 24 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 25-0.2 -- Bump for rawhide release - -* Sun May 15 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 25-0.1 -- Update to 25 - -* Sat May 14 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 24-0.1 -- Update to 24 - -* Sat Oct 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 23-0.1 -- Bump for branched/f23 - -* Sat May 23 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 22-1 -- Update to Final F-22 - -* Tue May 05 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 22-0.1 -- Bump for branched/f22 - -* Mon Dec 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 21-1 -- Update to Final F-21 - -* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 21-0.1 -- Bump for Rawhide/F-21 - -* Sun Dec 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20-1 -- Update to f20 final - -* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20-0.2 -- Add key for Rawhide/F-21 -- Spec file clean-up - -* Mon Mar 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20-0.1 -- Build for Rawhide/F-20 - -* Thu Mar 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 19-0.4 -- Fix GPG's key name - -* Wed Mar 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 19-0.3 -- Branch F-19 - -* Tue Jan 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 19-0.2 -- Add key for Rawhide/F-20 - -* Mon Aug 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 19-0.1 -- Build for Rawhide/F-19 - -* Wed Aug 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 18-0.2 -- Bump for Branched/F-18 - -* Fri May 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 18-0.1 -- Build for Rawhide/F-18 - -* Fri May 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-1 -- Update to final 17 - -* Tue Mar 06 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-0.5 -- Bump - -* Mon Feb 27 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-0.4 -- Split to development/17 -- Enable rpmfusion*-updates-testing - -* Sat Feb 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-0.3 -- Bump for branched F-17 - -* Sat Nov 19 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 17-0.1 -- build for rawhide/F-17 -- Drop key for F-15 - -* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 16-1.2 -- Fix compat key for F-15 -- Fix Installation of F-17 key - -* Thu Oct 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 16-1 -- Add keys for Rawhide/F-17 -- Build for F-16 - -* Sun Jun 05 2011 Thorsten Leemhuis <fedora at leemhuis.info> - 16.1 -- build for rawhide/F-16 - -* Sat May 28 2011 Thorsten Leemhuis <fedora at leemhuis.info> - 15-1 -- Add keys for Rawhide/F16 -- Build for F-15 - -* Sat Oct 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.4 -- drop ppc -- add key for F-15, drop the one for F-13 - -* Sun Oct 10 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.3 -- branching for F14: disable rawhide, enable everything and updates - -* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.2 -- fix compatibility symlink - -* Sat Apr 24 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.1 -- rebuild for rawhide - -* Fri Apr 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 13-1 -- add key for Rawhide/F14 -- remove key for F12 - -* Sun Nov 22 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 13-0.1 -- Bump for Fedora 13's rawhide. -- Put the version at 13 from the start. -- drop post script - -* Sun Nov 15 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 12-1 -- F12 release: disable rawhide, enable everything and updates -- remove key for F11 -- add key for F13 - -* Thu Jun 11 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11.90-1 -- build for rawhide (enable rawhide, disable all the other repos) - -* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11-1 -- F11 release: disable rawhide, enable everything and updates -- use "metadata_expire=7d" for everything repos -- Track in some changes from 10-{34} (myself): --- remove old comments to obsolete release packages from freshrpms, dribble and livna --- add proper links for rawhide --- add key for F12 --- some small adjustments to the spec --- add post script that switch old config files from serverside mirrorlists to - mirrormanager -- Track in some changes from 10-{23} (Till Maas): --- fix symlinks --- allow easy transition to F11 with new gpg key and naming structure - -* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10-4 -- add key for F12 -- some small adjustments to the spec -- add post script that switch old config files from serverside mirrorlists to - mirrormanager - -* Sat May 16 2009 Till Maas <opensource(a)till.name> - 10-3 -- fix symlinks - -* Sat May 16 2009 Till Maas <opensource(a)till.name> - 10-2 -- allow easy transition to F11 with new gpg key and naming structure - -* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.90-3 -- rebuild for new F11 features - -* Sat Mar 21 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10.90-2 -- add new key for SHA256 signatures -- use the same structure for keys as fedora does - -* Wed Nov 26 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 10.90-1 -- Initial build for Fedora 11. - -* Sat Nov 15 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 10-1 -- build for F-10 - -* Mon Nov 03 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-5 -- enable the proper mirrormanager server in the repo files - -* Sat Oct 04 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-4 -- require system-release instead of fedora-release - -* Tue Sep 30 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-3 -- s|download.rpmfusion.org|download1.rpmfusion.org|' *.repo -- s|basearch/debug/|basearch/os/debug/|" in *rawhide.repo - -* Sun Sep 28 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-2 -- Fix rpmfusion-rpmfusion typo (again) -- update summary to properly say free or nonfree - -* Sat Sep 27 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-1 -- Update for Fedora 10 rawhide -- enable devel repos, disable all the others - -* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-7 -- Use temporary mirrorlists for now, and baseurl for the debug & source repos - -* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-6 -- Fix rpmfusion-rpmfusion typo - -* Mon Aug 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-5 -- Use mirrors.rpmfusion.org instead of rpmfusion.org/mirrorlist -- Use download.rpmfusion.org instead of download1.rpmfusion.org - -* Fri Aug 15 2008 Stewart Adam <s.adam at diffingo.com> - 9-4 -- Only include provides/obsoletes for pre-merger release RPMs in nonfree -- Remove GPL doc - -* Thu Aug 14 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9-3 -- add conditionals and macros to use one spec file for both free and nonfree -- some cleanups - -* Wed Aug 13 2008 Stewart Adam <s.adam at diffingo.com> - 9-2 -- Split into free and non-free RPMs based on original release RPM -- Remove double BuildArch -- Remove GPL source -- Fix mirror URLs -- devel --> rawhide +* Thu Sep 15 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 7-1 +- Release for EL-7 -* Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 9-1 -- Initial RPM release +* Tue Jun 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 6-1 +- Release for EL-6 +* Sun May 01 2011 Robert Scheck <robert(a)fedoraproject.org> 6-0.1 +- Initial RPM release based on Thorsten Leemhuis' work for EL-5 diff --git a/rpmfusion-free-tainted.repo b/rpmfusion-free-tainted.repo index 906bf6f..21f4600 100644 --- a/rpmfusion-free-tainted.repo +++ b/rpmfusion-free-tainted.repo @@ -1,33 +1,33 @@ [rpmfusion-free-tainted] -name=RPM Fusion for Fedora $releasever - Free tainted -#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Free tainted +#baseurl=http://download1.rpmfusion.org/free/el/tainted/9/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-el-tainted-9&arch=$basearch enabled=1 metadata_expire=6h type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 [rpmfusion-free-tainted-debuginfo] -name=RPM Fusion for Fedora $releasever - Free tainted - Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Free tainted - Debug +#baseurl=http://download1.rpmfusion.org/free/el/tainted/9/$basearch/debug/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-el-tainted-debug-9&arch=$basearch enabled=0 metadata_expire=6h type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 [rpmfusion-free-tainted-source] -name=RPM Fusion for Fedora $releasever - Free tainted - Source -#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Free tainted - Source +#baseurl=http://download1.rpmfusion.org/free/el/tainted/9/SRPMS/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-el-tainted-source-9&arch=$basearch enabled=0 metadata_expire=6h type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 diff --git a/rpmfusion-free-updates-testing.repo b/rpmfusion-free-updates-testing.repo index 9c39b34..e057904 100644 --- a/rpmfusion-free-updates-testing.repo +++ b/rpmfusion-free-updates-testing.repo @@ -1,30 +1,30 @@ [rpmfusion-free-updates-testing] -name=RPM Fusion for Fedora $releasever - Free - Test Updates -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-testing-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Free - Test Updates +#baseurl=http://download1.rpmfusion.org/free/el/updates/testing/9/$basearch/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=free-el-updates-testing-9&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 [rpmfusion-free-updates-testing-debuginfo] -name=RPM Fusion for Fedora $releasever - Free - Test Updates Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-testing-debug-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Free - Test Updates Debug +#baseurl=http://download1.rpmfusion.org/free/el/updates/testing/9/$basearch/debug/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=free-el-updates-testing-debug-9&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 [rpmfusion-free-updates-testing-source] -name=RPM Fusion for Fedora $releasever - Free - Test Updates Source -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-testing-source-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Free - Test Updates Source +#baseurl=http://download1.rpmfusion.org/free/el/updates/testing/9/SRPMS/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=free-el-updates-testing-source-9&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 diff --git a/rpmfusion-free-updates.repo b/rpmfusion-free-updates.repo index 8cda551..33a3475 100644 --- a/rpmfusion-free-updates.repo +++ b/rpmfusion-free-updates.repo @@ -1,30 +1,29 @@ [rpmfusion-free-updates] -name=RPM Fusion for Fedora $releasever - Free - Updates -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch -enabled=0 -type=rpm-md +name=RPM Fusion for EL 9 - Free - Updates +#baseurl=http://download1.rpmfusion.org/free/el/updates/9/$basearch/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=free-el-updates-released-9&arch=$basearch +enabled=1 gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 [rpmfusion-free-updates-debuginfo] -name=RPM Fusion for Fedora $releasever - Free - Updates Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Free - Updates Debug +#baseurl=http://download1.rpmfusion.org/free/el/updates/9/$basearch/debug/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=free-el-updates-released-debug-9&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9 [rpmfusion-free-updates-source] -name=RPM Fusion for Fedora $releasever - Free - Updates Source -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch +name=RPM Fusion for EL 9 - Free - Updates Source +#baseurl=http://download1.rpmfusion.org/free/el/updates/9/SRPMS/ +metalink=http://mirrors.rpmfusion.org/metalink?repo=free-el-updates-released-source-9&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-el-9

2 years, 8 months

1
0
0 / 0

[chromium-freeworld/f36] Drop subzero patch

by Leigh Scott

Summary of changes: 19b5c58... Drop subzero patch (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 8 months

1
0
0 / 0

[chromium-freeworld] Drop subzero patch

by Leigh Scott

commit 19b5c58c6bd749d8f3442a50c1ba6ddabcdeb047 Author: Leigh Scott <leigh123linux(a)gmail.com> Date: Wed Mar 16 08:18:10 2022 +0000 Drop subzero patch chromium-freeworld.spec | 1 - chromium-gcc-12-subzero-fix.patch | 69 --------------------------------------- 2 files changed, 70 deletions(-) --- diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index 6305d62..1b99f68 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -208,7 +208,6 @@ Patch302: chromium-java-only-allowed-in-android-builds.patch Patch303: chromium-aarch64-cxxflags-addition.patch # Causes build error #Patch304: chromium-clang-format.patch -Patch305: chromium-gcc-12-subzero-fix.patch # RPM Fusion patches [free/chromium-freeworld]: Patch401: chromium-fix-vaapi-on-intel.patch

2 years, 8 months

1
0
0 / 0

[chromium-freeworld/f36] (2 commits) ...Update to 99.0.4844.74

by Leigh Scott

Summary of changes: 0f2984c... Add gcc compile option (*) 31c6eb1... Update to 99.0.4844.74 (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 8 months

1
0
0 / 0

[chromium-freeworld] Update to 99.0.4844.74

by Leigh Scott

commit 31c6eb1a68572d4d0f1a38d554c842893b04be98 Author: Leigh Scott <leigh123linux(a)gmail.com> Date: Wed Mar 16 07:20:20 2022 +0000 Update to 99.0.4844.74 chromium-freeworld.spec | 7 ++-- chromium-gcc-12-subzero-fix.patch | 69 +++++++++++++++++++++++++++++++++++++++ sources | 2 +- 3 files changed, 75 insertions(+), 3 deletions(-) --- diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index a9debb8..6305d62 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -42,8 +42,8 @@ ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 99.0.4844.51 -Release: 2%{?dist} +Version: 99.0.4844.74 +Release: 1%{?dist} Summary: Chromium built with all freeworld codecs and VA-API support License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: https://www.chromium.org/Home @@ -565,6 +565,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/vk_swiftshader_icd.json #########################################changelogs################################################# %changelog +* Tue Mar 15 2022 Leigh Scott <leigh123linux(a)gmail.com> - 99.0.4844.74-1 +- Update to 99.0.4844.74 + * Mon Mar 14 2022 Leigh Scott <leigh123linux(a)gmail.com> - 99.0.4844.51-2 - Test spec file changes diff --git a/chromium-gcc-12-subzero-fix.patch b/chromium-gcc-12-subzero-fix.patch new file mode 100644 index 0000000..fd5bbdb --- /dev/null +++ b/chromium-gcc-12-subzero-fix.patch @@ -0,0 +1,69 @@ +diff -up chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp.gcc12fix chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp +--- chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp.gcc12fix 2022-02-25 22:17:18.071775686 +0000 ++++ chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp 2022-02-25 22:17:40.964996468 +0000 +@@ -659,6 +659,7 @@ void emitIASOpTyGPR(const Cfg *Func, Typ + } + } + ++#if 0 + template <bool VarCanBeByte, bool SrcCanBeByte> + void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Var, + const Operand *Src, const GPREmitterRegOp &Emitter) { +@@ -697,6 +698,7 @@ void emitIASRegOpTyGPR(const Cfg *Func, + llvm_unreachable("Unexpected operand type"); + } + } ++#endif + + void emitIASAddrOpTyGPR(const Cfg *Func, Type Ty, const AsmAddress &Addr, + const Operand *Src, const GPREmitterAddrOp &Emitter) { +diff -up chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h.gcc12fix chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h +--- chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h.gcc12fix 2022-02-25 22:17:51.409640955 +0000 ++++ chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h 2022-02-25 22:19:13.478847553 +0000 +@@ -576,8 +576,44 @@ void emitIASXmmShift(const Cfg *Func, Ty + /// Emit a two-operand (GPR) instruction, where the dest operand is a Variable + /// that's guaranteed to be a register. + template <bool VarCanBeByte = true, bool SrcCanBeByte = true> +-void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Dst, +- const Operand *Src, const GPREmitterRegOp &Emitter); ++ ++void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Var, ++ const Operand *Src, const GPREmitterRegOp &Emitter) { ++ auto *Target = InstX86Base::getTarget(Func); ++ Assembler *Asm = Func->getAssembler<Assembler>(); ++ assert(Var->hasReg()); ++ // We cheat a little and use GPRRegister even for byte operations. ++ GPRRegister VarReg = VarCanBeByte ? RegX8664::getEncodedGPR(Var->getRegNum()) ++ : RegX8664::getEncodedGPR(Var->getRegNum()); ++ if (const auto *SrcVar = llvm::dyn_cast<Variable>(Src)) { ++ if (SrcVar->hasReg()) { ++ GPRRegister SrcReg = SrcCanBeByte ++ ? RegX8664::getEncodedGPR(SrcVar->getRegNum()) ++ : RegX8664::getEncodedGPR(SrcVar->getRegNum()); ++ (Asm->*(Emitter.GPRGPR))(Ty, VarReg, SrcReg); ++ } else { ++ AsmAddress SrcStackAddr = AsmAddress(SrcVar, Target); ++ (Asm->*(Emitter.GPRAddr))(Ty, VarReg, SrcStackAddr); ++ } ++ } else if (const auto *Mem = llvm::dyn_cast<X86OperandMem>(Src)) { ++ Mem->emitSegmentOverride(Asm); ++ (Asm->*(Emitter.GPRAddr))(Ty, VarReg, AsmAddress(Mem, Asm, Target)); ++ } else if (const auto *Imm = llvm::dyn_cast<ConstantInteger32>(Src)) { ++ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Imm->getValue())); ++ } else if (const auto *Imm = llvm::dyn_cast<ConstantInteger64>(Src)) { ++ assert(Utils::IsInt(32, Imm->getValue())); ++ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Imm->getValue())); ++ } else if (const auto *Reloc = llvm::dyn_cast<ConstantRelocatable>(Src)) { ++ const auto FixupKind = (Reloc->getName().hasStdString() && ++ Reloc->getName().toString() == GlobalOffsetTable) ++ ? FK_GotPC ++ : FK_Abs; ++ AssemblerFixup *Fixup = Asm->createFixup(FixupKind, Reloc); ++ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Fixup)); ++ } else { ++ llvm_unreachable("Unexpected operand type"); ++ } ++} + + /// Instructions of the form x := op(x). + template <typename InstX86Base::InstKindX86 K> diff --git a/sources b/sources index 1ba090c..34faf69 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (chromium-99.0.4844.51.tar.xz) = 85f81afa35907d59e7dee328c1c30d61a4106b8d5e9dabad4888c0a1962d8e4debfb88358417123979d8a4ad471acbf8d90c0a3bb2cc9bac5fef71b800bcc1af +SHA512 (chromium-99.0.4844.74.tar.xz) = d0b8d8fff715b249bbc214d30d7165ecd75f399c3a5d5234e7b8492bdfa2c0a1f24ed25ea33efe43f0c1210fa5ec65566be7eba7817e5566f1e0cdcae92214de SHA512 (chromium-patches-chromium-99-patchset-3.tar.gz) = 8dcd3acb256f32b1af0c0ef3eea61061c1d857f8887f2990ec170bc87a3f49a9a8b15dfe50ac05e3eedabea33e88365f91094550237b5500ffa7f66734523b76

2 years, 8 months

1
0
0 / 0

[chromium-freeworld] Add gcc compile option

by Leigh Scott

commit 0f2984c618f60f006b037269d8a2297dff41eb6b Author: Leigh Scott <leigh123linux(a)gmail.com> Date: Tue Mar 15 20:58:06 2022 +0000 Add gcc compile option chromium-freeworld.spec | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) --- diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index adea69e..a9debb8 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -5,6 +5,7 @@ %global _smp_build_ncpus 6 %endif %undefine _auto_set_build_flags +%global use_clang 1 #This can be any folder on out %global target out/Release ### Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -65,9 +66,13 @@ Source15: LICENSE ######################################################################################## #Compiler settings # Make sure we don't encounter any bug +%if %{use_clang} BuildRequires: clang, clang-tools-extra BuildRequires: lld BuildRequires: llvm +%else +BuildRequires: gcc-c++ +%endif # Basic tools and libraries needed for building BuildRequires: ninja-build, nodejs, bison, gperf, hwdata BuildRequires: libatomic, flex, perl-Switch @@ -203,6 +208,7 @@ Patch302: chromium-java-only-allowed-in-android-builds.patch Patch303: chromium-aarch64-cxxflags-addition.patch # Causes build error #Patch304: chromium-clang-format.patch +Patch305: chromium-gcc-12-subzero-fix.patch # RPM Fusion patches [free/chromium-freeworld]: Patch401: chromium-fix-vaapi-on-intel.patch @@ -332,20 +338,29 @@ export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig" ulimit -n 2048 #export compilar variables +%if %{use_clang} export CC="clang" export CXX="clang++" export AR="llvm-ar" export NM="llvm-nm" export READELF="llvm-readelf" +%else +export CC="gcc" +export CXX="g++" +export AR="ar" +export NM="nm" +export READELF="readelf" +%endif export RANLIB="ranlib" export PATH="$PWD/third_party/depot_tools:$PATH" export CHROMIUM_RPATH="%{_libdir}/%{name}" +%if %{use_clang} FLAGS='-Wno-unknown-warning-option' - export CFLAGS="$FLAGS" export CXXFLAGS="$FLAGS" +%endif CHROMIUM_GN_DEFINES= gn_arg() { CHROMIUM_GN_DEFINES="$CHROMIUM_GN_DEFINES $*"; } @@ -405,11 +420,15 @@ gn_arg enable_widevine=true gn_arg rtc_use_pipewire=true gn_arg rtc_link_pipewire=true +%if %{use_clang} gn_arg clang_base_path=\"%{_prefix}\" gn_arg is_clang=true gn_arg clang_use_chrome_plugins=false gn_arg use_lld=true gn_arg use_thin_lto=true +%else +gn_arg is_clang=false +%endif gn_arg is_cfi=false gn_arg use_cfi_icall=false gn_arg chrome_pgo_phase=0 @@ -426,6 +445,11 @@ gn_arg 'google_api_key="%{api_key}"' tools/gn/bootstrap/bootstrap.py --gn-gen-args="$CHROMIUM_GN_DEFINES" --build-path=%{target} %{target}/gn --script-executable=%{__python3} gen --args="$CHROMIUM_GN_DEFINES" %{target} %ninja_build -C %{target} chrome chrome_sandbox + +%if !%{use_clang} +# bug #827861, vk_swiftshader_icd.json not getting properly installed in out/Release +sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > %{target}/vk_swiftshader_icd.json +%endif ######################################Install#################################### %install mkdir -p %{buildroot}%{_bindir}

2 years, 8 months

1
0
0 / 0

[rpmfusion-nonfree-release/el9] Add el9-nonfree GPG key

by Nicolas Chauvet

commit fc65059d701cb1e74a0f0b3b6b95184ce14a73e0 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Tue Mar 15 21:39:50 2022 +0100 Add el9-nonfree GPG key RPM-GPG-KEY-rpmfusion-nonfree-el-9 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) --- diff --git a/RPM-GPG-KEY-rpmfusion-nonfree-el-9 b/RPM-GPG-KEY-rpmfusion-nonfree-el-9 new file mode 100644 index 0000000..cc4f581 --- /dev/null +++ b/RPM-GPG-KEY-rpmfusion-nonfree-el-9 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGIw3oUBEACyLvk0T9azCSv1WxywbmM1NvesSeyP3V0FGizlEDs6GOiTeV0c +0ARzC2dfak1ctUntHN1imbbpHHv3ovXEMxOF9iN2MUKn7ucy9pU2+/3J/Kex7WcA +h3nCGJ83Q1UD51KESnMi7OOJwMJQrQqDjnKDyUzccizkRThZF3z6VsqEogalVG2P +QxB278tQBGFCY5PKsA5tYQW+kDjTJPXlHvRqEId3eyyCsUnBvVZUp03kcnAPsZx8 +qw4tjlCGc5P3sXmMemJQbSOUQFv8vVwjMX7ZT78ib0jZZLO1JvSZMtskH8SuhpIf +qOM6ZOQpO0JXvvBPBK5B8Da5CFsFSkr9FsWw9ObgLHqAuTuhggZiSYyrHJvKt8w1 +lQ5wjGR3eMZ8cmjBUJK2XKtz5GdelXd6UontzS4I6jXwjMSdBdkUUOitk5y3lPS9 +XDqylXQ6582IBopTYRlR25UJ6IZMyCxTO3O5RJ/e5lWxWTRy9mHBEFHz2NRLKjBE +/Nke3fPA36x28ihAMsCP39d54Yh9AlpF/ITCDPjsQAwhrqPkfLG2mdepahrRZFXY +j7AoM77CTS57bE6B8l74E/AZL60sFQkxfJ86fIiSr+T7qhmYBAaPHzF6e+C+hI4L +sbQp9rNggWIMdAF3MWmcCzk8bnYegmxuOaqxuSAJsZ3kOSPI8S2jQZkBDQARAQAB +tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRUwgKDkpIDxycG1m +dXNpb24tZ3BnLWtleS1lbDktbm9uZnJlZUBycG1mdXNpb24ub3JnPokCRQQTAQgA +LxYhBLskEopLs8M1LAt1ouQXTmuqshLqBQJiMN6FAhsDBAsJCAcDFQgKAh4FAheA +AAoJEOQXTmuqshLqDXYP/i8Dv+ESfQ9HcpcbEIf8/3KlaAzjT0w2ia9Cr+CafVcA +PtXviDMgvp3n4+P4K+mIWLnYGDXuBmS5i1fA7paSWDeG4cjE3y74hQpohGEonxdl +O3r5nVoziBTn6/xmBVeNUN4ppxZiNKPrcEllddgswHyCvTs3/7QbN+uuM6ZQwZcv +aNh/FHT+7/Dd2U2+g4gJMd/5UZ3/0DwlhUynKJw+ZbUUh8s4iTPh5DpP6JM6/qaQ +tyD/VA5X29W3A1GECU6j2Y47pwQZHJSpT1DogzC/bXrX4sy4+lndRq+HuGflLVeY +eFZQOroSFJc3NhYw/bDZZ4z0YDtjrSX9RvL7gQGf2dXsBHYiPxH6+HGsNjUkkbfD +4m6ogCKrra3Z6ysOBuLXHWexwSomDjqkqQb9AX3NaQVeWU4ahto1Ht3/OVsEFKfE +4GjkOKa9SUtGfA63SkFow+2qAckBk1LCxZmOTwLD4H4lNom6RaHsxQq5A6YglD1+ +Rah60gxx9NWQPno7H9zp+IZDPTADAcw5rcakmNe+ba1AqOsQNb54cE4HKIp0tFc6 +5DlUiO6Oq8LSRRTYcVV3E1McokJQoZ6LgfMPzpgC9nokaiHOYdA1GNCmU43a8F2I +v4PTNjNDVl66ij8IfbPe7H+CFtD++r1sujR/olMWhUn5pjBMwIi0F/V1ynnODdZQ +=YRC3 +-----END PGP PUBLIC KEY BLOCK-----

2 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits March 2022