diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..3ffa0ab --- /dev/null +++ b/COPYING @@ -0,0 +1,842 @@ +RPM and it's source code are covered under two separate licenses. + +The entire code base may be distributed under the terms of the GNU General +Public License (GPL), which appears immediately below. Alternatively, +all of the source code in the lib subdirectory of the RPM source code +distribution as well as any code derived from that code may instead be +distributed under the GNU Library General Public License (LGPL), at the +choice of the distributor. The complete text of the LGPL appears +at the bottom of this file. + +This alternatively is allowed to enable applications to be linked against +the RPM library (commonly called librpm) without forcing such applications +to be distributed under the GPL. + +Any questions regarding the licensing of RPM should be addressed to +rpm-maint@lists.rpm.org + +--------------------------------------------------------------------------- + + 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 + + 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. + +--------------------------------------------------------------------------- + + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 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. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, 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 library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, 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 companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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. + + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library 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 Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. 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) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; 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. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/python-rpm-generators.spec b/python-rpm-generators.spec index 3f5ff6f..0391177 100644 --- a/python-rpm-generators.spec +++ b/python-rpm-generators.spec @@ -1,106 +1,42 @@ -# This package is part of the Python 3 bootstrapping sequence. -# -# The python3-devel subpackage has a runtime dependency on this package. -# Therefore it needs to be built before Python 3 itself. To facilitate this, -# this package has a bootstrapping mode—triggered by the macro below—that skips -# bytecompilation and therefore no Python is actually needed for building of -# this package. After Python 3 is built, this package can be rebuilt in -# normal mode again. -# -# Note, however, that even the bootstrapping version of this package is fully -# functional as Python will simply bytecompile the Python files when they are -# run. There will be a warning that the bytecompiled file cannot be saved -# (unless Python is run with root privileges), but the script will work. -# -# More info on the Python 3 bootstrapping sequence in the `python3` spec file. -# -%bcond_with bootstrap - - -# Disable automatic (Python 2) bytecompilation in %%__os_install_post. -# When not in bootstrapping mode, the scripts are bytecompiled -# in the %%install section. +# Disable automatic bytecompilation. We install only one script and we will +# never "import" it. %undefine py_auto_byte_compile -%global srcname rpm - -# These macros are copied from the `rpm` package so it's trivial to keep -# the two packages on the same upstream version. -%global rpmver 4.14.0 -#global snapver rc2 -%global rel 2 - -%global srcver %{version}%{?snapver:-%{snapver}} -%global srcdir %{?snapver:testing}%{!?snapver:rpm-%(echo %{version} | cut -d'.' -f1-2).x} - Name: python-rpm-generators -Summary: Requires and Provides generators for Python RPMs -Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist}.1 +Summary: Dependency generators for Python RPMs +Version: 5 +Release: 1%{?dist} + +# Originally all those files were part of RPM, so license is kept here License: GPLv2+ -Url: http://www.rpm.org/ -Source0: http://ftp.rpm.org/releases/%{srcdir}/%{srcname}-%{srcver}.tar.bz2 +Url: https://src.fedoraproject.org/python-rpm-generators +# Commit is the last change in following files +Source0: https://raw.githubusercontent.com/rpm-software-management/rpm/102eab50b3d0d6546dfe082eac0ade21e6b3dbf1/COPYING +Source1: python.attr +Source2: pythondeps.sh +Source3: pythondistdeps.py BuildArch: noarch -%if %{without bootstrap} -BuildRequires: python3-devel -%endif - -# Enable rich Provides generator (pythondistdeps.py instead of pythondeps.sh) -# Downstream only -Patch1: rpm-4.13.x-pythondistdeps-fileattr.patch -# Switch the shebang of pythondistdeps.py to Python 3 -# Downstream only: https://github.com/rpm-software-management/rpm/pull/212 -Patch2: rpm-4.13.x-pythondistdeps-python3.patch - -# Handle Platform-Python implemented as a separate Python stack -# https://fedoraproject.org/wiki/Changes/Platform_Python_Stack -Patch3: rpm-4.13.x-pythondeps-platform-python-abi.patch -Patch4: rpm-4.13.x-pythondistdeps.py-platform-python.patch - %description -This package provides scripts that analyse Python binary RPM packages -and add appropriate Provides and Requires tags to them. +%{summary}. - -%package -n python3-rpm-generators +%package -n python3-rpm-generators Summary: %{summary} Requires: python3-setuptools -# We're installing files into rpm's directories, therefore we're requiring it -# to be installed so the directories are created. -Requires: rpm -# Conflicts with older versions of `rpm-build` because it copies several files -# to the same locations which is ok only when they have the same contents. +# The point of split Conflicts: rpm-build < 4.13.0.1-2 -%{?python_provide:%python_provide python3-rpm-generators} %description -n python3-rpm-generators -This package provides scripts that analyse Python binary RPM packages -and add appropriate Provides and Requires tags to them. - +%{summary}. %prep -%autosetup -n %{srcname}-%{srcver} -p1 - - -%build -%if %{without bootstrap} -%{__python3} -m compileall scripts/ -%endif - +%autosetup -c -T +cp -a %{sources} . %install -install -Dm 644 fileattrs/python.attr -t %{buildroot}/%{_fileattrsdir} -install -Dm 755 scripts/pythondeps.sh \ - scripts/pythondistdeps.py \ - -t %{buildroot}/%{_rpmconfigdir} - -%if %{without bootstrap} -install -Dm 755 scripts/__pycache__/* \ - -t %{buildroot}/%{_rpmconfigdir}/__pycache__ -%endif - +install -Dpm0644 -t %{buildroot}%{_fileattrsdir} python.attr +install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py %files -n python3-rpm-generators %license COPYING @@ -108,12 +44,10 @@ install -Dm 755 scripts/__pycache__/* \ %{_rpmconfigdir}/pythondeps.sh %{_rpmconfigdir}/pythondistdeps.py -%if %{without bootstrap} -%{_rpmconfigdir}/__pycache__ -%endif - - %changelog +* Sun Feb 11 2018 Igor Gnatenko - 5-1 +- Fork upstream generators + * Fri Feb 09 2018 Fedora Release Engineering - 4.14.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/python.attr b/python.attr new file mode 100644 index 0000000..0f3c2cc --- /dev/null +++ b/python.attr @@ -0,0 +1,4 @@ +%__python_provides %{_rpmconfigdir}/pythondeps.sh --provides +%__python_requires %{_rpmconfigdir}/pythondeps.sh --requires +%__python_path ^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]\\.[[:digit:]]))$ +%__python_magic [Pp]ython.*(executable|byte-compiled) diff --git a/pythondeps.sh b/pythondeps.sh new file mode 100755 index 0000000..10a060a --- /dev/null +++ b/pythondeps.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +[ $# -ge 1 ] || { + cat > /dev/null + exit 0 +} + +case $1 in +-P|--provides) + shift + # Match buildroot/payload paths of the form + # /PATH/OF/BUILDROOT/usr/bin/pythonMAJOR.MINOR + # generating a line of the form + # python(abi) = MAJOR.MINOR + # (Don't match against -config tools e.g. /usr/bin/python2.6-config) + grep "/usr/bin/python.\..$" \ + | sed -e "s|.*/usr/bin/python\(.\..\)|python(abi) = \1|" + ;; +-R|--requires) + shift + # Match buildroot paths of the form + # /PATH/OF/BUILDROOT/usr/lib/pythonMAJOR.MINOR/ and + # /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/ + # generating (uniqely) lines of the form: + # python(abi) = MAJOR.MINOR + grep "/usr/lib[^/]*/python.\../.*" \ + | sed -e "s|.*/usr/lib[^/]*/python\(.\..\)/.*|python(abi) = \1|g" \ + | sort | uniq + ;; +esac + +exit 0 diff --git a/pythondistdeps.py b/pythondistdeps.py new file mode 100755 index 0000000..2abb59f --- /dev/null +++ b/pythondistdeps.py @@ -0,0 +1,240 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright 2010 Per Øyvind Karlsen +# Copyright 2015 Neal Gompa +# +# This program is free software. It may be redistributed and/or modified under +# the terms of the LGPL version 2.1 (or later). +# +# RPM python dependency generator, using .egg-info/.egg-link/.dist-info data +# + +from __future__ import print_function +from getopt import getopt +from os.path import basename, dirname, isdir, sep +from sys import argv, stdin, version +from distutils.sysconfig import get_python_lib +from warnings import warn + + +opts, args = getopt( + argv[1:], 'hPRrCEMmLl:', + ['help', 'provides', 'requires', 'recommends', 'conflicts', 'extras', 'majorver-provides', 'majorver-only', 'legacy-provides' , 'legacy']) + +Provides = False +Requires = False +Recommends = False +Conflicts = False +Extras = False +Provides_PyMajorVer_Variant = False +PyMajorVer_Deps = False +legacy_Provides = False +legacy = False + +for o, a in opts: + if o in ('-h', '--help'): + print('-h, --help\tPrint help') + print('-P, --provides\tPrint Provides') + print('-R, --requires\tPrint Requires') + print('-r, --recommends\tPrint Recommends') + print('-C, --conflicts\tPrint Conflicts') + print('-E, --extras\tPrint Extras ') + print('-M, --majorver-provides\tPrint extra Provides with Python major version only') + print('-m, --majorver-only\tPrint Provides/Requires with Python major version only') + print('-L, --legacy-provides\tPrint extra legacy pythonegg Provides') + print('-l, --legacy\tPrint legacy pythonegg Provides/Requires instead') + exit(1) + elif o in ('-P', '--provides'): + Provides = True + elif o in ('-R', '--requires'): + Requires = True + elif o in ('-r', '--recommends'): + Recommends = True + elif o in ('-C', '--conflicts'): + Conflicts = True + elif o in ('-E', '--extras'): + Extras = True + elif o in ('-M', '--majorver-provides'): + Provides_PyMajorVer_Variant = True + elif o in ('-m', '--majorver-only'): + PyMajorVer_Deps = True + elif o in ('-L', '--legacy-provides'): + legacy_Provides = True + elif o in ('-l', '--legacy'): + legacy = True + +if Requires: + py_abi = True +else: + py_abi = False +py_deps = {} +if args: + files = args +else: + files = stdin.readlines() + +for f in files: + f = f.strip() + lower = f.lower() + name = 'python(abi)' + # add dependency based on path, versioned if within versioned python directory + if py_abi and (lower.endswith('.py') or lower.endswith('.pyc') or lower.endswith('.pyo')): + if name not in py_deps: + py_deps[name] = [] + purelib = get_python_lib(standard_lib=1, plat_specific=0).split(version[:3])[0] + platlib = get_python_lib(standard_lib=1, plat_specific=1).split(version[:3])[0] + for lib in (purelib, platlib): + if lib in f: + spec = ('==', f.split(lib)[1].split(sep)[0]) + if spec not in py_deps[name]: + py_deps[name].append(spec) + + # XXX: hack to workaround RPM internal dependency generator not passing directories + lower_dir = dirname(lower) + if lower_dir.endswith('.egg') or \ + lower_dir.endswith('.egg-info') or \ + lower_dir.endswith('.dist-info'): + lower = lower_dir + f = dirname(f) + # Determine provide, requires, conflicts & recommends based on egg/dist metadata + if lower.endswith('.egg') or \ + lower.endswith('.egg-info') or \ + lower.endswith('.dist-info'): + # This import is very slow, so only do it if needed + from pkg_resources import Distribution, FileMetadata, PathMetadata + dist_name = basename(f) + if isdir(f): + path_item = dirname(f) + metadata = PathMetadata(path_item, f) + else: + path_item = f + metadata = FileMetadata(f) + dist = Distribution.from_location(path_item, dist_name, metadata) + # Check if py_version is defined in the metadata file/directory name + if not dist.py_version: + # Try to parse the Python version from the path the metadata + # resides at (e.g. /usr/lib/pythonX.Y/site-packages/...) + import re + res = re.search(r"/python(?P\d+\.\d)/", path_item) + if res: + dist.py_version = res.group('pyver') + else: + warn("Version for {!r} has not been found".format(dist), RuntimeWarning) + continue + if Provides_PyMajorVer_Variant or PyMajorVer_Deps or legacy_Provides or legacy: + # Get the Python major version + pyver_major = dist.py_version.split('.')[0] + if Provides: + # If egg/dist metadata says package name is python, we provide python(abi) + if dist.key == 'python': + name = 'python(abi)' + if name not in py_deps: + py_deps[name] = [] + py_deps[name].append(('==', dist.py_version)) + if not legacy or not PyMajorVer_Deps: + name = 'python{}dist({})'.format(dist.py_version, dist.key) + if name not in py_deps: + py_deps[name] = [] + if Provides_PyMajorVer_Variant or PyMajorVer_Deps: + pymajor_name = 'python{}dist({})'.format(pyver_major, dist.key) + if pymajor_name not in py_deps: + py_deps[pymajor_name] = [] + if legacy or legacy_Provides: + legacy_name = 'pythonegg({})({})'.format(pyver_major, dist.key) + if legacy_name not in py_deps: + py_deps[legacy_name] = [] + if dist.version: + spec = ('==', dist.version) + if spec not in py_deps[name]: + if not legacy: + py_deps[name].append(spec) + if Provides_PyMajorVer_Variant: + py_deps[pymajor_name].append(spec) + if legacy or legacy_Provides: + py_deps[legacy_name].append(spec) + if Requires or (Recommends and dist.extras): + name = 'python(abi)' + # If egg/dist metadata says package name is python, we don't add dependency on python(abi) + if dist.key == 'python': + py_abi = False + if name in py_deps: + py_deps.pop(name) + elif py_abi and dist.py_version: + if name not in py_deps: + py_deps[name] = [] + spec = ('==', dist.py_version) + if spec not in py_deps[name]: + py_deps[name].append(spec) + deps = dist.requires() + if Recommends: + depsextras = dist.requires(extras=dist.extras) + if not Requires: + for dep in reversed(depsextras): + if dep in deps: + depsextras.remove(dep) + deps = depsextras + # add requires/recommends based on egg/dist metadata + for dep in deps: + if legacy: + name = 'pythonegg({})({})'.format(pyver_major, dep.key) + else: + if PyMajorVer_Deps: + name = 'python{}dist({})'.format(pyver_major, dep.key) + else: + name = 'python{}dist({})'.format(dist.py_version, dep.key) + for spec in dep.specs: + if spec[0] != '!=': + if name not in py_deps: + py_deps[name] = [] + if spec not in py_deps[name]: + py_deps[name].append(spec) + if not dep.specs: + py_deps[name] = [] + # Unused, for automatic sub-package generation based on 'extras' from egg/dist metadata + # TODO: implement in rpm later, or...? + if Extras: + deps = dist.requires() + extras = dist.extras + print(extras) + for extra in extras: + print('%%package\textras-{}'.format(extra)) + print('Summary:\t{} extra for {} python package'.format(extra, dist.key)) + print('Group:\t\tDevelopment/Python') + depsextras = dist.requires(extras=[extra]) + for dep in reversed(depsextras): + if dep in deps: + depsextras.remove(dep) + deps = depsextras + for dep in deps: + for spec in dep.specs: + if spec[0] == '!=': + print('Conflicts:\t{} {} {}'.format(dep.key, '==', spec[1])) + else: + print('Requires:\t{} {} {}'.format(dep.key, spec[0], spec[1])) + print('%%description\t{}'.format(extra)) + print('{} extra for {} python package'.format(extra, dist.key)) + print('%%files\t\textras-{}\n'.format(extra)) + if Conflicts: + # Should we really add conflicts for extras? + # Creating a meta package per extra with recommends on, which has + # the requires/conflicts in stead might be a better solution... + for dep in dist.requires(extras=dist.extras): + name = dep.key + for spec in dep.specs: + if spec[0] == '!=': + if name not in py_deps: + py_deps[name] = [] + spec = ('==', spec[1]) + if spec not in py_deps[name]: + py_deps[name].append(spec) +names = list(py_deps.keys()) +names.sort() +for name in names: + if py_deps[name]: + # Print out versioned provides, requires, recommends, conflicts + for spec in py_deps[name]: + print('{} {} {}'.format(name, spec[0], spec[1])) + else: + # Print out unversioned provides, requires, recommends, conflicts + print(name) diff --git a/rpm-4.13.x-pythondeps-platform-python-abi.patch b/rpm-4.13.x-pythondeps-platform-python-abi.patch deleted file mode 100644 index b44e900..0000000 --- a/rpm-4.13.x-pythondeps-platform-python-abi.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fef3b646f3facd26dc04cfccdc27c061cfe0ee37 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 7 Aug 2017 16:28:59 +0200 -Subject: [PATCH] Generate requires and provides for platform-python(abi) - -See https://fedoraproject.org/wiki/Changes/Platform_Python_Stack ---- - scripts/pythondeps.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/scripts/pythondeps.sh b/scripts/pythondeps.sh -index 10a060aac..a6d97ef4f 100755 ---- a/scripts/pythondeps.sh -+++ b/scripts/pythondeps.sh -@@ -13,8 +13,8 @@ case $1 in - # generating a line of the form - # python(abi) = MAJOR.MINOR - # (Don't match against -config tools e.g. /usr/bin/python2.6-config) -- grep "/usr/bin/python.\..$" \ -- | sed -e "s|.*/usr/bin/python\(.\..\)|python(abi) = \1|" -+ egrep '/usr/(bin/|libexec/platform-)python.\..$' \ -+ | sed -r -e "s@.*/usr/(bin/|libexec/(platform-))python(.\..)@\2python(abi) = \3@" - ;; - -R|--requires) - shift -@@ -23,8 +23,8 @@ case $1 in - # /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/ - # generating (uniqely) lines of the form: - # python(abi) = MAJOR.MINOR -- grep "/usr/lib[^/]*/python.\../.*" \ -- | sed -e "s|.*/usr/lib[^/]*/python\(.\..\)/.*|python(abi) = \1|g" \ -+ egrep '/usr/lib[^/]*/(platform-|)python.\../.*' \ -+ | sed -r -e "s@.*/usr/lib[^/]*/(platform-|)python(.\..)/.*@\1python(abi) = \2@g" \ - | sort | uniq - ;; - esac diff --git a/rpm-4.13.x-pythondistdeps-Makefile.patch b/rpm-4.13.x-pythondistdeps-Makefile.patch deleted file mode 100644 index dfdaf00..0000000 --- a/rpm-4.13.x-pythondistdeps-Makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- rpm-4.13.0-rc1/scripts/Makefile.am.orig 2015-09-01 19:45:43.896822977 +0200 -+++ rpm-4.13.0-rc1/scripts/Makefile.am 2016-06-13 15:46:34.281390084 +0200 -@@ -11,7 +11,7 @@ - check-files check-prereqs \ - check-buildroot check-rpaths check-rpaths-worker \ - find-debuginfo.sh find-lang.sh \ -- perl.prov perl.req pythondeps.sh \ -+ perl.prov perl.req pythondeps.sh pythondistdeps.py \ - rpmdb_loadcvt rpm.daily rpm.log rpm.supp rpm2cpio.sh \ - tgpg vpkg-provides.sh \ - find-requires find-provides \ -@@ -30,7 +30,7 @@ - check-files check-prereqs \ - check-buildroot check-rpaths check-rpaths-worker \ - find-lang.sh find-requires find-provides \ -- perl.prov perl.req pythondeps.sh \ -+ perl.prov perl.req pythondeps.sh pythondistdeps.py \ - mono-find-requires mono-find-provides \ - pkgconfigdeps.sh libtooldeps.sh \ - ocaml-find-requires.sh ocaml-find-provides.sh \ diff --git a/rpm-4.13.x-pythondistdeps-fileattr.patch b/rpm-4.13.x-pythondistdeps-fileattr.patch deleted file mode 100644 index 72ab9e6..0000000 --- a/rpm-4.13.x-pythondistdeps-fileattr.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- rpm-4.13.0-rc1/fileattrs/python.attr.orig 2016-06-13 15:49:10.072832164 +0200 -+++ rpm-4.13.0-rc1/fileattrs/python.attr 2016-06-13 15:50:46.687106846 +0200 -@@ -1,4 +1,4 @@ --%__python_provides %{_rpmconfigdir}/pythondeps.sh --provides -+%__python_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides - %__python_requires %{_rpmconfigdir}/pythondeps.sh --requires --%__python_path ^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]\\.[[:digit:]]))$ -+%__python_path ^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*))|(%{_bindir}/python[[:digit:]]\\.[[:digit:]]))$ - %__python_magic [Pp]ython.*(executable|byte-compiled) diff --git a/rpm-4.13.x-pythondistdeps-python3.patch b/rpm-4.13.x-pythondistdeps-python3.patch deleted file mode 100644 index eb4c6ae..0000000 --- a/rpm-4.13.x-pythondistdeps-python3.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -uNr rpm-4.13.0.orig/scripts/pythondistdeps.py rpm-4.13.0/scripts/pythondistdeps.py ---- rpm-4.13.0.orig/scripts/pythondistdeps.py 2016-12-18 12:25:21.287632679 +0100 -+++ rpm-4.13.0/scripts/pythondistdeps.py 2016-12-18 12:25:48.857479226 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # - # Copyright 2010 Per Øyvind Karlsen diff --git a/rpm-4.13.x-pythondistdeps.patch b/rpm-4.13.x-pythondistdeps.patch deleted file mode 100644 index 695393c..0000000 --- a/rpm-4.13.x-pythondistdeps.patch +++ /dev/null @@ -1,229 +0,0 @@ -diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py -new file mode 100755 -index 0000000..8a2f43d ---- /dev/null -+++ b/scripts/pythondistdeps.py -@@ -0,0 +1,223 @@ -+#!/usr/bin/python -+# -*- coding: utf-8 -*- -+# -+# Copyright 2010 Per Øyvind Karlsen -+# Copyright 2015 Neal Gompa -+# -+# This program is free software. It may be redistributed and/or modified under -+# the terms of the LGPL version 2.1 (or later). -+# -+# RPM python dependency generator, using .egg-info/.egg-link/.dist-info data -+# -+ -+from __future__ import print_function -+from getopt import getopt -+from os.path import basename, dirname, isdir, sep -+from sys import argv, stdin, version -+from distutils.sysconfig import get_python_lib -+ -+ -+opts, args = getopt( -+ argv[1:], 'hPRrCEMLl:', -+ ['help', 'provides', 'requires', 'recommends', 'conflicts', 'extras', 'majorver-provides', 'legacy-provides' , 'legacy']) -+ -+Provides = False -+Requires = False -+Recommends = False -+Conflicts = False -+Extras = False -+Provides_PyMajorVer_Variant = False -+legacy_Provides = False -+legacy = False -+ -+for o, a in opts: -+ if o in ('-h', '--help'): -+ print('-h, --help\tPrint help') -+ print('-P, --provides\tPrint Provides') -+ print('-R, --requires\tPrint Requires') -+ print('-r, --recommends\tPrint Recommends') -+ print('-C, --conflicts\tPrint Conflicts') -+ print('-E, --extras\tPrint Extras ') -+ print('-M, --majorver-provides\tPrint extra Provides with Python major version only') -+ print('-L, --legacy-provides\tPrint extra legacy pythonegg Provides') -+ print('-l, --legacy\tPrint legacy pythonegg Provides/Requires instead') -+ exit(1) -+ elif o in ('-P', '--provides'): -+ Provides = True -+ elif o in ('-R', '--requires'): -+ Requires = True -+ elif o in ('-r', '--recommends'): -+ Recommends = True -+ elif o in ('-C', '--conflicts'): -+ Conflicts = True -+ elif o in ('-E', '--extras'): -+ Extras = True -+ elif o in ('-M', '--majorver-provides'): -+ Provides_PyMajorVer_Variant = True -+ elif o in ('-L', '--legacy-provides'): -+ legacy_Provides = True -+ elif o in ('-l', '--legacy'): -+ legacy = True -+ -+if Requires: -+ py_abi = True -+else: -+ py_abi = False -+py_deps = {} -+if args: -+ files = args -+else: -+ files = stdin.readlines() -+ -+for f in files: -+ f = f.strip() -+ lower = f.lower() -+ name = 'python(abi)' -+ # add dependency based on path, versioned if within versioned python directory -+ if py_abi and (lower.endswith('.py') or lower.endswith('.pyc') or lower.endswith('.pyo')): -+ if name not in py_deps: -+ py_deps[name] = [] -+ purelib = get_python_lib(standard_lib=1, plat_specific=0).split(version[:3])[0] -+ platlib = get_python_lib(standard_lib=1, plat_specific=1).split(version[:3])[0] -+ for lib in (purelib, platlib): -+ if lib in f: -+ spec = ('==', f.split(lib)[1].split(sep)[0]) -+ if spec not in py_deps[name]: -+ py_deps[name].append(spec) -+ -+ # XXX: hack to workaround RPM internal dependency generator not passing directories -+ lower_dir = dirname(lower) -+ if lower_dir.endswith('.egg') or \ -+ lower_dir.endswith('.egg-info') or \ -+ lower_dir.endswith('.egg-link') or \ -+ lower_dir.endswith('.dist-info'): -+ lower = lower_dir -+ f = dirname(f) -+ # Determine provide, requires, conflicts & recommends based on egg/dist metadata -+ if lower.endswith('.egg') or \ -+ lower.endswith('.egg-info') or \ -+ lower.endswith('.egg-link') or \ -+ lower.endswith('.dist-info'): -+ # This import is very slow, so only do it if needed -+ from pkg_resources import Distribution, FileMetadata, PathMetadata -+ dist_name = basename(f) -+ if isdir(f): -+ path_item = dirname(f) -+ metadata = PathMetadata(path_item, f) -+ else: -+ path_item = f -+ metadata = FileMetadata(f) -+ dist = Distribution.from_location(path_item, dist_name, metadata) -+ if (Provides_PyMajorVer_Variant or legacy_Provides or legacy) and Provides: -+ # Get the Python major version -+ pyver_major = dist.py_version.split('.')[0] -+ if Provides: -+ # If egg/dist metadata says package name is python, we provide python(abi) -+ if dist.key == 'python': -+ name = 'python(abi)' -+ if name not in py_deps: -+ py_deps[name] = [] -+ py_deps[name].append(('==', dist.py_version)) -+ if not legacy: -+ name = 'python{}dist({})'.format(dist.py_version, dist.key) -+ if name not in py_deps: -+ py_deps[name] = [] -+ if Provides_PyMajorVer_Variant: -+ pymajor_name = 'python{}dist({})'.format(pyver_major, dist.key) -+ if pymajor_name not in py_deps: -+ py_deps[pymajor_name] = [] -+ if legacy or legacy_Provides: -+ legacy_name = 'pythonegg({})({})'.format(pyver_major, dist.key) -+ if legacy_name not in py_deps: -+ py_deps[legacy_name] = [] -+ if dist.version: -+ spec = ('==', dist.version) -+ if spec not in py_deps[name]: -+ if not legacy: -+ py_deps[name].append(spec) -+ if Provides_PyMajorVer_Variant: -+ py_deps[pymajor_name].append(spec) -+ if legacy or legacy_Provides: -+ py_deps[legacy_name].append(spec) -+ if Requires or (Recommends and dist.extras): -+ name = 'python(abi)' -+ # If egg/dist metadata says package name is python, we don't add dependency on python(abi) -+ if dist.key == 'python': -+ py_abi = False -+ if name in py_deps: -+ py_deps.pop(name) -+ elif py_abi and dist.py_version: -+ if name not in py_deps: -+ py_deps[name] = [] -+ spec = ('==', dist.py_version) -+ if spec not in py_deps[name]: -+ py_deps[name].append(spec) -+ deps = dist.requires() -+ if Recommends: -+ depsextras = dist.requires(extras=dist.extras) -+ if not Requires: -+ for dep in reversed(depsextras): -+ if dep in deps: -+ depsextras.remove(dep) -+ deps = depsextras -+ # add requires/recommends based on egg/dist metadata -+ for dep in deps: -+ if legacy: -+ name = 'pythonegg({})({})'.format(pyver_major, dep.key) -+ else: -+ name = 'python{}dist({})'.format(dist.py_version, dep.key) -+ for spec in dep.specs: -+ if spec[0] != '!=': -+ if name not in py_deps: -+ py_deps[name] = [] -+ if spec not in py_deps[name]: -+ py_deps[name].append(spec) -+ if not dep.specs: -+ py_deps[name] = [] -+ # Unused, for automatic sub-package generation based on 'extras' from egg/dist metadata -+ # TODO: implement in rpm later, or...? -+ if Extras: -+ deps = dist.requires() -+ extras = dist.extras -+ print(extras) -+ for extra in extras: -+ print('%%package\textras-{}'.format(extra)) -+ print('Summary:\t{} extra for {} python package'.format(extra, dist.key)) -+ print('Group:\t\tDevelopment/Python') -+ depsextras = dist.requires(extras=[extra]) -+ for dep in reversed(depsextras): -+ if dep in deps: -+ depsextras.remove(dep) -+ deps = depsextras -+ for dep in deps: -+ for spec in dep.specs: -+ if spec[0] == '!=': -+ print('Conflicts:\t{} {} {}'.format(dep.key, '==', spec[1])) -+ else: -+ print('Requires:\t{} {} {}'.format(dep.key, spec[0], spec[1])) -+ print('%%description\t{}'.format(extra)) -+ print('{} extra for {} python package'.format(extra, dist.key)) -+ print('%%files\t\textras-{}\n'.format(extra)) -+ if Conflicts: -+ # Should we really add conflicts for extras? -+ # Creating a meta package per extra with recommends on, which has -+ # the requires/conflicts in stead might be a better solution... -+ for dep in dist.requires(extras=dist.extras): -+ name = dep.key -+ for spec in dep.specs: -+ if spec[0] == '!=': -+ if name not in py_deps: -+ py_deps[name] = [] -+ spec = ('==', spec[1]) -+ if spec not in py_deps[name]: -+ py_deps[name].append(spec) -+names = list(py_deps.keys()) -+names.sort() -+for name in names: -+ if py_deps[name]: -+ # Print out versioned provides, requires, recommends, conflicts -+ for spec in py_deps[name]: -+ print('{} {} {}'.format(name, spec[0], spec[1])) -+ else: -+ # Print out unversioned provides, requires, recommends, conflicts -+ print(name) diff --git a/rpm-4.13.x-pythondistdeps.py-add-forgotten-import.patch b/rpm-4.13.x-pythondistdeps.py-add-forgotten-import.patch deleted file mode 100644 index 2a0b121..0000000 --- a/rpm-4.13.x-pythondistdeps.py-add-forgotten-import.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 30d472c8af086df077e6cf047a87fdaf93c9b21b Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Wed, 24 Aug 2016 15:37:16 +0200 -Subject: [PATCH] pythondistdeps.py: add forgotten import - -Signed-off-by: Igor Gnatenko ---- - scripts/pythondistdeps.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py -index 76017f3..e4b99e2 100755 ---- a/scripts/pythondistdeps.py -+++ b/scripts/pythondistdeps.py -@@ -15,6 +15,7 @@ from getopt import getopt - from os.path import basename, dirname, isdir, sep - from sys import argv, stdin, version - from distutils.sysconfig import get_python_lib -+from warnings import warn - - - opts, args = getopt( -@@ -108,7 +109,7 @@ for f in files: - dist = Distribution.from_location(path_item, dist_name, metadata) - # Check if py_version is defined in the file - if not dist.py_version: -- warnings.warn("Version for {!r} has not been found".format(dist), RuntimeWarning) -+ warn("Version for {!r} has not been found".format(dist), RuntimeWarning) - continue - if (Provides_PyMajorVer_Variant or legacy_Provides or legacy) and Provides: - # Get the Python major version --- -2.9.3 - diff --git a/rpm-4.13.x-pythondistdeps.py-fix-processing-wheels.patch b/rpm-4.13.x-pythondistdeps.py-fix-processing-wheels.patch deleted file mode 100644 index 7aa5eb3..0000000 --- a/rpm-4.13.x-pythondistdeps.py-fix-processing-wheels.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ff395f4a820497a443baa6cd0198c49b06207c3f Mon Sep 17 00:00:00 2001 -From: Tomas Orsava -Date: Thu, 16 Feb 2017 11:36:29 +0100 -Subject: [PATCH] Fix pythondistdeps.py --provides for Python wheels - -As Python wheels do not contain targetted Python version in the directory/file -name of their metadata like Python eggs do, and since the Python version is not -contained in the metadata either, it is necessary to get it from elsewhere. - -Here it is parsed from the path the metadata resides at -(e.g. /usr/lib/pythonX.Y/site-packages/...) ---- - scripts/pythondistdeps.py | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py -index e4b99e2..d44210c 100644 ---- a/scripts/pythondistdeps.py -+++ b/scripts/pythondistdeps.py -@@ -107,10 +107,17 @@ for f in files: - path_item = f - metadata = FileMetadata(f) - dist = Distribution.from_location(path_item, dist_name, metadata) -- # Check if py_version is defined in the file -+ # Check if py_version is defined in the metadata file/directory name - if not dist.py_version: -- warn("Version for {!r} has not been found".format(dist), RuntimeWarning) -- continue -+ # Try to parse the Python version from the path the metadata -+ # resides at (e.g. /usr/lib/pythonX.Y/site-packages/...) -+ import re -+ res = re.search(r"/python(?P\d+\.\d)/", path_item) -+ if res: -+ dist.py_version = res.group('pyver') -+ else: -+ warn("Version for {!r} has not been found".format(dist), RuntimeWarning) -+ continue - if (Provides_PyMajorVer_Variant or legacy_Provides or legacy) and Provides: - # Get the Python major version - pyver_major = dist.py_version.split('.')[0] --- -2.11.0 - diff --git a/rpm-4.13.x-pythondistdeps.py-platform-python.patch b/rpm-4.13.x-pythondistdeps.py-platform-python.patch deleted file mode 100644 index 8afbf3b..0000000 --- a/rpm-4.13.x-pythondistdeps.py-platform-python.patch +++ /dev/null @@ -1,42 +0,0 @@ -From eb48f08dd30324f960b8e404b80eb885b2bbb593 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Thu, 24 Aug 2017 13:45:49 +0200 -Subject: [PATCH] Do not provide pythonXdist for platform-python packages - ---- - scripts/pythondistdeps.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py -index 2abb59f49..f624fdbb7 100755 ---- a/scripts/pythondistdeps.py -+++ b/scripts/pythondistdeps.py -@@ -16,6 +16,7 @@ from os.path import basename, dirname, isdir, sep - from sys import argv, stdin, version - from distutils.sysconfig import get_python_lib - from warnings import warn -+import re - - - opts, args = getopt( -@@ -78,6 +79,9 @@ for f in files: - f = f.strip() - lower = f.lower() - name = 'python(abi)' -+ if re.search(r'/usr/lib(64)?/platform-python\d\.\d', lower): -+ # https://bugzilla.redhat.com/show_bug.cgi?id=1484607 -+ continue - # add dependency based on path, versioned if within versioned python directory - if py_abi and (lower.endswith('.py') or lower.endswith('.pyc') or lower.endswith('.pyo')): - if name not in py_deps: -@@ -115,7 +119,6 @@ for f in files: - if not dist.py_version: - # Try to parse the Python version from the path the metadata - # resides at (e.g. /usr/lib/pythonX.Y/site-packages/...) -- import re - res = re.search(r"/python(?P\d+\.\d)/", path_item) - if res: - dist.py_version = res.group('pyver') --- -2.13.5 - diff --git a/rpm-4.13.x-pythondistdeps.py-show-warning-if-version-is-not-fou.patch b/rpm-4.13.x-pythondistdeps.py-show-warning-if-version-is-not-fou.patch deleted file mode 100644 index 0db2977..0000000 --- a/rpm-4.13.x-pythondistdeps.py-show-warning-if-version-is-not-fou.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2f51022e1586a9b3ac8036b23995074b00910475 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Mon, 22 Aug 2016 12:55:50 +0200 -Subject: [PATCH 2/3] pythondistdeps.py: show warning if version is not found - in metadata - -In 49197c930bb6090d0fca4089ea75ec9d10e62f99 we introduced skipping -metadata which has no version, but it's better to show some warning. - -Signed-off-by: Igor Gnatenko ---- - scripts/pythondistdeps.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py -index 54905c3..d7226e0 100755 ---- a/scripts/pythondistdeps.py -+++ b/scripts/pythondistdeps.py -@@ -110,6 +110,7 @@ for f in files: - dist = Distribution.from_location(path_item, dist_name, metadata) - # Check if py_version is defined in the file - if not dist.py_version: -+ warnings.warn("Version for {!r} has not been found".format(dist), RuntimeWarning) - continue - if (Provides_PyMajorVer_Variant or legacy_Provides or legacy) and Provides: - # Get the Python major version --- -2.9.3 - diff --git a/rpm-4.13.x-pythondistdeps.py-skip-.egg-link-files.patch b/rpm-4.13.x-pythondistdeps.py-skip-.egg-link-files.patch deleted file mode 100644 index a555ed5..0000000 --- a/rpm-4.13.x-pythondistdeps.py-skip-.egg-link-files.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 83e4d44b802d39dfbd407488c0d9f629799b809c Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Mon, 22 Aug 2016 12:56:05 +0200 -Subject: [PATCH 3/3] pythondistdeps.py: skip .egg-link files - -From setuptools's documentation: -These files are not eggs, strictly speaking. They simply provide a way -to reference an egg that is not physically installed in the desired -location. They exist primarily as a cross-platform alternative to -symbolic links, to support "installing" code that is being developed in -a different location than the desired installation location. - -If we read .egg-link using pkg_resources.Distribution it will -never have version as it is just list of directories which should be -taken into account. - -We could change into that directories and add eggs from those locations -for parsing, but RPM's dependency generator already passing all files -from built RPM so it just does not make any sense to traverse those -directories. - -After all written above, let's just ignore .egg-link files. - -Signed-off-by: Igor Gnatenko ---- - scripts/pythondistdeps.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py -index d7226e0..76017f3 100755 ---- a/scripts/pythondistdeps.py -+++ b/scripts/pythondistdeps.py -@@ -89,14 +89,12 @@ for f in files: - lower_dir = dirname(lower) - if lower_dir.endswith('.egg') or \ - lower_dir.endswith('.egg-info') or \ -- lower_dir.endswith('.egg-link') or \ - lower_dir.endswith('.dist-info'): - lower = lower_dir - f = dirname(f) - # Determine provide, requires, conflicts & recommends based on egg/dist metadata - if lower.endswith('.egg') or \ - lower.endswith('.egg-info') or \ -- lower.endswith('.egg-link') or \ - lower.endswith('.dist-info'): - # This import is very slow, so only do it if needed - from pkg_resources import Distribution, FileMetadata, PathMetadata --- -2.9.3 - diff --git a/rpm-4.13.x-pythondistdeps.py-skip-distribution-metadata-if-ther.patch b/rpm-4.13.x-pythondistdeps.py-skip-distribution-metadata-if-ther.patch deleted file mode 100644 index 4279f9c..0000000 --- a/rpm-4.13.x-pythondistdeps.py-skip-distribution-metadata-if-ther.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 49197c930bb6090d0fca4089ea75ec9d10e62f99 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= - =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?= - -Date: Sat, 20 Aug 2016 11:01:06 -0400 -Subject: [PATCH 1/3] pythondistdeps.py: skip distribution metadata if there is - no version - -For example, reading .egg-link using pkg_resources.Distribution returns -actual metadata, but it does not contain version. It returns traceback like: - -File "/usr/lib/rpm/pythondistdeps.py", line 113, in - pyver_major = dist.py_version.split('.')[0] -AttributeError: 'NoneType' object has no attribute 'split' -Traceback (most recent call last): - File "/usr/lib/rpm/pythondistdeps.py", line 113, in - pyver_major = dist.py_version.split('.')[0] -AttributeError: 'NoneType' object has no attribute 'split' - -Let's just skip such errors as we can't do much about that. - -Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1368673 -Reported-and-tested-by: Igor Gnatenko ---- - scripts/pythondistdeps.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py -index 8a2f43d..54905c3 100755 ---- a/scripts/pythondistdeps.py -+++ b/scripts/pythondistdeps.py -@@ -108,6 +108,9 @@ for f in files: - path_item = f - metadata = FileMetadata(f) - dist = Distribution.from_location(path_item, dist_name, metadata) -+ # Check if py_version is defined in the file -+ if not dist.py_version: -+ continue - if (Provides_PyMajorVer_Variant or legacy_Provides or legacy) and Provides: - # Get the Python major version - pyver_major = dist.py_version.split('.')[0] --- -2.9.3 -