From 982f5c4c9fe7413b6b0b5a0cebf7d5d6100902df Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Jul 18 2019 13:17:12 +0000 Subject: [PATCH 1/20] "Adding package.cfg file" --- diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From e65f7f3d2352ae942835cf00c6713d950a12a296 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Jul 18 2019 20:29:48 +0000 Subject: [PATCH 2/20] Update for RHEL-8 Add playground repo data Clean out 90-epel.preset to make sure we dont override RHEL-8 items. Just add items in which EPEL needs. --- diff --git a/90-epel.preset b/90-epel.preset new file mode 100644 index 0000000..cd326d1 --- /dev/null +++ b/90-epel.preset @@ -0,0 +1,3 @@ +# Also see: +# https://fedoraproject.org/wiki/Starting_services_by_default + diff --git a/GPL b/GPL new file mode 100644 index 0000000..fd8bee7 --- /dev/null +++ b/GPL @@ -0,0 +1,347 @@ +***************************************************************************** +The following copyright applies to the Red Hat Linux compilation and any +portions of Red Hat Linux it does not conflict with. Whenever this +policy does conflict with the copyright of any individual portion of Red Hat +Linux, it does not apply. + +***************************************************************************** + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/Makefile b/Makefile deleted file mode 100644 index b8e65af..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: epel-release -# $Id$ -NAME := epel-release -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/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) diff --git a/RPM-GPG-KEY-EPEL-8 b/RPM-GPG-KEY-EPEL-8 new file mode 100644 index 0000000..30b69a6 --- /dev/null +++ b/RPM-GPG-KEY-EPEL-8 @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFz3zvsBEADJOIIWllGudxnpvJnkxQz2CtoWI7godVnoclrdl83kVjqSQp+2 +dgxuG5mUiADUfYHaRQzxKw8efuQnwxzU9kZ70ngCxtmbQWGmUmfSThiapOz00018 ++eo5MFabd2vdiGo1y+51m2sRDpN8qdCaqXko65cyMuLXrojJHIuvRA/x7iqOrRfy +a8x3OxC4PEgl5pgDnP8pVK0lLYncDEQCN76D9ubhZQWhISF/zJI+e806V71hzfyL +/Mt3mQm/li+lRKU25Usk9dWaf4NH/wZHMIPAkVJ4uD4H/uS49wqWnyiTYGT7hUbi +ecF7crhLCmlRzvJR8mkRP6/4T/F3tNDPWZeDNEDVFUkTFHNU6/h2+O398MNY/fOh +yKaNK3nnE0g6QJ1dOH31lXHARlpFOtWt3VmZU0JnWLeYdvap4Eff9qTWZJhI7Cq0 +Wm8DgLUpXgNlkmquvE7P2W5EAr2E5AqKQoDbfw/GiWdRvHWKeNGMRLnGI3QuoX3U +pAlXD7v13VdZxNydvpeypbf/AfRyrHRKhkUj3cU1pYkM3DNZE77C5JUe6/0nxbt4 +ETUZBTgLgYJGP8c7PbkVnO6I/KgL1jw+7MW6Az8Ox+RXZLyGMVmbW/TMc8haJfKL +MoUo3TVk8nPiUhoOC0/kI7j9ilFrBxBU5dUtF4ITAWc8xnG6jJs/IsvRpQARAQAB +tChGZWRvcmEgRVBFTCAoOCkgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB +AgAiBQJc9877AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAh6kWrL4bW +oWagD/4xnLWws34GByVDQkjprk0fX7Iyhpm/U7BsIHKspHLL+Y46vAAGY/9vMvdE +0fcr9Ek2Zp7zE1RWmSCzzzUgTG6BFoTG1H4Fho/7Z8BXK/jybowXSZfqXnTOfhSF +alwDdwlSJvfYNV9MbyvbxN8qZRU1z7PEWZrIzFDDToFRk0R71zHpnPTNIJ5/YXTw +NqU9OxII8hMQj4ufF11040AJQZ7br3rzerlyBOB+Jd1zSPVrAPpeMyJppWFHSDAI +WK6x+am13VIInXtqB/Cz4GBHLFK5d2/IYspVw47Solj8jiFEtnAq6+1Aq5WH3iB4 +bE2e6z00DSF93frwOyWN7WmPIoc2QsNRJhgfJC+isGQAwwq8xAbHEBeuyMG8GZjz +xohg0H4bOSEujVLTjH1xbAG4DnhWO/1VXLX+LXELycO8ZQTcjj/4AQKuo4wvMPrv +9A169oETG+VwQlNd74VBPGCvhnzwGXNbTK/KH1+WRH0YSb+41flB3NKhMSU6dGI0 +SGtIxDSHhVVNmx2/6XiT9U/znrZsG5Kw8nIbbFz+9MGUUWgJMsd1Zl9R8gz7V9fp +n7L7y5LhJ8HOCMsY/Z7/7HUs+t/A1MI4g7Q5g5UuSZdgi0zxukiWuCkLeAiAP4y7 +zKK4OjJ644NDcWCHa36znwVmkz3ixL8Q0auR15Oqq2BjR/fyog== +=84m8 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/epel-playground.repo b/epel-playground.repo new file mode 100644 index 0000000..cb0d69f --- /dev/null +++ b/epel-playground.repo @@ -0,0 +1,26 @@ +[epel-playground] +name=Extra Packages for Enterprise Linux $release - Playground - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release + +[epel-playground-debuginfo] +name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 + +[epel-playground-source] +name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec new file mode 100644 index 0000000..0305785 --- /dev/null +++ b/epel-release.spec @@ -0,0 +1,107 @@ +Name: epel-release +Version: 8 +Release: 1 +Summary: Extra Packages for Enterprise Linux repository configuration + +Group: System Environment/Base +License: GPLv2 + +# This is a EPEL maintained package which is specific to +# our distribution. Thus the source is only available from +# within this srpm. +URL: http://download.fedoraproject.org/pub/epel +Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 +Source1: GPL +Source2: epel.repo +Source3: epel-testing.repo +Source4: epel-playground.repo +# EPEL default preset policy (borrowed from fedora's 90-default.preset) +Source5: 90-epel.preset + +BuildArch: noarch +Requires: redhat-release >= %{version} +# epel-release is only for enterprise linux, not fedora +Conflicts: fedora-release + +%description +This package contains the Extra Packages for Enterprise Linux (EPEL) repository +GPG key as well as configuration for yum. + +%prep +%setup -q -c -T +install -pm 644 %{SOURCE0} . +install -pm 644 %{SOURCE1} . + +%build + + +%install +rm -rf $RPM_BUILD_ROOT + +#GPG Key +install -Dpm 644 %{SOURCE0} \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 + +# yum +install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} \ + $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc GPL +%config(noreplace) /etc/yum.repos.d/* +/etc/pki/rpm-gpg/* +%{_prefix}/lib/systemd/system-preset/90-epel.preset + +%changelog +* Thu Jul 18 2019 Stephen Smoogen - 8-1 +- Update for RHEL-8 +- Add playground repo data +- Clean out 90-epel.preset to make sure we dont override RHEL-8 items. Just add items in which EPEL needs. + +* Mon Oct 02 2017 Kevin Fenzi - 7-11 +- Add Conflicts on fedora-release to prevent people from installing on Fedora systems. Fixes bug #1497702 + +* Sat Jun 24 2017 Kevin Fenzi - 7-10 +- Change mirrorlist= in repo files to be metalink= (as thats what they are). Fixes bug #1451212 + +* Tue Dec 27 2016 Kevin Fenzi - 7-9 +- Add preset for drbdlinks package. Fixes bug #1405744 + +* Sat Jul 23 2016 Kevin Fenzi - 7-8 +- Drop duplicate libstoragemgmt from presets. Fixes bug #1358971 + +* Fri Jun 03 2016 Kevin Fenzi - 7-7 +- Drop initial-setup from presets. Fixes bug #1342511 + +* Wed Mar 30 2016 Jason L Tibbitts III - 7-6 +- Remove macros.epel; let epel-rpm-macros handle it instead. + +* Tue Nov 25 2014 Rex Dieter 7-5 +- fix typo in macros.epel + +* Fri Nov 21 2014 Rex Dieter 7-4 +- add systemd 90-epel.preset + +* Fri Nov 21 2014 Rex Dieter 7-3 +- implement %%epel macro + +* Tue Sep 02 2014 Kevin Fenzi 7-2 +- Make repo files config(noreplace). Fixes bug #1135576 + +* Thu Aug 28 2014 Dennis Gilmore - 7-1 +- enable gpg checking now we are out of beta + +* Wed Jun 18 2014 Kevin Fenzi 7-0.2 +- Drop unneeded up2date post/postun +- Fixed up description. +- Fixes bugs #1052434 and #1093918 + +* Mon Dec 16 2013 Dennis Gilmore - 7-0.1 +- initial epel 7 build. gpg cheking is disabled + diff --git a/epel-testing.repo b/epel-testing.repo new file mode 100644 index 0000000..77565b4 --- /dev/null +++ b/epel-testing.repo @@ -0,0 +1,26 @@ +[epel-testing] +name=Extra Packages for Enterprise Linux $release - Testing - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release + +[epel-testing-debuginfo] +name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 + +[epel-testing-source] +name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 diff --git a/epel.repo b/epel.repo new file mode 100644 index 0000000..ec74fa1 --- /dev/null +++ b/epel.repo @@ -0,0 +1,35 @@ +[epel] +name=Extra Packages for Enterprise Linux $release - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release + +[epel-modules] +name=Extra Packages for Enterprise Linux $release - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release + +[epel-debuginfo] +name=Extra Packages for Enterprise Linux $release - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 + +[epel-source] +name=Extra Packages for Enterprise Linux $release - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/$release/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 From e98c609e48f24a558ef326601582e8f7108f6dff Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Aug 01 2019 16:18:58 +0000 Subject: [PATCH 3/20] Make baseurl paths match dl.fedoraproject.org Add draft of epel8 packaging --- diff --git a/README-epel-8-packaging.md b/README-epel-8-packaging.md new file mode 100644 index 0000000..a561052 --- /dev/null +++ b/README-epel-8-packaging.md @@ -0,0 +1,175 @@ +# EPEL-8 Packaging Procedures + +## Introduction + +When a new Red Hat Enterprise Linux occurs, one of the steps to get +EPEL going for it is branching of various packages into new +namespace. The EPEL Steering Committee does not mass branch all +existing packages into the namespace because it has caused multiple +problems: + +1. The package maintainers did not want to support the package in the +newer version of EPEL. Package maintainers may only want to support +certain versions of Enterprise Linux or may want to wait until their +favourite derivative appears. + +2. The package does not work in the latest version of RHEL. With +multiple years between releases, software which worked on Fedora 18 +which would branch to EPEL-7 may not exist anymore with Fedora 28 and +EPEL-8 would need a completely different version. + +## Consumer request for packages + +People who are interested in getting packages into EPEL should contact +the package maintainer through +[bugzilla](https://bugzilla.redhat.com/). This allows for the requests +to be tracked and if the primary maintainer is not interested in +branching to EPEL, other ones can step in and do so. + +## EPEL Playground + +We have added an additional set of channels for EPEL-8 called +playground. It is meant to be sort of like Fedora Rawhide so that +packagers can work on versions of software which are too fast moving +or will have large API changes from what they are putting in the +regular channel. + +To try and make this transparent, we have made it so when a package is +built in epel8 it will normally also be built in +epel8-playground. This is done via a packages.cfg file which lists the +targets for fedpkg to build against. A successful package build will +then go through 2 different paths: + +* epel8 package will go into bodhi to be put into epel8-testing +* epel8-playground will bypass bodhi and go directly into + epel8-playground the next compose. + +If a packager needs to focus only on epel8 or epel8-playground they +can edit packages.cfg to change the ```target= epel8 +epel8-playground``` to ```target= epel8 ```. + +Packages in epel8-playground are primarily to be used in the following +manner: + +* To test out some new version of the package that might not be stable + yet. + +* To test out some new packaging of the package + +* To test a major version change of the package that they want to land + at the next epel8 minor release. + +* To build a package that will never be stable enough for epel8, but + still could be useful to some. + +* At minor RHEL releases (ie, 8.1, 8.2) people can pull in big changes + from playground to the main epel8 packages. Since people will be + upgrading and paying more attention than usual anyhow at those + points, it’s a great chance to do that change, but also you want to + make sure it’s panned out, so you can test before hand in + playground. + +Consumers should be aware that packages in EPEL8-playground are there +without any Service Level Expectations. You may want to only cherry +pick packages from there as needed. + +## Developer request for branching multiple packages + +Branching is handled the same way as requesting a branch using `fedpkg +request-branch`. A maintainer can request an epel8 branch using +`fedpkg request-branch epel8` which will create a ticket in +https://pagure.io/releng/fedora-scm-requests/issues and Release +Engineering will process these requests. + +To branch multiple packages please use this or a variant of this +script: + +``` +#!/usr/bin/sh +# Reminder to get an updated pagure token for releng tickets +# Usage: epel-8.sh foo bar goo blah blech +if [ $# -lt 1 ] +then + echo "At least one package name should be provided" +else + TMPDIR=`mktemp -d /tmp/epel8.XXXXXX` + pushd "$TMPDIR" + for pkg in "$@" + do + fedpkg clone "$pkg" + pushd "$pkg" + fedpkg request-branch epel8 + fedpkg request-branch epel8-playground + popd + done + rm -rfv "$TMPDIR" +fi +``` + +Releng will then work through the tickets in the system which is +adding branches to the PDC and src.fedoraproject.org. + + +## Known Issues + +1. /usr/bin/python does not exist. Choose ``/usr/bin/python3`` or +``/usr/bin/python2`` and patch appropriately. + +2. ``python2-sphinx`` is not shipped. Most packages should work with +python3-sphinx, and if it doesn't please open a bug. The python team +has been good about making fixes for this. + +3. When branching python packages, be aware that python in EL-8 is +python36 and not the version currently in rawhide. This has come up +with a couple of test packages where they assumed python37 or later. + +4. ``systemd-rpm-macros`` is not a separate packages. If needed, used +``BuildRequires: systemd`` + +5. While EL-8 comes with platform-python, it should NOT be used in +``Requires:`` unless absolutely neccessary. python3 should be used +instead. (Exceptions can be made but will be rare and need +justification.) + +**Accepted Exceptions:** +* Use python3.6dist(coverage) instead of python3-coverage. This + package is not shipped but is needed in %check code. + +6. Sometimes RHEL8 only has a python3 package for a dependency you +need for your build. (Example: python-bleach requires +python2-html5lib, but RHEL8 provides only python3-html5lib). For +EPEL-8.0 we only suggest one choice: + +* Choose not to have the python2 part of your package and patch + whatever to use python3. + +7. Python2 packages are discouraged. RHEL-8 will contain python2.7 +until probably the end of life of RHEL-7. However support upstream +will only be minimal. When modularity occurs, we suggest that you make +whatever python2 packages modules which can be pulled out when +RHEL-8.N no longer has python2. + +8. While a RHEL src.rpm might produce a -devel package, it may not +currently be in the build repository. When running into this please +open a ticket with https://pagure.io/epel/new_issue for us to put in a +request for it to be added to Red Hat's Code Ready Builder. After +modularity is enabled, changes to what is done will be needed. + +9. EPEL-8.0 may not work with the RHEL-8.1 beta. There seem to be +changes in dnf and zchunk which we have not worked out. This line will +be updated. + + +## Definitions + +1. Package maintainer. Person who has accepted responsibility to +package and maintain software in the Fedora Project ecosystem. The +main packager is usually someone focused on Fedora Linux, and +secondary packagers may be focused on particular use cases like EPEL. + +2. Consumer. A person who has subscribed to EPEL for packages but is +not a maintainer. + +3. PDC. Product Definition Center. A tool to help list the lifetime +and permissions that a product has so that branching and updates can +be better managed. diff --git a/epel-playground.repo b/epel-playground.repo index cb0d69f..ec567b2 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,6 +1,6 @@ [epel-playground] name=Extra Packages for Enterprise Linux $release - Playground - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/$basearch +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/$basearch/debug +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/SRPMS +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel-release.spec b/epel-release.spec index 0305785..83e3ae8 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 1 +Release: 2 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -17,6 +17,7 @@ Source3: epel-testing.repo Source4: epel-playground.repo # EPEL default preset policy (borrowed from fedora's 90-default.preset) Source5: 90-epel.preset +Source6: README-epel-8-packaging.md BuildArch: noarch Requires: redhat-release >= %{version} @@ -53,12 +54,16 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc GPL +%doc GPL %{SOURCE6} %config(noreplace) /etc/yum.repos.d/* /etc/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Thu Aug 1 2019 Stephen Smoogen - 8-2 +- Make baseurl paths match dl.fedoraproject.org +- Add draft of epel8 packaging + * Thu Jul 18 2019 Stephen Smoogen - 8-1 - Update for RHEL-8 - Add playground repo data diff --git a/epel-testing.repo b/epel-testing.repo index 77565b4..8f4ad36 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,6 +1,6 @@ [epel-testing] name=Extra Packages for Enterprise Linux $release - Testing - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/$basearch +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/$basearch/debug +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/SRPMS +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel.repo b/epel.repo index ec74fa1..bdc00e7 100644 --- a/epel.repo +++ b/epel.repo @@ -1,6 +1,6 @@ [epel] name=Extra Packages for Enterprise Linux $release - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=1 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release [epel-modules] name=Extra Packages for Enterprise Linux $release - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release [epel-debuginfo] name=Extra Packages for Enterprise Linux $release - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch/debug +#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -27,7 +27,7 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux $release - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/$release/SRPMS +#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 From a22cc24750d85a9ca265392dbcb3d9a02a55d59d Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Aug 01 2019 16:51:53 +0000 Subject: [PATCH 4/20] Fix docs Make it so we only build epel-release against epel8 --- diff --git a/epel-release.spec b/epel-release.spec index 83e3ae8..ffa4d01 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -32,6 +32,7 @@ GPG key as well as configuration for yum. %setup -q -c -T install -pm 644 %{SOURCE0} . install -pm 644 %{SOURCE1} . +install -pm 644 %{SOURCE6} . %build @@ -54,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc GPL %{SOURCE6} +%doc GPL README-epel-8-packaging.md %config(noreplace) /etc/yum.repos.d/* /etc/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset @@ -63,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 1 2019 Stephen Smoogen - 8-2 - Make baseurl paths match dl.fedoraproject.org - Add draft of epel8 packaging +- Fix docs * Thu Jul 18 2019 Stephen Smoogen - 8-1 - Update for RHEL-8 diff --git a/package.cfg b/package.cfg index 66ea79d..b728443 100644 --- a/package.cfg +++ b/package.cfg @@ -1,2 +1,2 @@ [koji] -targets = epel8 epel8-playground \ No newline at end of file +targets = epel8 From 57036bfd912393a4bf51487e7b4f26a9eb7e8e3d Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Aug 01 2019 18:23:12 +0000 Subject: [PATCH 5/20] Make sure that the key name is named correctly --- diff --git a/epel-release.spec b/epel-release.spec index ffa4d01..8d98b58 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 2 +Release: 3 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -42,7 +42,7 @@ rm -rf $RPM_BUILD_ROOT #GPG Key install -Dpm 644 %{SOURCE0} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version} # yum install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Thu Aug 1 2019 Stephen Smoogen - 8-3 +- Make sure that the key name is named correctly + * Thu Aug 1 2019 Stephen Smoogen - 8-2 - Make baseurl paths match dl.fedoraproject.org - Add draft of epel8 packaging From 2daff7c80bd808548b8ce210c9d5b1cc2130d560 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Aug 01 2019 19:36:55 +0000 Subject: [PATCH 6/20] Use the correct dnf var for release --- diff --git a/epel-playground.repo b/epel-playground.repo index ec567b2..b8ac302 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,26 +1,26 @@ [epel-playground] -name=Extra Packages for Enterprise Linux $release - Playground - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/$basearch +name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-playground-debuginfo] -name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/$basearch/debug +name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-playground-source] -name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/SRPMS +name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 8d98b58..6d6de8e 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Thu Aug 1 2019 Pablo Greco +- Use the correct var for dnf to expand + * Thu Aug 1 2019 Stephen Smoogen - 8-3 - Make sure that the key name is named correctly diff --git a/epel-testing.repo b/epel-testing.repo index 8f4ad36..1c6fb48 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,26 +1,26 @@ [epel-testing] -name=Extra Packages for Enterprise Linux $release - Testing - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-testing-debuginfo] -name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-testing-source] -name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel.repo b/epel.repo index bdc00e7..05bf03b 100644 --- a/epel.repo +++ b/epel.repo @@ -1,35 +1,35 @@ [epel] -name=Extra Packages for Enterprise Linux $release - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=1 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-modules] -name=Extra Packages for Enterprise Linux $release - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-debuginfo] -name=Extra Packages for Enterprise Linux $release - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-source] -name=Extra Packages for Enterprise Linux $release - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 From 9da52b467755575970a6cb70db79493a8c35e195 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Aug 01 2019 19:37:11 +0000 Subject: [PATCH 7/20] Update playground source url --- diff --git a/epel-playground.repo b/epel-playground.repo index b8ac302..2640d71 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -18,7 +18,7 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/SRPMS +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel-release.spec b/epel-release.spec index 6d6de8e..f02bc95 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -63,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Aug 1 2019 Pablo Greco - Use the correct var for dnf to expand +- Update playground source url * Thu Aug 1 2019 Stephen Smoogen - 8-3 - Make sure that the key name is named correctly From 5b8f9944f462ee743c494b78807ed6edba70d0a8 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Aug 01 2019 19:37:15 +0000 Subject: [PATCH 8/20] Remove epel-modules repo --- diff --git a/epel-release.spec b/epel-release.spec index f02bc95..c198c28 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -64,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 1 2019 Pablo Greco - Use the correct var for dnf to expand - Update playground source url +- Remove epel-modules repo * Thu Aug 1 2019 Stephen Smoogen - 8-3 - Make sure that the key name is named correctly diff --git a/epel.repo b/epel.repo index 05bf03b..42a8413 100644 --- a/epel.repo +++ b/epel.repo @@ -7,15 +7,6 @@ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever -[epel-modules] -name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever - [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug #baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug From b59329d67602de41bd387043d47c9c70598d93dc Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Aug 01 2019 19:39:08 +0000 Subject: [PATCH 9/20] Use https in baseurl --- diff --git a/epel-playground.repo b/epel-playground.repo index 2640d71..c162827 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,6 +1,6 @@ [epel-playground] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel-release.spec b/epel-release.spec index c198c28..6d8c6b7 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 3 +Release: 4 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -61,10 +61,11 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog -* Thu Aug 1 2019 Pablo Greco +* Thu Aug 1 2019 Pablo Greco - 8-4 - Use the correct var for dnf to expand - Update playground source url - Remove epel-modules repo +- Use https in baseurl * Thu Aug 1 2019 Stephen Smoogen - 8-3 - Make sure that the key name is named correctly diff --git a/epel-testing.repo b/epel-testing.repo index 1c6fb48..ee727c1 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,6 +1,6 @@ [epel-testing] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel.repo b/epel.repo index 42a8413..129fb01 100644 --- a/epel.repo +++ b/epel.repo @@ -1,6 +1,6 @@ [epel] name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=1 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 From 0995c916b737d1a9175faf1cf25deca3cfd18696 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Aug 01 2019 22:08:03 +0000 Subject: [PATCH 10/20] Put in %dist into release --- diff --git a/epel-release.spec b/epel-release.spec index 6d8c6b7..740fe69 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 4 +Release: 4%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base From f2598f0371e5783e80aa122ba23a80c6c4c52e00 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Aug 05 2019 17:57:50 +0000 Subject: [PATCH 11/20] epel-playground.repo: Need a /os/ at the end. Signed-off-by: Kevin Fenzi --- diff --git a/epel-playground.repo b/epel-playground.repo index c162827..86e4cb8 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,6 +1,6 @@ [epel-playground] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/os metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 From 0398dcb08fd10d254dad5a919746384241aaad75 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Aug 06 2019 18:16:10 +0000 Subject: [PATCH 12/20] Fix playground release to have os/ on its name [Kevin Fenzi] Make sure all values of $release are $releasever --- diff --git a/epel-playground.repo b/epel-playground.repo index 86e4cb8..37fea92 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,7 +1,7 @@ [epel-playground] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/os -metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgcheck=1 @@ -10,7 +10,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever @@ -19,7 +19,7 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever diff --git a/epel-release.spec b/epel-release.spec index 740fe69..0e08191 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 4%{dist} +Release: 5%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -61,6 +61,11 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Tue Aug 6 2019 Stephen Smoogen - 8-5%{dist} +- Fix playground release to have os/ on its name [Kevin Fenzi] +- Make sure all values of $release are $releasever + + * Thu Aug 1 2019 Pablo Greco - 8-4 - Use the correct var for dnf to expand - Update playground source url From 9b32700e816eea4e3a2f5e799e9ee918f793d5b1 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Sep 16 2019 21:06:59 +0000 Subject: [PATCH 13/20] Change gpg key to use -8 versus -$releasever. This fixes bash problem --- diff --git a/epel-playground.repo b/epel-playground.repo index 37fea92..8e81eea 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -5,7 +5,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release failovermethod=priority enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug @@ -13,7 +13,7 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 [epel-playground-source] @@ -22,5 +22,5 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 0e08191..923a21a 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 5%{dist} +Release: 6%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Mon Sep 16 2019 Stephen Smoogen - 8-6%{dist} +- Change gpg key to use -8 versus -$releasever. This fixes bash problem + * Tue Aug 6 2019 Stephen Smoogen - 8-5%{dist} - Fix playground release to have os/ on its name [Kevin Fenzi] - Make sure all values of $release are $releasever diff --git a/epel-testing.repo b/epel-testing.repo index ee727c1..924a671 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -5,7 +5,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever failovermethod=priority enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug @@ -13,7 +13,7 @@ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Deb metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 [epel-testing-source] @@ -22,5 +22,5 @@ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Sou metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 diff --git a/epel.repo b/epel.repo index 129fb01..411f2c1 100644 --- a/epel.repo +++ b/epel.repo @@ -5,7 +5,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$ failovermethod=priority enabled=1 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug @@ -13,7 +13,7 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 [epel-source] @@ -22,5 +22,5 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch - Source metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 From ad94ea654dd829b95cc06519f3dd7b48b6183084 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Oct 10 2019 15:57:35 +0000 Subject: [PATCH 14/20] Remove failovermethod from EPEL8 tree. It is no longer needed. --- diff --git a/epel-playground.repo b/epel-playground.repo index 8e81eea..e1ee10b 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -2,7 +2,6 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/os metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -11,7 +10,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 @@ -20,7 +18,6 @@ gpgcheck=1 name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 923a21a..9710c43 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 6%{dist} +Release: 7%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Thu Oct 10 2019 Stephen Smoogen - 8-7%{dist} +- Remove failovermethod from EPEL8 tree. It is no longer needed. + * Mon Sep 16 2019 Stephen Smoogen - 8-6%{dist} - Change gpg key to use -8 versus -$releasever. This fixes bash problem diff --git a/epel-testing.repo b/epel-testing.repo index 924a671..08050b3 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -2,7 +2,6 @@ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -11,7 +10,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 @@ -20,7 +18,6 @@ gpgcheck=1 name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 diff --git a/epel.repo b/epel.repo index 411f2c1..5ab3021 100644 --- a/epel.repo +++ b/epel.repo @@ -2,7 +2,6 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -11,7 +10,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 @@ -20,7 +18,6 @@ gpgcheck=1 name=Extra Packages for Enterprise Linux $releasever - $basearch - Source #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 From 26af6a99d7f5429b3932ef8c1cecce84073c8e1f Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Dec 13 2019 20:09:37 +0000 Subject: [PATCH 15/20] Add modular repos. Signed-off-by: Merlin Mathesius --- diff --git a/epel-modular.repo b/epel-modular.repo new file mode 100644 index 0000000..5d4f968 --- /dev/null +++ b/epel-modular.repo @@ -0,0 +1,23 @@ +[epel-modular] +name=Extra Packages for Enterprise Linux Modular $releasever - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-modular-debuginfo] +name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-modular-source] +name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 9710c43..2887c36 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 7%{dist} +Release: 8%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -14,11 +14,14 @@ Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 Source1: GPL Source2: epel.repo Source3: epel-testing.repo -Source4: epel-playground.repo +Source4: epel-playground.repo # EPEL default preset policy (borrowed from fedora's 90-default.preset) Source5: 90-epel.preset Source6: README-epel-8-packaging.md +Source100: epel-modular.repo +Source101: epel-testing-modular.repo + BuildArch: noarch Requires: redhat-release >= %{version} # epel-release is only for enterprise linux, not fedora @@ -46,7 +49,7 @@ install -Dpm 644 %{SOURCE0} \ # yum install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} \ +install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE100} %{SOURCE101} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset @@ -61,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Fri Dec 13 2019 Merlin Mathesius - 8-8%{dist} +- Add modular repos. + * Thu Oct 10 2019 Stephen Smoogen - 8-7%{dist} - Remove failovermethod from EPEL8 tree. It is no longer needed. diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo new file mode 100644 index 0000000..03fb6ba --- /dev/null +++ b/epel-testing-modular.repo @@ -0,0 +1,23 @@ +[epel-testing-modular] +name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-testing-modular-debuginfo] +name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-testing-modular-source] +name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 From 4c0293433fe590ce530a5ecf14c55108f9ecfea2 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 30 2020 17:50:03 +0000 Subject: [PATCH 16/20] Merge with epel8 --- diff --git a/90-epel.preset b/90-epel.preset new file mode 100644 index 0000000..cd326d1 --- /dev/null +++ b/90-epel.preset @@ -0,0 +1,3 @@ +# Also see: +# https://fedoraproject.org/wiki/Starting_services_by_default + diff --git a/GPL b/GPL new file mode 100644 index 0000000..fd8bee7 --- /dev/null +++ b/GPL @@ -0,0 +1,347 @@ +***************************************************************************** +The following copyright applies to the Red Hat Linux compilation and any +portions of Red Hat Linux it does not conflict with. Whenever this +policy does conflict with the copyright of any individual portion of Red Hat +Linux, it does not apply. + +***************************************************************************** + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/README-epel-8-packaging.md b/README-epel-8-packaging.md new file mode 100644 index 0000000..a561052 --- /dev/null +++ b/README-epel-8-packaging.md @@ -0,0 +1,175 @@ +# EPEL-8 Packaging Procedures + +## Introduction + +When a new Red Hat Enterprise Linux occurs, one of the steps to get +EPEL going for it is branching of various packages into new +namespace. The EPEL Steering Committee does not mass branch all +existing packages into the namespace because it has caused multiple +problems: + +1. The package maintainers did not want to support the package in the +newer version of EPEL. Package maintainers may only want to support +certain versions of Enterprise Linux or may want to wait until their +favourite derivative appears. + +2. The package does not work in the latest version of RHEL. With +multiple years between releases, software which worked on Fedora 18 +which would branch to EPEL-7 may not exist anymore with Fedora 28 and +EPEL-8 would need a completely different version. + +## Consumer request for packages + +People who are interested in getting packages into EPEL should contact +the package maintainer through +[bugzilla](https://bugzilla.redhat.com/). This allows for the requests +to be tracked and if the primary maintainer is not interested in +branching to EPEL, other ones can step in and do so. + +## EPEL Playground + +We have added an additional set of channels for EPEL-8 called +playground. It is meant to be sort of like Fedora Rawhide so that +packagers can work on versions of software which are too fast moving +or will have large API changes from what they are putting in the +regular channel. + +To try and make this transparent, we have made it so when a package is +built in epel8 it will normally also be built in +epel8-playground. This is done via a packages.cfg file which lists the +targets for fedpkg to build against. A successful package build will +then go through 2 different paths: + +* epel8 package will go into bodhi to be put into epel8-testing +* epel8-playground will bypass bodhi and go directly into + epel8-playground the next compose. + +If a packager needs to focus only on epel8 or epel8-playground they +can edit packages.cfg to change the ```target= epel8 +epel8-playground``` to ```target= epel8 ```. + +Packages in epel8-playground are primarily to be used in the following +manner: + +* To test out some new version of the package that might not be stable + yet. + +* To test out some new packaging of the package + +* To test a major version change of the package that they want to land + at the next epel8 minor release. + +* To build a package that will never be stable enough for epel8, but + still could be useful to some. + +* At minor RHEL releases (ie, 8.1, 8.2) people can pull in big changes + from playground to the main epel8 packages. Since people will be + upgrading and paying more attention than usual anyhow at those + points, it’s a great chance to do that change, but also you want to + make sure it’s panned out, so you can test before hand in + playground. + +Consumers should be aware that packages in EPEL8-playground are there +without any Service Level Expectations. You may want to only cherry +pick packages from there as needed. + +## Developer request for branching multiple packages + +Branching is handled the same way as requesting a branch using `fedpkg +request-branch`. A maintainer can request an epel8 branch using +`fedpkg request-branch epel8` which will create a ticket in +https://pagure.io/releng/fedora-scm-requests/issues and Release +Engineering will process these requests. + +To branch multiple packages please use this or a variant of this +script: + +``` +#!/usr/bin/sh +# Reminder to get an updated pagure token for releng tickets +# Usage: epel-8.sh foo bar goo blah blech +if [ $# -lt 1 ] +then + echo "At least one package name should be provided" +else + TMPDIR=`mktemp -d /tmp/epel8.XXXXXX` + pushd "$TMPDIR" + for pkg in "$@" + do + fedpkg clone "$pkg" + pushd "$pkg" + fedpkg request-branch epel8 + fedpkg request-branch epel8-playground + popd + done + rm -rfv "$TMPDIR" +fi +``` + +Releng will then work through the tickets in the system which is +adding branches to the PDC and src.fedoraproject.org. + + +## Known Issues + +1. /usr/bin/python does not exist. Choose ``/usr/bin/python3`` or +``/usr/bin/python2`` and patch appropriately. + +2. ``python2-sphinx`` is not shipped. Most packages should work with +python3-sphinx, and if it doesn't please open a bug. The python team +has been good about making fixes for this. + +3. When branching python packages, be aware that python in EL-8 is +python36 and not the version currently in rawhide. This has come up +with a couple of test packages where they assumed python37 or later. + +4. ``systemd-rpm-macros`` is not a separate packages. If needed, used +``BuildRequires: systemd`` + +5. While EL-8 comes with platform-python, it should NOT be used in +``Requires:`` unless absolutely neccessary. python3 should be used +instead. (Exceptions can be made but will be rare and need +justification.) + +**Accepted Exceptions:** +* Use python3.6dist(coverage) instead of python3-coverage. This + package is not shipped but is needed in %check code. + +6. Sometimes RHEL8 only has a python3 package for a dependency you +need for your build. (Example: python-bleach requires +python2-html5lib, but RHEL8 provides only python3-html5lib). For +EPEL-8.0 we only suggest one choice: + +* Choose not to have the python2 part of your package and patch + whatever to use python3. + +7. Python2 packages are discouraged. RHEL-8 will contain python2.7 +until probably the end of life of RHEL-7. However support upstream +will only be minimal. When modularity occurs, we suggest that you make +whatever python2 packages modules which can be pulled out when +RHEL-8.N no longer has python2. + +8. While a RHEL src.rpm might produce a -devel package, it may not +currently be in the build repository. When running into this please +open a ticket with https://pagure.io/epel/new_issue for us to put in a +request for it to be added to Red Hat's Code Ready Builder. After +modularity is enabled, changes to what is done will be needed. + +9. EPEL-8.0 may not work with the RHEL-8.1 beta. There seem to be +changes in dnf and zchunk which we have not worked out. This line will +be updated. + + +## Definitions + +1. Package maintainer. Person who has accepted responsibility to +package and maintain software in the Fedora Project ecosystem. The +main packager is usually someone focused on Fedora Linux, and +secondary packagers may be focused on particular use cases like EPEL. + +2. Consumer. A person who has subscribed to EPEL for packages but is +not a maintainer. + +3. PDC. Product Definition Center. A tool to help list the lifetime +and permissions that a product has so that branching and updates can +be better managed. diff --git a/RPM-GPG-KEY-EPEL-8 b/RPM-GPG-KEY-EPEL-8 new file mode 100644 index 0000000..30b69a6 --- /dev/null +++ b/RPM-GPG-KEY-EPEL-8 @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFz3zvsBEADJOIIWllGudxnpvJnkxQz2CtoWI7godVnoclrdl83kVjqSQp+2 +dgxuG5mUiADUfYHaRQzxKw8efuQnwxzU9kZ70ngCxtmbQWGmUmfSThiapOz00018 ++eo5MFabd2vdiGo1y+51m2sRDpN8qdCaqXko65cyMuLXrojJHIuvRA/x7iqOrRfy +a8x3OxC4PEgl5pgDnP8pVK0lLYncDEQCN76D9ubhZQWhISF/zJI+e806V71hzfyL +/Mt3mQm/li+lRKU25Usk9dWaf4NH/wZHMIPAkVJ4uD4H/uS49wqWnyiTYGT7hUbi +ecF7crhLCmlRzvJR8mkRP6/4T/F3tNDPWZeDNEDVFUkTFHNU6/h2+O398MNY/fOh +yKaNK3nnE0g6QJ1dOH31lXHARlpFOtWt3VmZU0JnWLeYdvap4Eff9qTWZJhI7Cq0 +Wm8DgLUpXgNlkmquvE7P2W5EAr2E5AqKQoDbfw/GiWdRvHWKeNGMRLnGI3QuoX3U +pAlXD7v13VdZxNydvpeypbf/AfRyrHRKhkUj3cU1pYkM3DNZE77C5JUe6/0nxbt4 +ETUZBTgLgYJGP8c7PbkVnO6I/KgL1jw+7MW6Az8Ox+RXZLyGMVmbW/TMc8haJfKL +MoUo3TVk8nPiUhoOC0/kI7j9ilFrBxBU5dUtF4ITAWc8xnG6jJs/IsvRpQARAQAB +tChGZWRvcmEgRVBFTCAoOCkgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB +AgAiBQJc9877AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAh6kWrL4bW +oWagD/4xnLWws34GByVDQkjprk0fX7Iyhpm/U7BsIHKspHLL+Y46vAAGY/9vMvdE +0fcr9Ek2Zp7zE1RWmSCzzzUgTG6BFoTG1H4Fho/7Z8BXK/jybowXSZfqXnTOfhSF +alwDdwlSJvfYNV9MbyvbxN8qZRU1z7PEWZrIzFDDToFRk0R71zHpnPTNIJ5/YXTw +NqU9OxII8hMQj4ufF11040AJQZ7br3rzerlyBOB+Jd1zSPVrAPpeMyJppWFHSDAI +WK6x+am13VIInXtqB/Cz4GBHLFK5d2/IYspVw47Solj8jiFEtnAq6+1Aq5WH3iB4 +bE2e6z00DSF93frwOyWN7WmPIoc2QsNRJhgfJC+isGQAwwq8xAbHEBeuyMG8GZjz +xohg0H4bOSEujVLTjH1xbAG4DnhWO/1VXLX+LXELycO8ZQTcjj/4AQKuo4wvMPrv +9A169oETG+VwQlNd74VBPGCvhnzwGXNbTK/KH1+WRH0YSb+41flB3NKhMSU6dGI0 +SGtIxDSHhVVNmx2/6XiT9U/znrZsG5Kw8nIbbFz+9MGUUWgJMsd1Zl9R8gz7V9fp +n7L7y5LhJ8HOCMsY/Z7/7HUs+t/A1MI4g7Q5g5UuSZdgi0zxukiWuCkLeAiAP4y7 +zKK4OjJ644NDcWCHa36znwVmkz3ixL8Q0auR15Oqq2BjR/fyog== +=84m8 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/dead.package b/dead.package deleted file mode 100644 index 3974481..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -epel-release does not need to be in devel branch. Is obviously only used for EPEL and not rawhide. diff --git a/epel-modular.repo b/epel-modular.repo new file mode 100644 index 0000000..5d4f968 --- /dev/null +++ b/epel-modular.repo @@ -0,0 +1,23 @@ +[epel-modular] +name=Extra Packages for Enterprise Linux Modular $releasever - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-modular-debuginfo] +name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-modular-source] +name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel-playground.repo b/epel-playground.repo new file mode 100644 index 0000000..e1ee10b --- /dev/null +++ b/epel-playground.repo @@ -0,0 +1,23 @@ +[epel-playground] +name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/os +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-playground-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-playground-source] +name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index ec0b31f..2887c36 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,33 +1,41 @@ -Name: epel-release -Version: 6 -Release: 2 +Name: epel-release +Version: 8 +Release: 8%{dist} Summary: Extra Packages for Enterprise Linux repository configuration -Group: System Environment/Base +Group: System Environment/Base License: GPLv2 -# This is a Red Hat maintained package which is specific to +# This is a EPEL maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. -URL: http://download.fedora.redhat.com/pub/epel -Source0: http://download.fedora.redhat.com/pub/epel/RPM-GPG-KEY-EPEL -Source1: GPL -Source2: epel.repo -Source3: epel-testing.repo - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://download.fedoraproject.org/pub/epel +Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 +Source1: GPL +Source2: epel.repo +Source3: epel-testing.repo +Source4: epel-playground.repo +# EPEL default preset policy (borrowed from fedora's 90-default.preset) +Source5: 90-epel.preset +Source6: README-epel-8-packaging.md + +Source100: epel-modular.repo +Source101: epel-testing-modular.repo BuildArch: noarch -Requires: redhat-release >= %{version} +Requires: redhat-release >= %{version} +# epel-release is only for enterprise linux, not fedora +Conflicts: fedora-release %description This package contains the Extra Packages for Enterprise Linux (EPEL) repository -GPG key as well as configuration for yum and up2date. +GPG key as well as configuration for yum. %prep %setup -q -c -T install -pm 644 %{SOURCE0} . install -pm 644 %{SOURCE1} . +install -pm 644 %{SOURCE6} . %build @@ -37,55 +45,96 @@ rm -rf $RPM_BUILD_ROOT #GPG Key install -Dpm 644 %{SOURCE0} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version} # yum install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE2} %{SOURCE3} \ +install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE100} %{SOURCE101} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset %clean rm -rf $RPM_BUILD_ROOT -%post -echo "# epel repo -- added by epel-release " \ - >> %{_sysconfdir}/sysconfig/rhn/sources -echo "yum epel http://download.fedora.redhat.com/pub/epel/%{version}/\$ARCH" \ - >> %{_sysconfdir}/sysconfig/rhn/sources - -%postun -sed -i '/^yum\ epel/d' %{_sysconfdir}/sysconfig/rhn/sources -sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources - - %files %defattr(-,root,root,-) -%doc GPL +%doc GPL README-epel-8-packaging.md %config(noreplace) /etc/yum.repos.d/* /etc/pki/rpm-gpg/* - +%{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Dec 13 2019 Merlin Mathesius - 8-8%{dist} +- Add modular repos. + +* Thu Oct 10 2019 Stephen Smoogen - 8-7%{dist} +- Remove failovermethod from EPEL8 tree. It is no longer needed. + +* Mon Sep 16 2019 Stephen Smoogen - 8-6%{dist} +- Change gpg key to use -8 versus -$releasever. This fixes bash problem + +* Tue Aug 6 2019 Stephen Smoogen - 8-5%{dist} +- Fix playground release to have os/ on its name [Kevin Fenzi] +- Make sure all values of $release are $releasever + + +* Thu Aug 1 2019 Pablo Greco - 8-4 +- Use the correct var for dnf to expand +- Update playground source url +- Remove epel-modules repo +- Use https in baseurl + +* Thu Aug 1 2019 Stephen Smoogen - 8-3 +- Make sure that the key name is named correctly + +* Thu Aug 1 2019 Stephen Smoogen - 8-2 +- Make baseurl paths match dl.fedoraproject.org +- Add draft of epel8 packaging +- Fix docs + +* Thu Jul 18 2019 Stephen Smoogen - 8-1 +- Update for RHEL-8 +- Add playground repo data +- Clean out 90-epel.preset to make sure we dont override RHEL-8 items. Just add items in which EPEL needs. + +* Mon Oct 02 2017 Kevin Fenzi - 7-11 +- Add Conflicts on fedora-release to prevent people from installing on Fedora systems. Fixes bug #1497702 + +* Sat Jun 24 2017 Kevin Fenzi - 7-10 +- Change mirrorlist= in repo files to be metalink= (as thats what they are). Fixes bug #1451212 + +* Tue Dec 27 2016 Kevin Fenzi - 7-9 +- Add preset for drbdlinks package. Fixes bug #1405744 + +* Sat Jul 23 2016 Kevin Fenzi - 7-8 +- Drop duplicate libstoragemgmt from presets. Fixes bug #1358971 + +* Fri Jun 03 2016 Kevin Fenzi - 7-7 +- Drop initial-setup from presets. Fixes bug #1342511 + +* Wed Mar 30 2016 Jason L Tibbitts III - 7-6 +- Remove macros.epel; let epel-rpm-macros handle it instead. + +* Tue Nov 25 2014 Rex Dieter 7-5 +- fix typo in macros.epel + +* Fri Nov 21 2014 Rex Dieter 7-4 +- add systemd 90-epel.preset -* Thu Jul 17 2008 Tom "spot" Callaway - 6.1 -- fix license tag +* Fri Nov 21 2014 Rex Dieter 7-3 +- implement %%epel macro -* Sun Mar 25 2007 Michael Stahnke - 6-0 -- Bumped in devel to RHEL 6. (We can dream). +* Tue Sep 02 2014 Kevin Fenzi 7-2 +- Make repo files config(noreplace). Fixes bug #1135576 -* Sun Mar 25 2007 Michael Stahnke - 4-4 -- Changed description again +* Thu Aug 28 2014 Dennis Gilmore - 7-1 +- enable gpg checking now we are out of beta -* Sun Mar 25 2007 Michael Stahnke - 4-3 -- Removed cp in postun -- Removed the file epel-release - provides no value -- Removed dist tag as per review bug #233236 -- Changed description +* Wed Jun 18 2014 Kevin Fenzi 7-0.2 +- Drop unneeded up2date post/postun +- Fixed up description. +- Fixes bugs #1052434 and #1093918 -* Mon Mar 14 2007 Michael Stahnke - 4-2 -- Fixed up2date issues. +* Mon Dec 16 2013 Dennis Gilmore - 7-0.1 +- initial epel 7 build. gpg cheking is disabled -* Mon Mar 12 2007 Michael Stahnke - 4-1 -- Initial Package diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo new file mode 100644 index 0000000..03fb6ba --- /dev/null +++ b/epel-testing-modular.repo @@ -0,0 +1,23 @@ +[epel-testing-modular] +name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-testing-modular-debuginfo] +name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-testing-modular-source] +name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel-testing.repo b/epel-testing.repo new file mode 100644 index 0000000..08050b3 --- /dev/null +++ b/epel-testing.repo @@ -0,0 +1,23 @@ +[epel-testing] +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-testing-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-testing-source] +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel.repo b/epel.repo new file mode 100644 index 0000000..5ab3021 --- /dev/null +++ b/epel.repo @@ -0,0 +1,23 @@ +[epel] +name=Extra Packages for Enterprise Linux $releasever - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-source] +name=Extra Packages for Enterprise Linux $releasever - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..b728443 --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 From c019f910ba093d6cec769cc1f966d370c289d28a Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 30 2020 18:20:36 +0000 Subject: [PATCH 17/20] Add epel8-repos subpackage --- diff --git a/90-epel.preset b/90-epel.preset deleted file mode 100644 index cd326d1..0000000 --- a/90-epel.preset +++ /dev/null @@ -1,3 +0,0 @@ -# Also see: -# https://fedoraproject.org/wiki/Starting_services_by_default - diff --git a/README-epel-8-packaging.md b/README-epel-8-packaging.md deleted file mode 100644 index a561052..0000000 --- a/README-epel-8-packaging.md +++ /dev/null @@ -1,175 +0,0 @@ -# EPEL-8 Packaging Procedures - -## Introduction - -When a new Red Hat Enterprise Linux occurs, one of the steps to get -EPEL going for it is branching of various packages into new -namespace. The EPEL Steering Committee does not mass branch all -existing packages into the namespace because it has caused multiple -problems: - -1. The package maintainers did not want to support the package in the -newer version of EPEL. Package maintainers may only want to support -certain versions of Enterprise Linux or may want to wait until their -favourite derivative appears. - -2. The package does not work in the latest version of RHEL. With -multiple years between releases, software which worked on Fedora 18 -which would branch to EPEL-7 may not exist anymore with Fedora 28 and -EPEL-8 would need a completely different version. - -## Consumer request for packages - -People who are interested in getting packages into EPEL should contact -the package maintainer through -[bugzilla](https://bugzilla.redhat.com/). This allows for the requests -to be tracked and if the primary maintainer is not interested in -branching to EPEL, other ones can step in and do so. - -## EPEL Playground - -We have added an additional set of channels for EPEL-8 called -playground. It is meant to be sort of like Fedora Rawhide so that -packagers can work on versions of software which are too fast moving -or will have large API changes from what they are putting in the -regular channel. - -To try and make this transparent, we have made it so when a package is -built in epel8 it will normally also be built in -epel8-playground. This is done via a packages.cfg file which lists the -targets for fedpkg to build against. A successful package build will -then go through 2 different paths: - -* epel8 package will go into bodhi to be put into epel8-testing -* epel8-playground will bypass bodhi and go directly into - epel8-playground the next compose. - -If a packager needs to focus only on epel8 or epel8-playground they -can edit packages.cfg to change the ```target= epel8 -epel8-playground``` to ```target= epel8 ```. - -Packages in epel8-playground are primarily to be used in the following -manner: - -* To test out some new version of the package that might not be stable - yet. - -* To test out some new packaging of the package - -* To test a major version change of the package that they want to land - at the next epel8 minor release. - -* To build a package that will never be stable enough for epel8, but - still could be useful to some. - -* At minor RHEL releases (ie, 8.1, 8.2) people can pull in big changes - from playground to the main epel8 packages. Since people will be - upgrading and paying more attention than usual anyhow at those - points, it’s a great chance to do that change, but also you want to - make sure it’s panned out, so you can test before hand in - playground. - -Consumers should be aware that packages in EPEL8-playground are there -without any Service Level Expectations. You may want to only cherry -pick packages from there as needed. - -## Developer request for branching multiple packages - -Branching is handled the same way as requesting a branch using `fedpkg -request-branch`. A maintainer can request an epel8 branch using -`fedpkg request-branch epel8` which will create a ticket in -https://pagure.io/releng/fedora-scm-requests/issues and Release -Engineering will process these requests. - -To branch multiple packages please use this or a variant of this -script: - -``` -#!/usr/bin/sh -# Reminder to get an updated pagure token for releng tickets -# Usage: epel-8.sh foo bar goo blah blech -if [ $# -lt 1 ] -then - echo "At least one package name should be provided" -else - TMPDIR=`mktemp -d /tmp/epel8.XXXXXX` - pushd "$TMPDIR" - for pkg in "$@" - do - fedpkg clone "$pkg" - pushd "$pkg" - fedpkg request-branch epel8 - fedpkg request-branch epel8-playground - popd - done - rm -rfv "$TMPDIR" -fi -``` - -Releng will then work through the tickets in the system which is -adding branches to the PDC and src.fedoraproject.org. - - -## Known Issues - -1. /usr/bin/python does not exist. Choose ``/usr/bin/python3`` or -``/usr/bin/python2`` and patch appropriately. - -2. ``python2-sphinx`` is not shipped. Most packages should work with -python3-sphinx, and if it doesn't please open a bug. The python team -has been good about making fixes for this. - -3. When branching python packages, be aware that python in EL-8 is -python36 and not the version currently in rawhide. This has come up -with a couple of test packages where they assumed python37 or later. - -4. ``systemd-rpm-macros`` is not a separate packages. If needed, used -``BuildRequires: systemd`` - -5. While EL-8 comes with platform-python, it should NOT be used in -``Requires:`` unless absolutely neccessary. python3 should be used -instead. (Exceptions can be made but will be rare and need -justification.) - -**Accepted Exceptions:** -* Use python3.6dist(coverage) instead of python3-coverage. This - package is not shipped but is needed in %check code. - -6. Sometimes RHEL8 only has a python3 package for a dependency you -need for your build. (Example: python-bleach requires -python2-html5lib, but RHEL8 provides only python3-html5lib). For -EPEL-8.0 we only suggest one choice: - -* Choose not to have the python2 part of your package and patch - whatever to use python3. - -7. Python2 packages are discouraged. RHEL-8 will contain python2.7 -until probably the end of life of RHEL-7. However support upstream -will only be minimal. When modularity occurs, we suggest that you make -whatever python2 packages modules which can be pulled out when -RHEL-8.N no longer has python2. - -8. While a RHEL src.rpm might produce a -devel package, it may not -currently be in the build repository. When running into this please -open a ticket with https://pagure.io/epel/new_issue for us to put in a -request for it to be added to Red Hat's Code Ready Builder. After -modularity is enabled, changes to what is done will be needed. - -9. EPEL-8.0 may not work with the RHEL-8.1 beta. There seem to be -changes in dnf and zchunk which we have not worked out. This line will -be updated. - - -## Definitions - -1. Package maintainer. Person who has accepted responsibility to -package and maintain software in the Fedora Project ecosystem. The -main packager is usually someone focused on Fedora Linux, and -secondary packagers may be focused on particular use cases like EPEL. - -2. Consumer. A person who has subscribed to EPEL for packages but is -not a maintainer. - -3. PDC. Product Definition Center. A tool to help list the lifetime -and permissions that a product has so that branching and updates can -be better managed. diff --git a/epel-modular.repo b/epel-modular.repo deleted file mode 100644 index 5d4f968..0000000 --- a/epel-modular.repo +++ /dev/null @@ -1,23 +0,0 @@ -[epel-modular] -name=Extra Packages for Enterprise Linux Modular $releasever - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=1 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 - -[epel-modular-debuginfo] -name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 - -[epel-modular-source] -name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 diff --git a/epel-playground.repo b/epel-playground.repo deleted file mode 100644 index e1ee10b..0000000 --- a/epel-playground.repo +++ /dev/null @@ -1,23 +0,0 @@ -[epel-playground] -name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/os -metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 - -[epel-playground-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 - -[epel-playground-source] -name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 2887c36..802da03 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,140 +1,62 @@ Name: epel-release Version: 8 -Release: 8%{dist} -Summary: Extra Packages for Enterprise Linux repository configuration - -Group: System Environment/Base +Release: 9%{dist} License: GPLv2 # This is a EPEL maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. URL: http://download.fedoraproject.org/pub/epel -Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 Source1: GPL -Source2: epel.repo -Source3: epel-testing.repo -Source4: epel-playground.repo -# EPEL default preset policy (borrowed from fedora's 90-default.preset) -Source5: 90-epel.preset -Source6: README-epel-8-packaging.md -Source100: epel-modular.repo -Source101: epel-testing-modular.repo +Source80: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 +Source82: epel8.repo +Source83: epel8-testing.repo +Source84: epel8-playground.repo +Source85: epel8-modular.repo +Source86: epel8-testing-modular.repo BuildArch: noarch -Requires: redhat-release >= %{version} -# epel-release is only for enterprise linux, not fedora -Conflicts: fedora-release -%description -This package contains the Extra Packages for Enterprise Linux (EPEL) repository -GPG key as well as configuration for yum. +%define desc() %{expand: +This package contains the Extra Packages for Enterprise Linux (EPEL)%{?1: %{1}} +repository GPG key as well as configuration for yum. +} +%define sum() Extra Packages for Enterprise Linux%{?1: %{1}} repository configuration +Summary: %{sum} +%description %{desc} + + +%package -n epel8-repos +Version: 8 +Summary: %{sum 8} +%description -n epel8-repos %{desc 8} + %prep %setup -q -c -T -install -pm 644 %{SOURCE0} . install -pm 644 %{SOURCE1} . -install -pm 644 %{SOURCE6} . %build %install -rm -rf $RPM_BUILD_ROOT - #GPG Key -install -Dpm 644 %{SOURCE0} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version} +install -Dpm 644 %{SOURCE80} \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 # yum install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE100} %{SOURCE101} \ +install -pm 644 %{SOURCE82} %{SOURCE83} %{SOURCE84} %{SOURCE85} %{SOURCE86} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%doc GPL README-epel-8-packaging.md -%config(noreplace) /etc/yum.repos.d/* -/etc/pki/rpm-gpg/* -%{_prefix}/lib/systemd/system-preset/90-epel.preset +%files -n epel8-repos +%license GPL +%dir /etc/yum.repos.d/ +%config(noreplace) /etc/yum.repos.d/epel8*.repo +%dir /etc/pki/rpm-gpg/ +/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 %changelog -* Fri Dec 13 2019 Merlin Mathesius - 8-8%{dist} -- Add modular repos. - -* Thu Oct 10 2019 Stephen Smoogen - 8-7%{dist} -- Remove failovermethod from EPEL8 tree. It is no longer needed. - -* Mon Sep 16 2019 Stephen Smoogen - 8-6%{dist} -- Change gpg key to use -8 versus -$releasever. This fixes bash problem - -* Tue Aug 6 2019 Stephen Smoogen - 8-5%{dist} -- Fix playground release to have os/ on its name [Kevin Fenzi] -- Make sure all values of $release are $releasever - - -* Thu Aug 1 2019 Pablo Greco - 8-4 -- Use the correct var for dnf to expand -- Update playground source url -- Remove epel-modules repo -- Use https in baseurl - -* Thu Aug 1 2019 Stephen Smoogen - 8-3 -- Make sure that the key name is named correctly - -* Thu Aug 1 2019 Stephen Smoogen - 8-2 -- Make baseurl paths match dl.fedoraproject.org -- Add draft of epel8 packaging -- Fix docs - -* Thu Jul 18 2019 Stephen Smoogen - 8-1 -- Update for RHEL-8 -- Add playground repo data -- Clean out 90-epel.preset to make sure we dont override RHEL-8 items. Just add items in which EPEL needs. - -* Mon Oct 02 2017 Kevin Fenzi - 7-11 -- Add Conflicts on fedora-release to prevent people from installing on Fedora systems. Fixes bug #1497702 - -* Sat Jun 24 2017 Kevin Fenzi - 7-10 -- Change mirrorlist= in repo files to be metalink= (as thats what they are). Fixes bug #1451212 - -* Tue Dec 27 2016 Kevin Fenzi - 7-9 -- Add preset for drbdlinks package. Fixes bug #1405744 - -* Sat Jul 23 2016 Kevin Fenzi - 7-8 -- Drop duplicate libstoragemgmt from presets. Fixes bug #1358971 - -* Fri Jun 03 2016 Kevin Fenzi - 7-7 -- Drop initial-setup from presets. Fixes bug #1342511 - -* Wed Mar 30 2016 Jason L Tibbitts III - 7-6 -- Remove macros.epel; let epel-rpm-macros handle it instead. - -* Tue Nov 25 2014 Rex Dieter 7-5 -- fix typo in macros.epel - -* Fri Nov 21 2014 Rex Dieter 7-4 -- add systemd 90-epel.preset - -* Fri Nov 21 2014 Rex Dieter 7-3 -- implement %%epel macro - -* Tue Sep 02 2014 Kevin Fenzi 7-2 -- Make repo files config(noreplace). Fixes bug #1135576 - -* Thu Aug 28 2014 Dennis Gilmore - 7-1 -- enable gpg checking now we are out of beta - -* Wed Jun 18 2014 Kevin Fenzi 7-0.2 -- Drop unneeded up2date post/postun -- Fixed up description. -- Fixes bugs #1052434 and #1093918 - -* Mon Dec 16 2013 Dennis Gilmore - 7-0.1 -- initial epel 7 build. gpg cheking is disabled - +* Tue Jun 30 2020 Miro Hrončok - 8-9 +- Initial package for Fedora diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo deleted file mode 100644 index 03fb6ba..0000000 --- a/epel-testing-modular.repo +++ /dev/null @@ -1,23 +0,0 @@ -[epel-testing-modular] -name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 - -[epel-testing-modular-debuginfo] -name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 - -[epel-testing-modular-source] -name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 diff --git a/epel-testing.repo b/epel-testing.repo deleted file mode 100644 index 08050b3..0000000 --- a/epel-testing.repo +++ /dev/null @@ -1,23 +0,0 @@ -[epel-testing] -name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 - -[epel-testing-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 - -[epel-testing-source] -name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 diff --git a/epel.repo b/epel.repo deleted file mode 100644 index 5ab3021..0000000 --- a/epel.repo +++ /dev/null @@ -1,23 +0,0 @@ -[epel] -name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=1 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 - -[epel-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 - -[epel-source] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 diff --git a/epel8-modular.repo b/epel8-modular.repo new file mode 100644 index 0000000..891a9a7 --- /dev/null +++ b/epel8-modular.repo @@ -0,0 +1,23 @@ +[epel8-modular] +name=Extra Packages for Enterprise Linux Modular 8 - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/8/Modular/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel8-modular-debuginfo] +name=Extra Packages for Enterprise Linux Modular 8 - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/8/Modular/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel8-modular-source] +name=Extra Packages for Enterprise Linux Modular 8 - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/8/Modular/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel8-playground.repo b/epel8-playground.repo new file mode 100644 index 0000000..c021f2f --- /dev/null +++ b/epel8-playground.repo @@ -0,0 +1,23 @@ +[epel8-playground] +name=Extra Packages for Enterprise Linux 8 - Playground - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/playground/8/Everything/$basearch/os +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel8-playground-debuginfo] +name=Extra Packages for Enterprise Linux 8 - Playground - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/playground/8/Everything/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel8-playground-source] +name=Extra Packages for Enterprise Linux 8 - Playground - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/playground/8/Everything/source/tree/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel8-testing-modular.repo b/epel8-testing-modular.repo new file mode 100644 index 0000000..0e850f7 --- /dev/null +++ b/epel8-testing-modular.repo @@ -0,0 +1,23 @@ +[epel8-testingx-modular] +name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/testing/8/Modular/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel8-testingx-modular-debuginfo] +name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/testing/8/Modular/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel8-testingx-modular-source] +name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/testing/8/Modular/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel8-testing.repo b/epel8-testing.repo new file mode 100644 index 0000000..46d8493 --- /dev/null +++ b/epel8-testing.repo @@ -0,0 +1,23 @@ +[epel8-testingx] +name=Extra Packages for Enterprise Linux 8 - Testing - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/testing/8/Everything/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel8-testingx-debuginfo] +name=Extra Packages for Enterprise Linux 8 - Testing - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/testing/8/Everything/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel8-testingx-source] +name=Extra Packages for Enterprise Linux 8 - Testing - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/testing/8/Everything/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel8.repo b/epel8.repo new file mode 100644 index 0000000..1ce7c50 --- /dev/null +++ b/epel8.repo @@ -0,0 +1,23 @@ +[epel8] +name=Extra Packages for Enterprise Linux 8 - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/8/Everything/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel8-debuginfo] +name=Extra Packages for Enterprise Linux 8 - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/8/Everything/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel8-source] +name=Extra Packages for Enterprise Linux 8 - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/8/Everything/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-8&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/package.cfg b/package.cfg deleted file mode 100644 index b728443..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 From 7bc184db7b16231274b5375f6cdc057124b0f31f Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 30 2020 18:20:38 +0000 Subject: [PATCH 18/20] Add epel7-repos subpackage --- diff --git a/RPM-GPG-KEY-EPEL-7 b/RPM-GPG-KEY-EPEL-7 new file mode 100644 index 0000000..f205ede --- /dev/null +++ b/RPM-GPG-KEY-EPEL-7 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQINBFKuaIQBEAC1UphXwMqCAarPUH/ZsOFslabeTVO2pDk5YnO96f+rgZB7xArB +OSeQk7B90iqSJ85/c72OAn4OXYvT63gfCeXpJs5M7emXkPsNQWWSju99lW+AqSNm +jYWhmRlLRGl0OO7gIwj776dIXvcMNFlzSPj00N2xAqjMbjlnV2n2abAE5gq6VpqP +vFXVyfrVa/ualogDVmf6h2t4Rdpifq8qTHsHFU3xpCz+T6/dGWKGQ42ZQfTaLnDM +jToAsmY0AyevkIbX6iZVtzGvanYpPcWW4X0RDPcpqfFNZk643xI4lsZ+Y2Er9Yu5 +S/8x0ly+tmmIokaE0wwbdUu740YTZjCesroYWiRg5zuQ2xfKxJoV5E+Eh+tYwGDJ +n6HfWhRgnudRRwvuJ45ztYVtKulKw8QQpd2STWrcQQDJaRWmnMooX/PATTjCBExB +9dkz38Druvk7IkHMtsIqlkAOQMdsX1d3Tov6BE2XDjIG0zFxLduJGbVwc/6rIc95 +T055j36Ez0HrjxdpTGOOHxRqMK5m9flFbaxxtDnS7w77WqzW7HjFrD0VeTx2vnjj +GqchHEQpfDpFOzb8LTFhgYidyRNUflQY35WLOzLNV+pV3eQ3Jg11UFwelSNLqfQf +uFRGc+zcwkNjHh5yPvm9odR1BIfqJ6sKGPGbtPNXo7ERMRypWyRz0zi0twARAQAB +tChGZWRvcmEgRVBFTCAoNykgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB +AgAiBQJSrmiEAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBqL66iNSxk +5cfGD/4spqpsTjtDM7qpytKLHKruZtvuWiqt5RfvT9ww9GUUFMZ4ZZGX4nUXg49q +ixDLayWR8ddG/s5kyOi3C0uX/6inzaYyRg+Bh70brqKUK14F1BrrPi29eaKfG+Gu +MFtXdBG2a7OtPmw3yuKmq9Epv6B0mP6E5KSdvSRSqJWtGcA6wRS/wDzXJENHp5re +9Ism3CYydpy0GLRA5wo4fPB5uLdUhLEUDvh2KK//fMjja3o0L+SNz8N0aDZyn5Ax +CU9RB3EHcTecFgoy5umRj99BZrebR1NO+4gBrivIfdvD4fJNfNBHXwhSH9ACGCNv +HnXVjHQF9iHWApKkRIeh8Fr2n5dtfJEF7SEX8GbX7FbsWo29kXMrVgNqHNyDnfAB +VoPubgQdtJZJkVZAkaHrMu8AytwT62Q4eNqmJI1aWbZQNI5jWYqc6RKuCK6/F99q +thFT9gJO17+yRuL6Uv2/vgzVR1RGdwVLKwlUjGPAjYflpCQwWMAASxiv9uPyYPHc +ErSrbRG0wjIfAR3vus1OSOx3xZHZpXFfmQTsDP7zVROLzV98R3JwFAxJ4/xqeON4 +vCPFU6OsT3lWQ8w7il5ohY95wmujfr6lk89kEzJdOTzcn7DBbUru33CQMGKZ3Evt +RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw== +=hdPa +-----END PGP PUBLIC KEY BLOCK----- diff --git a/epel-release.spec b/epel-release.spec index 802da03..fcc01fc 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -9,6 +9,10 @@ License: GPLv2 URL: http://download.fedoraproject.org/pub/epel Source1: GPL +Source70: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 +Source72: epel7.repo +Source73: epel7-testing.repo + Source80: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 Source82: epel8.repo Source83: epel8-testing.repo @@ -27,6 +31,12 @@ Summary: %{sum} %description %{desc} +%package -n epel7-repos +Version: 7 +Summary: %{sum 7} +%description -n epel7-repos %{desc 7} + + %package -n epel8-repos Version: 8 Summary: %{sum 8} @@ -41,15 +51,25 @@ install -pm 644 %{SOURCE1} . %install -#GPG Key +#GPG Keys +install -Dpm 644 %{SOURCE70} \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 install -Dpm 644 %{SOURCE80} \ $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 # yum install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE82} %{SOURCE83} %{SOURCE84} %{SOURCE85} %{SOURCE86} \ +install -pm 644 %{SOURCE72} %{SOURCE73} \ + %{SOURCE82} %{SOURCE83} %{SOURCE84} %{SOURCE85} %{SOURCE86} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +%files -n epel7-repos +%license GPL +%dir /etc/yum.repos.d/ +%config(noreplace) /etc/yum.repos.d/epel7*.repo +%dir /etc/pki/rpm-gpg/ +/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 + %files -n epel8-repos %license GPL %dir /etc/yum.repos.d/ diff --git a/epel7-testing.repo b/epel7-testing.repo new file mode 100644 index 0000000..0995d0f --- /dev/null +++ b/epel7-testing.repo @@ -0,0 +1,26 @@ +[epel7-testingx] +name=Extra Packages for Enterprise Linux 7 - Testing - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 + +[epel7-testingx-debuginfo] +name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 +gpgcheck=1 + +[epel7-testingx-source] +name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/testing/7/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 +gpgcheck=1 diff --git a/epel7.repo b/epel7.repo new file mode 100644 index 0000000..9b85391 --- /dev/null +++ b/epel7.repo @@ -0,0 +1,26 @@ +[epel7] +name=Extra Packages for Enterprise Linux 7 - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 + +[epel7-debuginfo] +name=Extra Packages for Enterprise Linux 7 - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 +gpgcheck=1 + +[epel7-source] +name=Extra Packages for Enterprise Linux 7 - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/7/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 +gpgcheck=1 From 48e50aa73bce6e7f5d16afd6fa66b304ac97a8f8 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 30 2020 18:20:38 +0000 Subject: [PATCH 19/20] Add epel6-repos subpackage --- diff --git a/RPM-GPG-KEY-EPEL-6 b/RPM-GPG-KEY-EPEL-6 new file mode 100644 index 0000000..7a20304 --- /dev/null +++ b/RPM-GPG-KEY-EPEL-6 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1 +JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B +M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn +XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6 +pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV +QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp +Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq +3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu +vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar +1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g +YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB +tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS +KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9 +qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT +9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP +Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS +WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft +HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF +p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP +x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8 +wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J +l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG +iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR +XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ== +=V/6I +-----END PGP PUBLIC KEY BLOCK----- diff --git a/epel-release.spec b/epel-release.spec index fcc01fc..2c6a76c 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -9,6 +9,10 @@ License: GPLv2 URL: http://download.fedoraproject.org/pub/epel Source1: GPL +Source60: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6 +Source62: epel6.repo +Source63: epel6-testing.repo + Source70: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 Source72: epel7.repo Source73: epel7-testing.repo @@ -31,6 +35,12 @@ Summary: %{sum} %description %{desc} +%package -n epel6-repos +Version: 6 +Summary: %{sum 6} +%description -n epel6-repos %{desc 6} + + %package -n epel7-repos Version: 7 Summary: %{sum 7} @@ -52,6 +62,8 @@ install -pm 644 %{SOURCE1} . %install #GPG Keys +install -Dpm 644 %{SOURCE60} \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 install -Dpm 644 %{SOURCE70} \ $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 install -Dpm 644 %{SOURCE80} \ @@ -59,10 +71,18 @@ install -Dpm 644 %{SOURCE80} \ # yum install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE72} %{SOURCE73} \ +install -pm 644 %{SOURCE62} %{SOURCE63} \ + %{SOURCE72} %{SOURCE73} \ %{SOURCE82} %{SOURCE83} %{SOURCE84} %{SOURCE85} %{SOURCE86} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +%files -n epel6-repos +%license GPL +%dir /etc/yum.repos.d/ +%config(noreplace) /etc/yum.repos.d/epel6*.repo +%dir /etc/pki/rpm-gpg/ +/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 + %files -n epel7-repos %license GPL %dir /etc/yum.repos.d/ diff --git a/epel6-testing.repo b/epel6-testing.repo new file mode 100644 index 0000000..282225a --- /dev/null +++ b/epel6-testing.repo @@ -0,0 +1,26 @@ +[epel6-testingx] +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/testing/6/$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-epel6&arch=$basearch +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 + +[epel6-testingx-debuginfo] +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/testing/6/$basearch/debug +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel6&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 +gpgcheck=1 + +[epel6-testingx-source] +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/testing/6/SRPMS +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel6&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 +gpgcheck=1 diff --git a/epel6.repo b/epel6.repo new file mode 100644 index 0000000..4ada550 --- /dev/null +++ b/epel6.repo @@ -0,0 +1,26 @@ +[epel6] +name=Extra Packages for Enterprise Linux 6 - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 + +[epel6-debuginfo] +name=Extra Packages for Enterprise Linux 6 - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch/debug +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-6&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 +gpgcheck=1 + +[epel6-source] +name=Extra Packages for Enterprise Linux 6 - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/6/SRPMS +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-source-6&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 +gpgcheck=1 From 6284cde0a53a8aac8dc2a6f497f5b06dca12090b Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 30 2020 18:31:39 +0000 Subject: [PATCH 20/20] Add README --- diff --git a/README.md b/README.md new file mode 100644 index 0000000..ca63ea8 --- /dev/null +++ b/README.md @@ -0,0 +1,18 @@ +# EPEL repos for Fedora + +The epelX-repos packages contain repositories for Extra Packages for Enterprise Linux (EPEL). + +The repositories are disabled by default and can be used e.g. with `repoquery`: + + $ repoquery --repo=epel8 --whatrequires 'python(abi) = 3.6' + +Or to download packages with `dnf`: + + $ dnf --repo=epel7 download python36-rpm + +Note that the "base" RHEL/CentOS repos are not included. + +## Quirks + +1. All `epel-` repositories were renamed to `epelX-` (e.g. `epel8-modular`) to avoid conflicts with other EPEL versions. +2. All `-testing` repositories were renamed to `-testingx` (e.g. `epel7-testingx`) to avoid mistakes with commands like `dnf distro-sync --enablerepo='*-testing'`. diff --git a/epel-release.spec b/epel-release.spec index 2c6a76c..267a5f8 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -7,6 +7,7 @@ License: GPLv2 # our distribution. Thus the source is only available from # within this srpm. URL: http://download.fedoraproject.org/pub/epel +Source0: README.md Source1: GPL Source60: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6 @@ -55,7 +56,7 @@ Summary: %{sum 8} %prep %setup -q -c -T -install -pm 644 %{SOURCE1} . +install -pm 644 %{SOURCE0} %{SOURCE1} . %build @@ -77,6 +78,7 @@ install -pm 644 %{SOURCE62} %{SOURCE63} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d %files -n epel6-repos +%doc README.md %license GPL %dir /etc/yum.repos.d/ %config(noreplace) /etc/yum.repos.d/epel6*.repo @@ -84,6 +86,7 @@ install -pm 644 %{SOURCE62} %{SOURCE63} \ /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 %files -n epel7-repos +%doc README.md %license GPL %dir /etc/yum.repos.d/ %config(noreplace) /etc/yum.repos.d/epel7*.repo @@ -91,6 +94,7 @@ install -pm 644 %{SOURCE62} %{SOURCE63} \ /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 %files -n epel8-repos +%doc README.md %license GPL %dir /etc/yum.repos.d/ %config(noreplace) /etc/yum.repos.d/epel8*.repo