From 6a7cc3182e540cefec1d3459ac59d7b195c5b058 Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Sun, 25 Mar 2007 19:08:49 +0000 Subject: [PATCH 01/20] auto-import epel-release-4-4 on branch devel from epel-release-4-4.src.rpm --- GPL | 347 ++++++++++++++++++++++++++++++++++++++++++++++ RPM-GPG-KEY-EPEL | 30 ++++ epel-release.spec | 82 +++++++++++ epel-testing.repo | 26 ++++ epel.repo | 26 ++++ 5 files changed, 511 insertions(+) create mode 100644 GPL create mode 100644 RPM-GPG-KEY-EPEL create mode 100644 epel-release.spec create mode 100644 epel-testing.repo create mode 100644 epel.repo 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/RPM-GPG-KEY-EPEL b/RPM-GPG-KEY-EPEL new file mode 100644 index 0000000..5a13bb4 --- /dev/null +++ b/RPM-GPG-KEY-EPEL @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.2.6 (GNU/Linux) + +mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF +l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/ +QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/ +lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk +/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm +l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl +1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic +vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP +QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ +RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM +AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa +ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/ +blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J +nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl +PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3 +5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS +w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd +yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA +DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1 +axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H +Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T +P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24 +0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC +GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY +bbsLFWOfmzAnNIGvFRWy+YHi +=MMNL +-----END PGP PUBLIC KEY BLOCK----- diff --git a/epel-release.spec b/epel-release.spec new file mode 100644 index 0000000..c62563e --- /dev/null +++ b/epel-release.spec @@ -0,0 +1,82 @@ +Name: epel-release +Version: 4 +Release: 4 +Summary: Extra Packages for Enterprise Linux repository configuration + +Group: System Environment/Base +License: GPL + +# This is a Red Hat 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) + +BuildArch: noarch +Requires: redhat-release >= %{version} + +%description +This package contains the Extra Packages for Enterprise Linux (EPEL) repository +GPG key as well as configuration for yum and up2date. + +%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 + +# yum +install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +install -pm 644 %{SOURCE2} %{SOURCE3} \ + $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d + +%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 +%config(noreplace) /etc/yum.repos.d/* +/etc/pki/rpm-gpg/* + + +%changelog +* Sun Mar 25 2007 Michael Stahnke - 4-4 +- Changed description again + +* 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 + +* Mon Mar 14 2007 Michael Stahnke - 4-2 +- Fixed up2date issues. + +* Mon Mar 12 2007 Michael Stahnke - 4-1 +- Initial Package diff --git a/epel-testing.repo b/epel-testing.repo new file mode 100644 index 0000000..9f542e0 --- /dev/null +++ b/epel-testing.repo @@ -0,0 +1,26 @@ +[epel-testing] +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch +baseurl= + http://download.fedora.redhat.com/pub/epel/testing/$releasever/$basearch +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL + +[epel-testing-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug +baseurl= + http://download.fedora.redhat.com/pub/epel/testing/$releasever/$basearch/debug +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL +gpgcheck=1 + +[epel-source] +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source +baseurl= + http://download.fedora.redhat.com/pub/epel/$releasever/SRPMS +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL +gpgcheck=1 diff --git a/epel.repo b/epel.repo new file mode 100644 index 0000000..baf649b --- /dev/null +++ b/epel.repo @@ -0,0 +1,26 @@ +[epel] +name=Extra Packages for Enterprise Linux $releasever - $basearch +#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/$basearch +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-$releasever&arch=$basearch +failovermethod=priority +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL + +[epel-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug +#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/$basearch/debug +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-$releasever&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL +gpgcheck=1 + +[epel-source] +name=Extra Packages for Enterprise Linux $releasever - $basearch - Source +#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/SRPMS +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-$releasever&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL +gpgcheck=1 From 749bf87c3eaf5a08375c953089431e69230552a0 Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Sun, 25 Mar 2007 20:10:17 +0000 Subject: [PATCH 02/20] Modified for RHEL 6 -- (This is devel) --- epel-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index c62563e..741c51d 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release -Version: 4 -Release: 4 +Version: 6 +Release: 0 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -66,6 +66,9 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* Sun Mar 25 2007 Michael Stahnke - 6-0 +- Bumped in devel to RHEL 6. (We can dream). + * Sun Mar 25 2007 Michael Stahnke - 4-4 - Changed description again From 0abe3f4d9e8ee77426571c16a1fd80ffc09dff8e Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Tue, 3 Apr 2007 04:58:29 +0000 Subject: [PATCH 03/20] Crazy changes for EPEL devel branch, which would seem to be RHEL 6. --- epel-testing.repo | 17 +++++++---------- epel.repo | 18 +++++++++--------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/epel-testing.repo b/epel-testing.repo index 9f542e0..bc30769 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,25 +1,22 @@ [epel-testing] -name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch -baseurl= - http://download.fedora.redhat.com/pub/epel/testing/$releasever/$basearch +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch +baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/$basearch failovermethod=priority enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL [epel-testing-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug -baseurl= - http://download.fedora.redhat.com/pub/epel/testing/$releasever/$basearch/debug +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Debug +baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/$basearch/debug failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL gpgcheck=1 -[epel-source] -name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source -baseurl= - http://download.fedora.redhat.com/pub/epel/$releasever/SRPMS +[epel-testing-source] +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Source +baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/SRPMS failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL diff --git a/epel.repo b/epel.repo index baf649b..01afb5d 100644 --- a/epel.repo +++ b/epel.repo @@ -1,25 +1,25 @@ [epel] -name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/$basearch -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-$releasever&arch=$basearch +name=Extra Packages for Enterprise Linux 6 - $basearch +#baseurl=http://download.fedora.redhat.com/pub/epel/6/$basearch +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch failovermethod=priority enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL [epel-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/$basearch/debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-$releasever&arch=$basearch +name=Extra Packages for Enterprise Linux 6 - $basearch - Debug +#baseurl=http://download.fedora.redhat.com/pub/epel/6/$basearch/debug +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=$basearch failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL gpgcheck=1 [epel-source] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/SRPMS -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-$releasever&arch=$basearch +name=Extra Packages for Enterprise Linux 6 - $basearch - Source +#baseurl=http://download.fedora.redhat.com/pub/epel/6/SRPMS +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-6&arch=$basearch failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL From c3373e3549a0e73b2560a21f96a62957e284eef8 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 17 Jul 2008 20:08:11 +0000 Subject: [PATCH 04/20] fix license tag --- epel-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 741c51d..5d31cc3 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,10 +1,10 @@ Name: epel-release Version: 6 -Release: 0 +Release: 1 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base -License: GPL +License: GPLv2 # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from @@ -66,6 +66,9 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 6.1 +- fix license tag + * Sun Mar 25 2007 Michael Stahnke - 6-0 - Bumped in devel to RHEL 6. (We can dream). From 0ad6bc00200e264e099aef6db751a44aab0b1d05 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 15:13:01 +0000 Subject: [PATCH 05/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- epel-release.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epel-release.spec b/epel-release.spec index 5d31cc3..ec0b31f 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 1 +Release: 2 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -66,6 +66,9 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jul 17 2008 Tom "spot" Callaway - 6.1 - fix license tag From e33c4a962081c06367a0eaf55abe2b6daf930f2e Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Tue, 14 Jul 2009 17:31:31 +0000 Subject: [PATCH 06/20] Marking epel-release as invalid in devel --- GPL | 347 ---------------------------------------------- RPM-GPG-KEY-EPEL | 30 ---- dead.package | 1 + epel-testing.repo | 23 --- epel.repo | 26 ---- 5 files changed, 1 insertion(+), 426 deletions(-) delete mode 100644 GPL delete mode 100644 RPM-GPG-KEY-EPEL create mode 100644 dead.package delete mode 100644 epel-testing.repo delete mode 100644 epel.repo diff --git a/GPL b/GPL deleted file mode 100644 index fd8bee7..0000000 --- a/GPL +++ /dev/null @@ -1,347 +0,0 @@ -***************************************************************************** -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/RPM-GPG-KEY-EPEL b/RPM-GPG-KEY-EPEL deleted file mode 100644 index 5a13bb4..0000000 --- a/RPM-GPG-KEY-EPEL +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF -l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/ -QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/ -lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk -/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm -l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl -1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic -vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP -QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ -RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM -AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa -ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/ -blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J -nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl -PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3 -5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS -w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd -yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA -DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1 -axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H -Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T -P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24 -0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC -GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY -bbsLFWOfmzAnNIGvFRWy+YHi -=MMNL ------END PGP PUBLIC KEY BLOCK----- diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3974481 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel-release does not need to be in devel branch. Is obviously only used for EPEL and not rawhide. diff --git a/epel-testing.repo b/epel-testing.repo deleted file mode 100644 index bc30769..0000000 --- a/epel-testing.repo +++ /dev/null @@ -1,23 +0,0 @@ -[epel-testing] -name=Extra Packages for Enterprise Linux 6 - Testing - $basearch -baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/$basearch -failovermethod=priority -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL - -[epel-testing-debuginfo] -name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Debug -baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/$basearch/debug -failovermethod=priority -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL -gpgcheck=1 - -[epel-testing-source] -name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Source -baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/SRPMS -failovermethod=priority -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL -gpgcheck=1 diff --git a/epel.repo b/epel.repo deleted file mode 100644 index 01afb5d..0000000 --- a/epel.repo +++ /dev/null @@ -1,26 +0,0 @@ -[epel] -name=Extra Packages for Enterprise Linux 6 - $basearch -#baseurl=http://download.fedora.redhat.com/pub/epel/6/$basearch -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch -failovermethod=priority -enabled=1 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL - -[epel-debuginfo] -name=Extra Packages for Enterprise Linux 6 - $basearch - Debug -#baseurl=http://download.fedora.redhat.com/pub/epel/6/$basearch/debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=$basearch -failovermethod=priority -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL -gpgcheck=1 - -[epel-source] -name=Extra Packages for Enterprise Linux 6 - $basearch - Source -#baseurl=http://download.fedora.redhat.com/pub/epel/6/SRPMS -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-6&arch=$basearch -failovermethod=priority -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL -gpgcheck=1 From 7fbdb018a17ff9827f03e0e6ef50ecbb8c5cae22 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:50:03 +0000 Subject: [PATCH 07/20] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b8e65af..603fff4 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: epel-release -# $Id$ +# $Id: Makefile,v 1.1 2007/03/25 17:28:28 ausil Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From fe500b072ba1f0025a81350865bc75fba9927037 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 27 Apr 2010 21:40:52 +0000 Subject: [PATCH 08/20] Initialize branch EL-6 for epel-release --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 58ac0c81e602eba85e35bff9164759b460dd0003 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 27 Apr 2010 21:52:10 +0000 Subject: [PATCH 09/20] check in EL-6 configs. cant build yet --- GPL | 347 +++++++++++++++++++++++++++++++++++++++++++++ RPM-GPG-KEY-EPEL-6 | 29 ++++ dead.package | 1 - epel-release.spec | 10 +- epel-testing.repo | 26 ++++ epel.repo | 26 ++++ 6 files changed, 435 insertions(+), 4 deletions(-) create mode 100644 GPL create mode 100644 RPM-GPG-KEY-EPEL-6 delete mode 100644 dead.package create mode 100644 epel-testing.repo create mode 100644 epel.repo 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/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/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-release.spec b/epel-release.spec index ec0b31f..790dec6 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 2 +Release: 1 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -10,7 +10,7 @@ License: GPLv2 # 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 +Source0: http://download.fedora.redhat.com/pub/epel/RPM-GPG-KEY-EPEL-6 Source1: GPL Source2: epel.repo Source3: epel-testing.repo @@ -37,7 +37,7 @@ 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-6 # yum install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d @@ -66,6 +66,10 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* Tue Apr 27 2010 Dennis Gilmore - 6-1 +- setup for EL-6 +- new key + * Tue Feb 24 2009 Fedora Release Engineering - 6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/epel-testing.repo b/epel-testing.repo new file mode 100644 index 0000000..2fbc94f --- /dev/null +++ b/epel-testing.repo @@ -0,0 +1,26 @@ +[epel-testing] +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/testing/6/$basearch +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=$basearch +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 + +[epel-testing-debuginfo] +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/testing/6/$basearch/debug +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel6&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 +gpgcheck=1 + +[epel-testing-source] +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/testing/6/SRPMS +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?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/epel.repo b/epel.repo new file mode 100644 index 0000000..cb8f2d4 --- /dev/null +++ b/epel.repo @@ -0,0 +1,26 @@ +[epel] +name=Extra Packages for Enterprise Linux 6 - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch +failovermethod=priority +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 + +[epel-debuginfo] +name=Extra Packages for Enterprise Linux 6 - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch/debug +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 +gpgcheck=1 + +[epel-source] +name=Extra Packages for Enterprise Linux 6 - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/6/SRPMS +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-6&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 +gpgcheck=1 From 6a5c3d6c02f0189ed4f771a8514584f1315ba7ff Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 9 Jul 2010 16:44:10 +0000 Subject: [PATCH 10/20] use metalink https urls rather than http mirrorlist ones --- epel-release.spec | 5 ++++- epel-testing.repo | 6 +++--- epel.repo | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 790dec6..eda3d0b 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 1 +Release: 3 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -66,6 +66,9 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* Fri Jul 09 2010 Dennis Gilmore - 6-3 +- use metalink urls not mirrorlist ones + * Tue Apr 27 2010 Dennis Gilmore - 6-1 - setup for EL-6 - new key diff --git a/epel-testing.repo b/epel-testing.repo index 2fbc94f..97703b2 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,7 +1,7 @@ [epel-testing] name=Extra Packages for Enterprise Linux 6 - Testing - $basearch #baseurl=http://download.fedoraproject.org/pub/epel/testing/6/$basearch -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-epel6&arch=$basearch failovermethod=priority enabled=0 gpgcheck=1 @@ -10,7 +10,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Debug #baseurl=http://download.fedoraproject.org/pub/epel/testing/6/$basearch/debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel6&arch=$basearch +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 @@ -19,7 +19,7 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Source #baseurl=http://download.fedoraproject.org/pub/epel/testing/6/SRPMS -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel6&arch=$basearch +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 diff --git a/epel.repo b/epel.repo index cb8f2d4..0160dfe 100644 --- a/epel.repo +++ b/epel.repo @@ -1,7 +1,7 @@ [epel] name=Extra Packages for Enterprise Linux 6 - $basearch #baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch failovermethod=priority enabled=1 gpgcheck=1 @@ -10,7 +10,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 [epel-debuginfo] name=Extra Packages for Enterprise Linux 6 - $basearch - Debug #baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch/debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=$basearch +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 @@ -19,7 +19,7 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux 6 - $basearch - Source #baseurl=http://download.fedoraproject.org/pub/epel/6/SRPMS -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-6&arch=$basearch +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 From e13b4f7637dbfc8e28952a5344bbbde0db94f181 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:50:42 +0000 Subject: [PATCH 11/20] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 603fff4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: epel-release -# $Id: Makefile,v 1.1 2007/03/25 17:28:28 ausil Exp $ -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 $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From d0ac92df3c663da85ec712e4257029b528e00832 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Wed, 11 Aug 2010 14:02:39 -0400 Subject: [PATCH 12/20] add conflicts: fedora-release --- epel-release.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epel-release.spec b/epel-release.spec index eda3d0b..c416872 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 3 +Release: 4 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -19,6 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: redhat-release >= %{version} +Conflicts: fedora-release %description This package contains the Extra Packages for Enterprise Linux (EPEL) repository @@ -66,6 +67,9 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* Wed Aug 11 2010 Seth Vidal - 6-4 +- conflict fedora-release + * Fri Jul 09 2010 Dennis Gilmore - 6-3 - use metalink urls not mirrorlist ones From a7bbf623fea8b752ba6b45c02862e7ef46842a10 Mon Sep 17 00:00:00 2001 From: stahnma Date: Tue, 12 Oct 2010 10:23:21 -0400 Subject: [PATCH 13/20] Removing references /etc/sysconfig/sources #627611 Removing references to /etc/sysconfig/sources which was used more in up2date than yum. EL6 does not appear to provide this file. This is good beacuse managing it was quite a hack in post and postun. --- epel-release.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index c416872..19b1c96 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -49,14 +49,15 @@ install -pm 644 %{SOURCE2} %{SOURCE3} \ 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 +# Not needed for el6 as sources has been removed +#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 +#sed -i '/^yum\ epel/d' %{_sysconfdir}/sysconfig/rhn/sources +#sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %files @@ -67,6 +68,9 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* Tue Oct 12 2010 Michael Stahnke - 6-5 +- Fix bug #627611 + * Wed Aug 11 2010 Seth Vidal - 6-4 - conflict fedora-release From 49552b3dcc3bf5677d864e3f046902e823e90f18 Mon Sep 17 00:00:00 2001 From: stahnma Date: Tue, 12 Oct 2010 10:28:34 -0400 Subject: [PATCH 14/20] Forgot to bump the release. --- epel-release.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epel-release.spec b/epel-release.spec index 19b1c96..38ebe12 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 4 +Release: 5 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base From bfb743f1aa40db07ea5c0e3718f6280cf3dedb02 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 20 Apr 2012 00:14:12 -0500 Subject: [PATCH 15/20] add /etc/rpm/macros.ghc-srpm from fedora redhat-rpm-macros --- epel-release.spec | 11 ++++++++++- macros.ghc-srpm | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 macros.ghc-srpm diff --git a/epel-release.spec b/epel-release.spec index 38ebe12..0cd78b7 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 5 +Release: 6 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -14,6 +14,7 @@ Source0: http://download.fedora.redhat.com/pub/epel/RPM-GPG-KEY-EPEL-6 Source1: GPL Source2: epel.repo Source3: epel-testing.repo +Source4: macros.ghc-srpm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -45,6 +46,10 @@ install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d install -pm 644 %{SOURCE2} %{SOURCE3} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +# rpm macros for koji +install -Dpm 644 %{SOURCE4} \ + $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.ghc-srpm + %clean rm -rf $RPM_BUILD_ROOT @@ -65,9 +70,13 @@ rm -rf $RPM_BUILD_ROOT %doc GPL %config(noreplace) /etc/yum.repos.d/* /etc/pki/rpm-gpg/* +/etc/rpm/macros.ghc-srpm %changelog +* Tue Jan 10 2012 Jens Petersen - 6-6 +- add /etc/rpm/macros.ghc-srpm from fedora redhat-rpm-macros + * Tue Oct 12 2010 Michael Stahnke - 6-5 - Fix bug #627611 diff --git a/macros.ghc-srpm b/macros.ghc-srpm new file mode 100644 index 0000000..0b56a46 --- /dev/null +++ b/macros.ghc-srpm @@ -0,0 +1,3 @@ +# macro defining the archs that ghc runs on in epel +%ghc_arches %{ix86} x86_64 +%ghc_arches_with_ghci %{ix86} x86_64 From 9042f1e82b481b8e1ba8cac3e1de6ddf15b59e28 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 10 May 2012 00:48:23 +0900 Subject: [PATCH 16/20] add ppc64 to ghc_arches --- epel-release.spec | 5 ++++- macros.ghc-srpm | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 0cd78b7..8aa5195 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 6 +Release: 7 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 9 2012 Jens Petersen - 6-7 +- add ppc64 to ghc_arches + * Tue Jan 10 2012 Jens Petersen - 6-6 - add /etc/rpm/macros.ghc-srpm from fedora redhat-rpm-macros diff --git a/macros.ghc-srpm b/macros.ghc-srpm index 0b56a46..4a125ba 100644 --- a/macros.ghc-srpm +++ b/macros.ghc-srpm @@ -1,3 +1,3 @@ # macro defining the archs that ghc runs on in epel -%ghc_arches %{ix86} x86_64 +%ghc_arches %{ix86} x86_64 ppc64 %ghc_arches_with_ghci %{ix86} x86_64 From 73bb74cd55089df2860f5172edaefeb8122c5f3c Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Sun, 4 Nov 2012 19:45:43 -0800 Subject: [PATCH 17/20] Fix for #bz 870686 --- epel-release.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 8aa5195..951b156 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 7 +Release: 8 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -9,8 +9,8 @@ License: GPLv2 # This is a Red Hat 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-6 +URL: http://dl.fedoraproject.org/pub/epel/ +Source0: http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6 Source1: GPL Source2: epel.repo Source3: epel-testing.repo @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 04 2012 - 6-8 +- Fix URL bz #870686 + * Wed May 9 2012 Jens Petersen - 6-7 - add ppc64 to ghc_arches From e29dae8a04ceafcbca1954f4d93cc05bb41dc77c Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Sun, 4 Nov 2012 19:46:43 -0800 Subject: [PATCH 18/20] Remove trailing whitespace in specfile --- epel-release.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 951b156..b817516 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,9 +1,9 @@ -Name: epel-release +Name: epel-release Version: 6 Release: 8 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 @@ -11,15 +11,15 @@ License: GPLv2 # within this srpm. URL: http://dl.fedoraproject.org/pub/epel/ Source0: http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6 -Source1: GPL -Source2: epel.repo -Source3: epel-testing.repo +Source1: GPL +Source2: epel.repo +Source3: epel-testing.repo Source4: macros.ghc-srpm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: redhat-release >= %{version} +Requires: redhat-release >= %{version} Conflicts: fedora-release %description @@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT #echo "yum epel http://download.fedora.redhat.com/pub/epel/%{version}/\$ARCH" \ # >> %{_sysconfdir}/sysconfig/rhn/sources -%postun +%postun #sed -i '/^yum\ epel/d' %{_sysconfdir}/sysconfig/rhn/sources #sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources @@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT - use metalink urls not mirrorlist ones * Tue Apr 27 2010 Dennis Gilmore - 6-1 -- setup for EL-6 +- setup for EL-6 - new key * Tue Feb 24 2009 Fedora Release Engineering - 6-2 @@ -115,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT - Changed description * Mon Mar 14 2007 Michael Stahnke - 4-2 -- Fixed up2date issues. +- Fixed up2date issues. * Mon Mar 12 2007 Michael Stahnke - 4-1 - Initial Package From ee19cecb3b7c15408c57e18eb884e077e4e35fec Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 11 Nov 2018 11:09:36 -0800 Subject: [PATCH 19/20] Add Conflicts on redhat-release => 7 to avoid people installing on EL7 Fixes bug #1645568 --- epel-release.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index b817516..0705d44 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 8 +Release: 9 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -19,8 +19,9 @@ Source4: macros.ghc-srpm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: redhat-release >= %{version} +Requires: redhat-release >= %{version} Conflicts: fedora-release +Conflicts: redhat-release >= 7 %description This package contains the Extra Packages for Enterprise Linux (EPEL) repository @@ -74,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 11 2018 Kevin Fenzi - 6-9 +- Add Conflicts on redhat-release => 7 to avoid people installing on EL7 +- Fixes bug #1645568 + * Sun Nov 04 2012 - 6-8 - Fix URL bz #870686 From 1cd7fe0db9a9b38b69e4c77654c1a00caada9c8b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 13 Nov 2018 09:34:20 -0800 Subject: [PATCH 20/20] Revert previous commit, as it won't work. --- epel-release.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 0705d44..c360cce 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 9 +Release: 10 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -21,7 +21,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: redhat-release >= %{version} Conflicts: fedora-release -Conflicts: redhat-release >= 7 %description This package contains the Extra Packages for Enterprise Linux (EPEL) repository @@ -75,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 13 2018 Kevin Fenzi - 6-10 +- Revert previous commit, as it won't work. + * Sun Nov 11 2018 Kevin Fenzi - 6-9 - Add Conflicts on redhat-release => 7 to avoid people installing on EL7 - Fixes bug #1645568