May 2016 - openSUSE Commits - openSUSE Mailing Lists

commit skelcd-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 03 May '16

03 May '16

Hello community, here is the log from the commit of package skelcd-openSUSE for openSUSE:Factory checked in at 2016-05-03 09:33:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-openSUSE/skelcd-openSUSE.changes 2016-04-08 09:38:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new/skelcd-openSUSE.changes 2016-05-03 09:33:36.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 13 14:02:07 UTC 2016 - lnussel(a)suse.de + +- Update to version 84.87.20160413.b700fbb: + + Translated using Weblate (Ukrainian) + + Fix Source links + + Add more description + +------------------------------------------------------------------- Old: ---- skelcd-openSUSE-84.87.20160120.19b8aaf.tar.xz New: ---- skelcd-openSUSE-84.87.20160413.b700fbb.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.QAVkbZ/_old 2016-05-03 09:33:37.000000000 +0200 +++ /var/tmp/diff_new_pack.QAVkbZ/_new 2016-05-03 09:33:37.000000000 +0200 @@ -16,6 +16,8 @@ # +%define version_unconverted 84.87.20160413.b700fbb + Name: skelcd-openSUSE BuildRequires: build-key %bcond_without java @@ -25,7 +27,7 @@ BuildRequires: translate-toolkit %endif Conflicts: skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-CD -Version: 84.87.20160120.19b8aaf +Version: 84.87.20160413.b700fbb Release: 0 Summary: Skeleton for openSUSE OSS Media Sets License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.QAVkbZ/_old 2016-05-03 09:33:37.000000000 +0200 +++ /var/tmp/diff_new_pack.QAVkbZ/_new 2016-05-03 09:33:37.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/skelcd-openSUSE.git</param> - <param name="changesrevision">19b8aaf1052686a37f1ad3dd72bc493ffac39ce5</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">b700fbb8255b6359f7f2c6e32b711f2e163f2925</param></service></servicedata> \ No newline at end of file ++++++ skelcd-openSUSE-84.87.20160120.19b8aaf.tar.xz -> skelcd-openSUSE-84.87.20160413.b700fbb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160120.19b8aaf/README.md new/skelcd-openSUSE-84.87.20160413.b700fbb/README.md --- old/skelcd-openSUSE-84.87.20160120.19b8aaf/README.md 2015-11-25 13:49:01.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160413.b700fbb/README.md 2016-04-13 16:02:07.000000000 +0200 @@ -1,2 +1,4 @@ # skelcd-openSUSE -skeleton for openSUSE media sets +Skeleton for openSUSE media sets. + +While the files in the skelcd directory are copied directly to the root directory of the CD or DVD, the files in the license directory contain the License Agreement for openSUSE (including translations), that are shown during installation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160120.19b8aaf/license/license.ko.po new/skelcd-openSUSE-84.87.20160413.b700fbb/license/license.ko.po --- old/skelcd-openSUSE-84.87.20160120.19b8aaf/license/license.ko.po 1970-01-01 01:00:00.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160413.b700fbb/license/license.ko.po 2016-04-13 16:02:07.000000000 +0200 @@ -0,0 +1,154 @@ +#. extracted from TEMPLATE +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-18 17:46+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: ko\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 1.13.0\n" + +#: TEMPLATE:1 +msgid "" +"LICENSE AGREEMENT\n" +"openSUSE® #VERSION#" +msgstr "" + +#: TEMPLATE:4 +msgid "" +"This is an unofficial translation of the openSUSE #VERSION# license into \n" +"$LANGUAGE. It does not legally state the distribution terms for openSUSE \n" +"#VERSION# - only the original English text of the openSUSE #VERSION#\n" +"license does that. However, we hope that this translation will help\n" +"$LANGUAGE speakers understand the license better." +msgstr "" + +#: TEMPLATE:10 +msgid "" +"This agreement governs your download, installation, or use\n" +"of openSUSE #VERSION# and its updates, regardless of the delivery\n" +"mechanism. openSUSE #VERSION# is a collective work under US Copyright\n" +"Law. Subject to the following terms, The openSUSE Project grants to\n" +"you a license to this collective work pursuant to the GNU General\n" +"Public License version 2. By downloading, installing, or using\n" +"openSUSE #VERSION#, you agree to the terms of this agreement." +msgstr "" + +#: TEMPLATE:18 +msgid "" +"openSUSE #VERSION# is a modular Linux operating system consisting of\n" +"hundreds of software components. The license agreement for each\n" +"component is generally located in the component's source code. With\n" +"the exception of certain files containing the “openSUSE”\n" +"trademark discussed below, the license terms for the components\n" +"permit you to copy and redistribute the component. With the\n" +"potential exception of certain firmware files, the license terms\n" +"for the components permit you to copy, modify, and redistribute the\n" +"component, in both source code and binary code forms. This agreement\n" +"does not limit your rights under, or grant you rights that supersede,\n" +"the license terms of any particular component." +msgstr "" + +#: TEMPLATE:30 +msgid "" +"openSUSE #VERSION# and each of its components, including the source\n" +"code, documentation, appearance, structure, and organization, are\n" +"copyrighted by The openSUSE Project and others and are protected under\n" +"copyright and other laws. Title to openSUSE #VERSION# and any\n" +"component, or to any copy, will remain with the aforementioned or its\n" +"licensors, subject to the applicable license. The \"openSUSE\" trademark\n" +"is a trademark of SUSE, LLC. in the US and other countries and is\n" +"used by permission. This agreement permits you to distribute\n" +"unmodified or modified copies of openSUSE #VERSION# using the\n" +"“openSUSE” trademark on the condition that you follow The openSUSE\n" +"Project’s trademark guidelines located at\n" +"http://en.opensuse.org/Legal. You must abide by these trademark\n" +"guidelines when distributing openSUSE #VERSION#, regardless of whether\n" +"openSUSE #VERSION# has been modified." +msgstr "" + +#: TEMPLATE:45 +msgid "" +"Except as specifically stated in this agreement or a license for\n" +"a particular component, TO THE MAXIMUM EXTENT PERMITTED UNDER\n" +"APPLICABLE LAW, OPENSUSE #VERSION# AND THE COMPONENTS ARE PROVIDED\n" +"AND LICENSED \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EXPRESSED OR\n" +"IMPLIED, INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY, TITLE,\n" +"NON-INFRINGEMENT, OR FITNESS FOR A PARTICULAR PURPOSE. The openSUSE\n" +"Project does not warrant that the functions contained in openSUSE\n" +"#VERSION# will meet your requirements or that the operation of openSUSE\n" +"#VERSION# will be entirely error free or appear precisely as described\n" +"in the accompanying documentation. USE OF OPENSUSE #VERSION# IS AT YOUR\n" +"OWN RISK." +msgstr "" + +#: TEMPLATE:57 +msgid "" +"TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE OPENSUSE\n" +"PROJECT (AND ITS LICENSORS, SUBSIDIARIES, AND EMPLOYEES) WILL NOT\n" +"BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING DIRECT, INCIDENTAL,\n" +"OR CONSEQUENTIAL DAMAGES, LOST PROFITS, OR LOST SAVINGS ARISING OUT\n" +"OF THE USE OR INABILITY TO USE OPENSUSE #VERSION#, EVEN IF THE OPENSUSE\n" +"PROJECT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN A\n" +"JURISDICTION THAT LIMITS THE EXCLUSION OR LIMITATION OF DAMAGES,\n" +"THE OPENSUSE PROJECT’S (AND ITS LICENSORS’, SUBSIDIARIES’, AND\n" +"EMPLOYEES’) AGGREGATE LIABILITY IS LIMITED TO $50US, OR IF SUCH A\n" +"LIMITATION IS NOT ALLOWED, IS LIMITED TO THE MAXIMUM EXTENT ALLOWED." +msgstr "" + +#: TEMPLATE:68 +msgid "" +"As required by US law, you represent and warrant that you: (a)\n" +"understand that openSUSE #VERSION# is subject to export controls under\n" +"the Export Administration Regulations (\"EAR\") which are implemented\n" +"and enforced by the US Department of Commerce, Bureau of Industry and\n" +"Security; (b) are not located in a prohibited destination country or are\n" +"specifically prohibited under the EAR or US sanctions regulations; (c) will " +"not export,\n" +"re-export, or transfer openSUSE #VERSION# to any prohibited destination,\n" +"entity, or individual without the necessary export license(s)\n" +"or authorizations(s) from the US Government; (d) will not use or\n" +"transfer openSUSE #VERSION# for use in any sensitive nuclear, chemical,\n" +"or biological weapons or missile technology end-uses unless\n" +"authorized by the US Government by regulation or specific license;\n" +"(e) understand that countries other than the US may restrict the\n" +"import, use, or export of encryption products and that you will be\n" +"solely responsible for compliance with any such import, use, or export\n" +"restrictions." +msgstr "" + +#: TEMPLATE:85 +msgid "" +"If any provision of this agreement is held to be unenforceable, that\n" +"will not affect the enforceability of the remaining provisions. This\n" +"agreement will be governed by the laws of the State of Utah and\n" +"of the US, without regard to any conflict of laws provisions,\n" +"except that the United Nations Convention on the International\n" +"Sale of Goods will not apply. This agreement sets forth the entire\n" +"understanding and agreement between you and The openSUSE Project\n" +"regarding its subject matter and may be amended only in a writing\n" +"signed by both parties. No waiver of any right under this agreement\n" +"will be effective unless in writing, signed by a duly authorized\n" +"representative of the party to be bound. No waiver of any past or\n" +"present right arising from any breach or failure to perform will\n" +"be deemed to be a waiver of any future right arising under this\n" +"agreement. Use, duplication, or disclosure by the U.S. Government is\n" +"subject to the restrictions in FAR 52.227-14 (June 1987) Alternate\n" +"III (June 1987), FAR 52.227-19 (June 1987), or DFARS 252.227-7013\n" +"(b)(3) (November 1995), or applicable successor clauses." +msgstr "" + +#: TEMPLATE:103 +msgid "" +"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" +"or its affiliates, which founded, sponsors, and is designated by, The " +"openSUSE\n" +"Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" +"other trademarks are the property of their respective owners." +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160120.19b8aaf/license/license.uk.po new/skelcd-openSUSE-84.87.20160413.b700fbb/license/license.uk.po --- old/skelcd-openSUSE-84.87.20160120.19b8aaf/license/license.uk.po 1970-01-01 01:00:00.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160413.b700fbb/license/license.uk.po 2016-04-13 16:02:07.000000000 +0200 @@ -0,0 +1,271 @@ +#. extracted from TEMPLATE +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-18 17:46+0200\n" +"PO-Revision-Date: 2016-03-31 09:12+0000\n" +"Last-Translator: Andriy Bandura <andriykopanytsia(a)gmail.com>\n" +"Language-Team: Ukrainian <http://l10n.opensuse.org/projects/skelcd-" +"opensuse/master/uk/>\n" +"Language: uk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.5\n" + +#: TEMPLATE:1 +msgid "" +"LICENSE AGREEMENT\n" +"openSUSE® #VERSION#" +msgstr "" +"ЛІЦЕНЗІЙНА УГОДА\n" +"openSUSE® #VERSION#" + +#: TEMPLATE:4 +msgid "" +"This is an unofficial translation of the openSUSE #VERSION# license into \n" +"$LANGUAGE. It does not legally state the distribution terms for openSUSE \n" +"#VERSION# - only the original English text of the openSUSE #VERSION#\n" +"license does that. However, we hope that this translation will help\n" +"$LANGUAGE speakers understand the license better." +msgstr "" +"Це неофіційний переклад ліцензії openSUSE #VERSION# на українську мову.\n" +"Він не є юридичним документом - тільки оригінальний текст\n" +"англійською описує умови розповсюдження openSUSE #VERSION# з точки\n" +"зору права. Тим не менш, ми сподіваємося, що цей переклад допоможе\n" +"кращому розумінні ліцензії україномовними користувачами." + +#: TEMPLATE:10 +msgid "" +"This agreement governs your download, installation, or use\n" +"of openSUSE #VERSION# and its updates, regardless of the delivery\n" +"mechanism. openSUSE #VERSION# is a collective work under US Copyright\n" +"Law. Subject to the following terms, The openSUSE Project grants to\n" +"you a license to this collective work pursuant to the GNU General\n" +"Public License version 2. By downloading, installing, or using\n" +"openSUSE #VERSION#, you agree to the terms of this agreement." +msgstr "" +"Ця угода встановлює правила звантаження, встановлення або\n" +"використання операційної системи openSUSE #VERSION# та її оновлень,\n" +"незалежно від способу отримання. У відповідності до законодавства\n" +"США про авторське право openSUSE #VERSION# є колективною\n" +"роботою. При дотриманні нижченаведених умов проект openSUSE\n" +"надає Вам ліцензію на цю колективну роботу відповідно до\n" +"Загальної громадської ліцензії GNU (GNU General Public License)\n" +"версії 2. Звантажуючи, встановлюючи або використовуючи openSUSE #VERSION# " +"ви\n" +"погоджуєтеся з умовами цієї угоди." + +#: TEMPLATE:18 +msgid "" +"openSUSE #VERSION# is a modular Linux operating system consisting of\n" +"hundreds of software components. The license agreement for each\n" +"component is generally located in the component's source code. With\n" +"the exception of certain files containing the “openSUSE”\n" +"trademark discussed below, the license terms for the components\n" +"permit you to copy and redistribute the component. With the\n" +"potential exception of certain firmware files, the license terms\n" +"for the components permit you to copy, modify, and redistribute the\n" +"component, in both source code and binary code forms. This agreement\n" +"does not limit your rights under, or grant you rights that supersede,\n" +"the license terms of any particular component." +msgstr "" +"openSUSE #VERSION# є модульною операційною системою Linux,\n" +"яка складається із сотень програмних компонент. Ліцензійна угода\n" +"для кожного компонента знаходиться, як правило, у складі вихідного\n" +"коду. За винятком деяких файлів, що містять товарний знак\n" +"«openSUSE» і описаних нижче, умови ліцензії на компоненти дозволяють\n" +"вам копіювати і поширювати їх. За можливим винятком деяких\n" +"файлів вбудованих програм умови ліцензії на компоненти дозволяють Вам\n" +"копіювати, модифікувати і поширювати їх, як у вигляді вихідного\n" +"коду, так і у двійковій формі. Ця угода не обмежує ваші\n" +"права, а також не надає права, які замінюють положення\n" +"ліцензії якого-небудь компонента." + +#: TEMPLATE:30 +msgid "" +"openSUSE #VERSION# and each of its components, including the source\n" +"code, documentation, appearance, structure, and organization, are\n" +"copyrighted by The openSUSE Project and others and are protected under\n" +"copyright and other laws. Title to openSUSE #VERSION# and any\n" +"component, or to any copy, will remain with the aforementioned or its\n" +"licensors, subject to the applicable license. The \"openSUSE\" trademark\n" +"is a trademark of SUSE, LLC. in the US and other countries and is\n" +"used by permission. This agreement permits you to distribute\n" +"unmodified or modified copies of openSUSE #VERSION# using the\n" +"“openSUSE” trademark on the condition that you follow The openSUSE\n" +"Project’s trademark guidelines located at\n" +"http://en.opensuse.org/Legal. You must abide by these trademark\n" +"guidelines when distributing openSUSE #VERSION#, regardless of whether\n" +"openSUSE #VERSION# has been modified." +msgstr "" +"Операційна система openSUSE #VERSION# в цілому і кожна її\n" +"компонента зокрема, включаючи вихідний код, документацію, зовнішній\n" +"вигляд, структуру та організацію, є власністю проекту\n" +"openSUSE і інших власників та перебувають під захистом авторських прав\n" +"й інших законів. Право власності на openSUSE #VERSION# та будь-яку \n" +"компоненту або будь-яку копію, модифікацію або об'єднану частину\n" +"залишається в рамках вищевказаних умов відповідно до застосовної\n" +"ліцензії. „openSUSE“ є товарним знаком корпорації SUSE, LLC.\n" +"у США та інших країнах і використовується з її дозволу. Ця\n" +"угода дозволяє вам поширювати незмінені копії openSUSE\n" +"#VERSION# з використанням товарного знаку „openSUSE“ за умови,\n" +"що ви дотримуєтеся вимог вказівок щодо використання торгового\n" +"знака «openSUSE», розташованих за адресою\n" +"http://www.opensuse.org/Legal. Ви повинні виконувати ці вимоги із\n" +"використання торгового знака при поширенні openSUSE #VERSION#\n" +"незалежно від того, була змінена openSUSE #VERSION# чи ні." + +#: TEMPLATE:45 +msgid "" +"Except as specifically stated in this agreement or a license for\n" +"a particular component, TO THE MAXIMUM EXTENT PERMITTED UNDER\n" +"APPLICABLE LAW, OPENSUSE #VERSION# AND THE COMPONENTS ARE PROVIDED\n" +"AND LICENSED \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EXPRESSED OR\n" +"IMPLIED, INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY, TITLE,\n" +"NON-INFRINGEMENT, OR FITNESS FOR A PARTICULAR PURPOSE. The openSUSE\n" +"Project does not warrant that the functions contained in openSUSE\n" +"#VERSION# will meet your requirements or that the operation of openSUSE\n" +"#VERSION# will be entirely error free or appear precisely as described\n" +"in the accompanying documentation. USE OF OPENSUSE #VERSION# IS AT YOUR\n" +"OWN RISK." +msgstr "" +"За винятком випадків, окремо обумовлених у цій угоді або\n" +"ліцензії на конкретний компонент, У МАКСИМАЛЬНІЙ МІРІ, ДОЗВОЛЕНІЙ\n" +"ЧИННИМ ЗАКОНОДАВСТВОМ, ОПЕРАЦІЙНА СИСТЕМА OPENSUSE #VERSION# ТА ЇЇ\n" +"КОМПОНЕНТИ ПОСТАВЛЯЮТЬСЯ І ЛІЦЕНЗУЮТЬСЯ „ЯК Є“ БЕЗ БУДЬ-ЯКИХ\n" +"ГАРАНТІЙ, ЯВНИХ ЧИ ПРИПУЩЕНИХ, ВКЛЮЧАЮЧИ НЕПРЯМІ ПРАВА\n" +"ВЛАСНОСТІ, НЕПОРУШЕННЯ ПРАВ, КОМЕРЦІЙНУ ПРИДАТНІСТЬ І\n" +"ПРИДАТНІСТЬ ДЛЯ ПЕВНОЇ МЕТИ. Проект openSUSE не гарантує, що\n" +"функціональність openSUSE #VERSION# буде відповідати вашим вимогам або\n" +"що в роботі openSUSE #VERSION# будуть повністю відсутні помилки, а\n" +"також що функціонування здійснюватиметься у повній відповідності\n" +"із супровідною документацією. ВИКОРИСТОВУЙТЕ OPENSUSE #VERSION#\n" +"ВИКЛЮЧНО НА СВІЙ СТРАХ І РИЗИК." + +#: TEMPLATE:57 +msgid "" +"TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE OPENSUSE\n" +"PROJECT (AND ITS LICENSORS, SUBSIDIARIES, AND EMPLOYEES) WILL NOT\n" +"BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING DIRECT, INCIDENTAL,\n" +"OR CONSEQUENTIAL DAMAGES, LOST PROFITS, OR LOST SAVINGS ARISING OUT\n" +"OF THE USE OR INABILITY TO USE OPENSUSE #VERSION#, EVEN IF THE OPENSUSE\n" +"PROJECT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN A\n" +"JURISDICTION THAT LIMITS THE EXCLUSION OR LIMITATION OF DAMAGES,\n" +"THE OPENSUSE PROJECT’S (AND ITS LICENSORS’, SUBSIDIARIES’, AND\n" +"EMPLOYEES’) AGGREGATE LIABILITY IS LIMITED TO $50US, OR IF SUCH A\n" +"LIMITATION IS NOT ALLOWED, IS LIMITED TO THE MAXIMUM EXTENT ALLOWED." +msgstr "" +"У МАКСИМАЛЬНІЙ МІРІ, ДОЗВОЛЕНІЙ ЧИННИМ ЗАКОНОДАВСТВОМ, ПРОЕКТ\n" +"OPENSUSE (І ЙОГО ЛІЦЕНЗІАРИ, ДОЧІРНІ ПІДПРИЄМСТВА І ПРАЦІВНИКИ), НЕ\n" +"НЕСЕ ВІДПОВІДАЛЬНОСТІ ЗА БУДЬ-ЯКІ ЗБИТКИ, ВКЛЮЧАЮЧИ ПРЯМИЙ, ВИПАДКОВИЙ\n" +"АБО НЕПРЯМИЙ ЗБИТОК, ВТРАЧЕНИЙ ПРИБУТОК, ВТРАТУ ЗАОЩАДЖЕНЬ У ЗВ'ЯЗКУ З\n" +"ВИКОРИСТАННЯМ АБО НЕМОЖЛИВІСТЮ ВИКОРИСТАННЯ OPENSUSE #VERSION#, НАВІТЬ\n" +"ЯКЩО ПРОЕКТ OPENSUSE БУВ ПРОІНФОРМОВАНИЙ ПРО МОЖЛИВІСТЬ ТАКОЇ\n" +"ШКОДИ. У РАМКАХ РЕГУЛЮВАННЯ ВИНЯТКІВ І ОБМЕЖЕНЬ ШКОДИ,\n" +"СУКУПНА ВІДПОВІДАЛЬНІСТЬ ПРОЕКТУ OPENSUSE (ТА ЙОГО ЛІЦЕНЗІАРІВ,\n" +"ДОЧІРНІХ ПІДПРИЄМСТВ І ПРАЦІВНИКІВ), ОБМЕЖЕНА 50 ДОЛАРАМИ США, АБО,\n" +"ЯКЩО ЦЕ НЕ ПІДХОДИТЬ, ОБМЕЖЕНА МАКСИМАЛЬНИМИ ДОЗВОЛЕНИМИ МЕЖАМИ." + +#: TEMPLATE:68 +msgid "" +"As required by US law, you represent and warrant that you: (a)\n" +"understand that openSUSE #VERSION# is subject to export controls under\n" +"the Export Administration Regulations (\"EAR\") which are implemented\n" +"and enforced by the US Department of Commerce, Bureau of Industry and\n" +"Security; (b) are not located in a prohibited destination country or are\n" +"specifically prohibited under the EAR or US sanctions regulations; (c) will " +"not export,\n" +"re-export, or transfer openSUSE #VERSION# to any prohibited destination,\n" +"entity, or individual without the necessary export license(s)\n" +"or authorizations(s) from the US Government; (d) will not use or\n" +"transfer openSUSE #VERSION# for use in any sensitive nuclear, chemical,\n" +"or biological weapons or missile technology end-uses unless\n" +"authorized by the US Government by regulation or specific license;\n" +"(e) understand that countries other than the US may restrict the\n" +"import, use, or export of encryption products and that you will be\n" +"solely responsible for compliance with any such import, use, or export\n" +"restrictions." +msgstr "" +"Згідно із законом США ви заявляєте та гарантуєте, що: (а)\n" +"розумієте, що openSUSE #VERSION# підлягає експортному контролю згідно з\n" +"Правилами Міністерства торгівлі по експорту США («EAR»); (б) не\n" +"перебуваєте в забороненій країні (на підставі Правил або санкцій США);\n" +"(в) не будете експортувати, реекспортувати чи передавати openSUSE\n" +"#VERSION# у заборонені країни, установи або особам без необхідної\n" +"ліцензії на експорт або дозволу від уряду США; (г) не будете\n" +"використовувати або передавати openSUSE #VERSION# для використання в\n" +"якій-небудь ядерній, хімічній або біологічній зброї\n" +"державного значення і ракетних технологіях кінцевого\n" +"використання без дозволу уряду США на підставі закону або\n" +"конкретної ліцензії; (д) розумієте та погоджуєтеся, що якщо Ви\n" +"перебуваєте в США і експортуєте або передаєте openSUSE #VERSION# \n" +"законному порядку кінцевим користувачам, Ви, як того вимагає розділ\n" +"741.17 (е) Правил EAR, повинні надавати піврічні звіти для\n" +"Бюро промисловості та безпеки (BIS), що входить у Міністерство\n" +"торгівлі (звіти повинні містити ім'я й адресу (включаючи код країни)\n" +"кожного одержувача), та (е) розумієте, що інші країни, крім США,\n" +"можуть обмежити імпорт, використання та експорт товарів, що містять\n" +"шифрування, і що ви будете нести повну відповідальність за дотримання\n" +"таких обмежень по ввозу, використанню і експорту товару." + +#: TEMPLATE:85 +msgid "" +"If any provision of this agreement is held to be unenforceable, that\n" +"will not affect the enforceability of the remaining provisions. This\n" +"agreement will be governed by the laws of the State of Utah and\n" +"of the US, without regard to any conflict of laws provisions,\n" +"except that the United Nations Convention on the International\n" +"Sale of Goods will not apply. This agreement sets forth the entire\n" +"understanding and agreement between you and The openSUSE Project\n" +"regarding its subject matter and may be amended only in a writing\n" +"signed by both parties. No waiver of any right under this agreement\n" +"will be effective unless in writing, signed by a duly authorized\n" +"representative of the party to be bound. No waiver of any past or\n" +"present right arising from any breach or failure to perform will\n" +"be deemed to be a waiver of any future right arising under this\n" +"agreement. Use, duplication, or disclosure by the U.S. Government is\n" +"subject to the restrictions in FAR 52.227-14 (June 1987) Alternate\n" +"III (June 1987), FAR 52.227-19 (June 1987), or DFARS 252.227-7013\n" +"(b)(3) (November 1995), or applicable successor clauses." +msgstr "" +"Якщо будь-яке положення цієї угоди буде визнано в\n" +"суді недійсним, це не вплине на законність інших\n" +"положень. Ця угода буде регулюватися законами штату Юта і\n" +"федеральними законами США без урахування будь-яких конфліктів між\n" +"законами, а також без застосування Конвенції Організації Об'єднаних\n" +"Націй про міжнародну купівлю-продаж. Ця угода засвідчує\n" +"повне розуміння і згоду між вами і проектом openSUSE щодо\n" +"операційної системи openSUSE #VERSION# і може бути змінена тільки в\n" +"письмовій формі за підписом обох сторін. Відмова від яких-небудь прав,\n" +"що надаються цією угодою, може вступити в законну силу\n" +"тільки при оформленні письмової домовленості з обов'язковим\n" +"підписом уповноваженого представника від кожного учасника угоди. Будь-яка\n" +"відмова від довільного минулого або теперішнього права, викликана\n" +"яким-небудь порушенням або неможливістю виконання, не може бути\n" +"відмовою від будь-яких майбутніх прав, що можуть виникнути на підставі " +"даної\n" +"угоди. Використання, копіювання або розкриття інформації на\n" +"підставі рішення Уряду США підпадає під обмеження FAR\n" +"52.227-14 (червень 1987 р.) редакція III (червень 1987 р.), FAR 52.227-19\n" +"(червень 1987 р.) або DFARS 252.227-7013 (b) (3) (листопад 1995 р.), або\n" +"застосовних наступних положень." + +#: TEMPLATE:103 +msgid "" +"Copyright © 2008-2014 The openSUSE Project. All rights\n" +"reserved. \"SUSE\" and \"openSUSE\" are registered trademarks of SUSE LLC,\n" +"or its affiliates, which founded, sponsors, and is designated by, The " +"openSUSE\n" +"Project. \"Linux\" is a registered trademark of Linus Torvalds. All\n" +"other trademarks are the property of their respective owners." +msgstr "" +"© Проект openSUSE, 2008-2014. Усі права захищені. „SUSE“ і „openSUSE“\n" +"є торговими марками SUSE, LLC. або її філій, що\n" +"заснували проект openSUSE, спонсорують його і несуть за нього\n" +"відповідальність. „Linux“ є зареєстрованою торговою\n" +"маркою Лінуса Торвальдса. Усі інші товарні знаки є\n" +"власністю їхніх відповідних власників." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20160120.19b8aaf/skelcd/README new/skelcd-openSUSE-84.87.20160413.b700fbb/skelcd/README --- old/skelcd-openSUSE-84.87.20160120.19b8aaf/skelcd/README 2015-11-25 13:49:01.000000000 +0100 +++ new/skelcd-openSUSE-84.87.20160413.b700fbb/skelcd/README 2016-04-13 16:02:07.000000000 +0200 @@ -13,7 +13,8 @@ http://en.opensuse.org/Source_code The latest source for the development tree is available from: -http://download.opensuse.org/source/factory +http://download.opensuse.org/tumbleweed/repo/src-oss/ and +http://download.opensuse.org/tumbleweed/repo/src-non-oss/ The latest source for releases is available from: http://download.opensuse.org/source/distribution/

1 0

commit luit for openSUSE:Factory
by root＠hilbert.suse.de 03 May '16

03 May '16

Hello community, here is the log from the commit of package luit for openSUSE:Factory checked in at 2016-05-03 09:33:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/luit (Old) and /work/SRC/openSUSE:Factory/.luit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "luit" Changes: -------- --- /work/SRC/openSUSE:Factory/luit/luit.changes 2015-03-05 18:15:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.luit.new/luit.changes 2016-05-03 09:33:32.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 20 15:48:48 UTC 2016 - sndirsch(a)suse.com + +- Update to version 20150706 + * add configure option --with-man2html + * updated configure macros, mostly formatting changes from xterm, etc. + * update config.guess, config.sub + +------------------------------------------------------------------- Old: ---- luit-20141204.tgz New: ---- luit-20150706.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ luit.spec ++++++ --- /var/tmp/diff_new_pack.ukBccw/_old 2016-05-03 09:33:32.000000000 +0200 +++ /var/tmp/diff_new_pack.ukBccw/_new 2016-05-03 09:33:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package luit # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: luit -Version: 20141204 +Version: 20150706 Release: 0 Summary: Locale and ISO 2022 support for Unicode terminals License: MIT ++++++ luit-20141204.tgz -> luit-20150706.tgz ++++++ ++++ 9553 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20141204/configure.in new/luit-20150706/configure.in --- old/luit-20141204/configure.in 2014-01-05 21:20:14.000000000 +0100 +++ new/luit-20150706/configure.in 2015-07-07 00:10:30.000000000 +0200 @@ -1,8 +1,8 @@ -dnl $XTermId: configure.in,v 1.44 2014/01/05 20:20:14 tom Exp $ +dnl $XTermId: configure.in,v 1.45 2015/07/06 22:10:30 tom Exp $ dnl dnl --------------------------------------------------------------------------- dnl -dnl Copyright 2006-2013,2014 by Thomas E. Dickey +dnl Copyright 2006-2014,2015 by Thomas E. Dickey dnl dnl All Rights Reserved dnl @@ -180,6 +180,7 @@ CF_WITH_ENCODINGS_DIR CF_WITH_LOCALE_ALIAS +CF_WITH_MAN2HTML CF_DISABLE_LEAKS CF_ENABLE_TRACE @@ -195,4 +196,4 @@ AC_SUBST(EXTRASRCS) AC_SUBST(EXTRAOBJS) AC_OUTPUT(Makefile,,,cat) -CF_MAKE_DOCS(luit,[$(manext)]) +CF_MAKE_DOCS(luit,[\$(manext)]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20141204/luit.log.html new/luit-20150706/luit.log.html --- old/luit-20141204/luit.log.html 2014-12-04 10:36:39.000000000 +0100 +++ new/luit-20150706/luit.log.html 2015-07-07 00:09:49.000000000 +0200 @@ -19,7 +19,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ***************************************************************************** - $XTermId: luit.log.html,v 1.145 2014/12/04 09:36:39 tom Exp $ + $XTermId: luit.log.html,v 1.148 2015/07/06 22:09:49 tom Exp $ --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> @@ -43,6 +43,17 @@ This file contains a list of the changes that I have made for luit. + <a id="t20150706" name="t20150706">2015/07/06</a> - + + <ul> + <li>add configure option <code>--with-man2html</code></li> + + <li>updated configure macros, mostly formatting changes from + xterm, etc.</li> + + <li>update config.guess, config.sub</li> + </ul> + <a id="t20141204" name="t20141204">2014/12/04</a> - <ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20141204/luitconv.c new/luit-20150706/luitconv.c --- old/luit-20141204/luitconv.c 2014-12-03 22:52:26.000000000 +0100 +++ new/luit-20150706/luitconv.c 2015-07-07 00:41:28.000000000 +0200 @@ -1,7 +1,7 @@ /* - * $XTermId: luitconv.c,v 1.116 2014/12/03 21:52:26 tom Exp $ + * $XTermId: luitconv.c,v 1.117 2015/07/06 22:41:28 tom Exp $ * - * Copyright 2010-2013,2014 by Thomas E. Dickey + * Copyright 2010-2014,2015 by Thomas E. Dickey * * All Rights Reserved * @@ -608,7 +608,8 @@ } else { data = datap[gs]; } - if (data == 0) { + if ((data == 0) + || (my_code >= data->table_size)) { TRACE(("skip %d:%#x\n", gs, my_code)); continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20141204/package/debian/changelog new/luit-20150706/package/debian/changelog --- old/luit-20141204/package/debian/changelog 2014-12-04 10:12:32.000000000 +0100 +++ new/luit-20150706/package/debian/changelog 2015-07-06 23:48:21.000000000 +0200 @@ -1,3 +1,9 @@ +bluit (20150706) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey(a)invisible-island.net> Mon, 06 Jul 2015 17:48:21 -0400 + bluit (20141204) unstable; urgency=low * maintenance updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20141204/package/debian/copyright new/luit-20150706/package/debian/copyright --- old/luit-20141204/package/debian/copyright 2014-01-05 21:21:05.000000000 +0100 +++ new/luit-20150706/package/debian/copyright 2015-07-07 00:15:55.000000000 +0200 @@ -47,7 +47,7 @@ Files: aclocal.m4 Licence: other-BSD -Copyright: 2006-2013,2014 by Thomas E. Dickey +Copyright: 2006-2014,2015 by Thomas E. Dickey Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20141204/package/luit.spec new/luit-20150706/package/luit.spec --- old/luit-20141204/package/luit.spec 2014-12-04 10:12:01.000000000 +0100 +++ new/luit-20150706/package/luit.spec 2015-07-06 23:48:21.000000000 +0200 @@ -1,8 +1,8 @@ Summary: luit - Locale and ISO 2022 support for Unicode terminals %define AppProgram luit -%define AppVersion 20141204 +%define AppVersion 20150706 %define UseProgram b%{AppProgram} -# $XTermId: luit.spec,v 1.50 2014/12/04 09:12:01 tom Exp $ +# $XTermId: luit.spec,v 1.51 2015/07/06 21:48:21 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-20141204/version.h new/luit-20150706/version.h --- old/luit-20141204/version.h 2014-12-04 10:12:01.000000000 +0100 +++ new/luit-20150706/version.h 2015-07-06 23:48:21.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $XTermId: version.h,v 1.47 2014/12/04 09:12:01 tom Exp $ + * $XTermId: version.h,v 1.48 2015/07/06 21:48:21 tom Exp $ * * http://invisible-island.net/luit/ */ -#define LUIT_VERSION "2.0-20141204" +#define LUIT_VERSION "2.0-20150706"

1 0

commit valgrind for openSUSE:Factory
by root＠hilbert.suse.de 03 May '16

03 May '16

Hello community, here is the log from the commit of package valgrind for openSUSE:Factory checked in at 2016-05-03 09:33:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/valgrind (Old) and /work/SRC/openSUSE:Factory/.valgrind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "valgrind" Changes: -------- --- /work/SRC/openSUSE:Factory/valgrind/valgrind.changes 2016-04-12 18:59:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.valgrind.new/valgrind.changes 2016-05-03 09:33:24.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Apr 20 09:13:09 UTC 2016 - jslaby(a)suse.com + +- The previous did not help, remove -strong first. + +------------------------------------------------------------------- +Tue Apr 19 09:49:36 UTC 2016 - meissner(a)suse.com + +- also remove -fstack-protector-strong from the CFLAGS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind.spec ++++++ --- /var/tmp/diff_new_pack.dAbZCF/_old 2016-05-03 09:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.dAbZCF/_new 2016-05-03 09:33:25.000000000 +0200 @@ -132,6 +132,7 @@ %endif # not a good idea to build valgrind with fortify, as it does not link glibc FLAGS="${FLAGS/-D_FORTIFY_SOURCE=2/}" +FLAGS="${FLAGS/-fstack-protector-strong/}" FLAGS="${FLAGS/-fstack-protector/}" export CFLAGS="$FLAGS" export CXXFLAGS="$FLAGS"

1 0

commit xf86-video-qxl for openSUSE:Factory
by root＠hilbert.suse.de 03 May '16

03 May '16

Hello community, here is the log from the commit of package xf86-video-qxl for openSUSE:Factory checked in at 2016-05-03 09:33:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-qxl (Old) and /work/SRC/openSUSE:Factory/.xf86-video-qxl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-qxl" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-qxl/xf86-video-qxl.changes 2015-11-17 14:20:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-qxl.new/xf86-video-qxl.changes 2016-05-03 09:33:18.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 20 09:36:05 UTC 2016 - sndirsch(a)suse.com + +- U_qxl-use-pci-io.patch + * Fix build on AArch64 by backporting upstream patch to use + pci_io_write8 instead of outb + +------------------------------------------------------------------- New: ---- U_qxl-use-pci-io.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-qxl.spec ++++++ --- /var/tmp/diff_new_pack.YAdSGS/_old 2016-05-03 09:33:19.000000000 +0200 +++ /var/tmp/diff_new_pack.YAdSGS/_new 2016-05-03 09:33:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-qxl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,7 @@ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.t… Patch0: n_hardcode_libdrm_cflags.patch Patch1: n_disable-surfaces-on-kms.patch +Patch2: U_qxl-use-pci-io.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -81,6 +82,7 @@ %setup -q %patch0 -p0 %patch1 -p1 +%patch2 -p1 %build autoreconf -fi ++++++ U_qxl-use-pci-io.patch ++++++ >From c1e88427d1763bf9bbf9f2dd738980cee644443f Mon Sep 17 00:00:00 2001 From: Adam Jackson <ajax(a)redhat.com> Date: Thu, 30 Apr 2015 14:32:16 +0200 Subject: Use pci_io_write8 instead of outb Patch-Mainline: Upstream Git-commit: c1e88427d1763bf9bbf9f2dd738980cee644443f This ensures better portability as some arches (eg aarch64) don't have outb. On linux pci_io_* try to open the sysfs map file corresponding to the I/O port range, which the kernel translates arch-appropriately. If there is no such file then it'll try to use port instructions if that's a thing the architecture has. So you only need one path, pciaccess exists to get the portability right for you. https://bugzilla.redhat.com/show_bug.cgi?id=1201877 Signed-off-by: Alexander Graf <agraf(a)suse.de> Index: xf86-video-qxl-0.1.4/src/qxl.h =================================================================== --- xf86-video-qxl-0.1.4.orig/src/qxl.h +++ xf86-video-qxl-0.1.4/src/qxl.h @@ -276,6 +276,7 @@ struct _qxl_screen_t #ifdef XSERVER_LIBPCIACCESS struct pci_device * pci; + struct pci_io_handle * io; #else pciVideoPtr pci; PCITAG pci_tag; @@ -634,7 +635,7 @@ void ioport_write(qxl_screen_t *qxl, uin #else static inline void ioport_write(qxl_screen_t *qxl, int port, int val) { - outb(qxl->io_base + port, val); + pci_io_write8(qxl->io, port, val); } #endif Index: xf86-video-qxl-0.1.4/src/qxl_driver.c =================================================================== --- xf86-video-qxl-0.1.4.orig/src/qxl_driver.c +++ xf86-video-qxl-0.1.4/src/qxl_driver.c @@ -220,6 +220,8 @@ unmap_memory_helper (qxl_screen_t *qxl) pci_device_unmap_range (qxl->pci, qxl->vram, qxl->pci->regions[1].size); if (qxl->rom) pci_device_unmap_range (qxl->pci, qxl->rom, qxl->pci->regions[2].size); + if (qxl->io) + pci_device_close_io (qxl->pci, qxl->io); #else if (qxl->ram) xf86UnMapVidMem (scrnIndex, qxl->ram, (1 << qxl->pci->size[0])); @@ -252,6 +254,9 @@ map_memory_helper (qxl_screen_t *qxl) qxl->pci->regions[2].size, 0, (void **)&qxl->rom); + qxl->io = pci_device_open_io(qxl->pci, + qxl->pci->regions[3].base_addr, + qxl->pci->regions[3].size); qxl->io_base = qxl->pci->regions[3].base_addr; #else qxl->ram = xf86MapPciMem (scrnIndex, VIDMEM_FRAMEBUFFER,

1 0

commit scons for openSUSE:Factory
by root＠hilbert.suse.de 03 May '16

03 May '16

Hello community, here is the log from the commit of package scons for openSUSE:Factory checked in at 2016-05-03 09:33:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scons (Old) and /work/SRC/openSUSE:Factory/.scons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scons" Changes: -------- --- /work/SRC/openSUSE:Factory/scons/scons.changes 2015-12-13 09:36:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scons.new/scons.changes 2016-05-03 09:33:12.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 20 07:08:23 UTC 2016 - astieger(a)suse.com + +- SCons 2.5.0: + * Enhance implicit language scanning functionality + * Cache directory sharding to improve NFS performance + +------------------------------------------------------------------- Old: ---- scons-2.4.1.tar.gz scons-user.html-2.4.1.tar.bz2 New: ---- scons-2.5.0.tar.gz scons-user.html-2.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scons.spec ++++++ --- /var/tmp/diff_new_pack.JMzT8R/_old 2016-05-03 09:33:13.000000000 +0200 +++ /var/tmp/diff_new_pack.JMzT8R/_new 2016-05-03 09:33:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scons # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif Name: scons -Version: 2.4.1 +Version: 2.5.0 Release: 0 Summary: Replacement for Make License: MIT @@ -37,7 +37,7 @@ Patch0: %{name}-1.2.0-fix-install.patch Patch1: %{name}-1.2.0-noenv.patch BuildRequires: fdupes -BuildRequires: python-devel >= 2.4 +BuildRequires: python-devel >= 2.7 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1110 BuildArch: noarch ++++++ scons-2.4.1.tar.gz -> scons-2.5.0.tar.gz ++++++ ++++ 9480 lines of diff (skipped) ++++++ scons-user.html-2.4.1.tar.bz2 -> scons-user.html-2.5.0.tar.bz2 ++++++ ++++ 1834 lines of diff (skipped)

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 03 May '16

03 May '16

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2016-05-03 09:33:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2016-04-12 18:58:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2016-05-03 09:33:07.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 18 12:20:51 CEST 2016 - aschnell(a)suse.com + +- reverted some changes done accidentally to default-config (see + fate#312751) +- version 0.3.2 + +------------------------------------------------------------------- Old: ---- snapper-0.3.1.tar.bz2 New: ---- snapper-0.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.j1yagg/_old 2016-05-03 09:33:08.000000000 +0200 +++ /var/tmp/diff_new_pack.j1yagg/_new 2016-05-03 09:33:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: snapper -Version: 0.3.1 +Version: 0.3.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 ++++++ snapper-0.3.1.tar.bz2 -> snapper-0.3.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.3.1/VERSION new/snapper-0.3.2/VERSION --- old/snapper-0.3.1/VERSION 2016-04-11 16:02:11.000000000 +0200 +++ new/snapper-0.3.2/VERSION 2016-04-19 11:27:11.000000000 +0200 @@ -1 +1 @@ -0.3.1 +0.3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.3.1/data/default-config new/snapper-0.3.2/data/default-config --- old/snapper-0.3.1/data/default-config 2016-04-06 17:02:12.000000000 +0200 +++ new/snapper-0.3.2/data/default-config 2016-04-19 11:27:11.000000000 +0200 @@ -33,7 +33,7 @@ # limit for number cleanup NUMBER_MIN_AGE="1800" -NUMBER_LIMIT="10-50" +NUMBER_LIMIT="50" NUMBER_LIMIT_IMPORTANT="10" @@ -45,11 +45,11 @@ # limits for timeline cleanup TIMELINE_MIN_AGE="1800" -TIMELINE_LIMIT_HOURLY="4-10" -TIMELINE_LIMIT_DAILY="4-10" +TIMELINE_LIMIT_HOURLY="10" +TIMELINE_LIMIT_DAILY="10" TIMELINE_LIMIT_WEEKLY="0" -TIMELINE_LIMIT_MONTHLY="4-10" -TIMELINE_LIMIT_YEARLY="4-10" +TIMELINE_LIMIT_MONTHLY="10" +TIMELINE_LIMIT_YEARLY="10" # cleanup empty pre-post-pairs @@ -57,3 +57,4 @@ # limits for empty pre-post-pair cleanup EMPTY_PRE_POST_MIN_AGE="1800" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.3.1/po/zu.po new/snapper-0.3.2/po/zu.po --- old/snapper-0.3.1/po/zu.po 2016-01-18 11:03:24.000000000 +0100 +++ new/snapper-0.3.2/po/zu.po 2016-04-19 14:02:13.000000000 +0200 @@ -6,18 +6,20 @@ "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 16:24+0200\n" -"PO-Revision-Date: 2006-11-03 14:26\n" -"Last-Translator: Novell Language <language(a)novell.com>\n" -"Language-Team: Novell Language <language(a)novell.com>\n" -"Language: \n" +"PO-Revision-Date: 2016-04-19 09:51+0000\n" +"Last-Translator: Shane Wims <shane.wims(a)microfocus.com>\n" +"Language-Team: Zulu <http://l10n.opensuse.org/projects/snapper/master/zu/>\n" +"Language: zu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.5\n" #: ../client/snapper.cc:457 +#, fuzzy msgid "\t--all-configs, -a\t\tList snapshots from all accessible configs." -msgstr "" +msgstr "\t-- all-configs, -a\t\tList snapshots from accessible configs." #: ../client/snapper.cc:698 ../client/snapper.cc:832 msgid "\t--cleanup-algorithm, -c <algo>\tCleanup algorithm for snapshot."

1 0

commit bitcoin for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package bitcoin for openSUSE:Factory checked in at 2016-05-02 10:44:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bitcoin (Old) and /work/SRC/openSUSE:Factory/.bitcoin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bitcoin" Changes: -------- --- /work/SRC/openSUSE:Factory/bitcoin/bitcoin.changes 2016-04-28 16:58:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bitcoin.new/bitcoin.changes 2016-05-02 10:45:02.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Apr 30 08:38:08 UTC 2016 - mpluskal(a)suse.com + +- Update to 0.12.1 + * For a complete list of changes see provided release-notes +- Drop no longer needed patch + * bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch +- Small spec file polishing + +------------------------------------------------------------------- Old: ---- bitcoin-0.12.0.tar.gz bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch New: ---- bitcoin-0.12.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bitcoin.spec ++++++ --- /var/tmp/diff_new_pack.oQh3ek/_old 2016-05-02 10:45:03.000000000 +0200 +++ /var/tmp/diff_new_pack.oQh3ek/_new 2016-05-02 10:45:03.000000000 +0200 @@ -23,19 +23,17 @@ %define name_pretty %{base_pretty} %define consensus 1 %define is_base 1 - Name: bitcoin -Version: 0.12.0 +Version: 0.12.1 Release: 0 Summary: P2P Digital Currency License: MIT Group: Productivity/Networking/Other -Url: http://%{name}.org/ +Url: https://%{name}.org Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{ve… Source1: %{base}d.service Source2: %{base}d.firewall Source3: %{base}d.conf -Patch1: %{base}_missing_ppc64le_in_ax_boost_base.m4.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel @@ -43,27 +41,38 @@ BuildRequires: git BuildRequires: lcov BuildRequires: libdb-4_8-devel -BuildRequires: libevent-devel BuildRequires: libminiupnpc-devel BuildRequires: libqt5-qtbase-devel -BuildRequires: libqt5-qttools-devel BuildRequires: libtool -BuildRequires: pkg-config -BuildRequires: python +BuildRequires: pkgconfig BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files BuildRequires: yasm-devel -BuildRequires: zeromq-devel +BuildRequires: pkgconfig(Qt5CLucene) +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5DesignerComponents) +BuildRequires: pkgconfig(Qt5Help) +BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(libevent) +BuildRequires: pkgconfig(libevent_openssl) +BuildRequires: pkgconfig(libevent_pthreads) BuildRequires: pkgconfig(libqrencode) +BuildRequires: pkgconfig(libzmq) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(protobuf) +BuildRequires: pkgconfig(python) BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} %description -%{name_pretty} is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. +%{name_pretty} is a free open source peer-to-peer electronic cash system +%{that} is completely decentralized, without the need for a central server or +trusted parties. Users hold the crypto keys to their own money and +transact directly with each other, with the help of a P2P network to check +for double-spending. -Full transaction history is stored locally at each client. This requires several GB of space, slowly growing. +Full transaction history is stored locally at each client. This requires +several GB of space, slowly growing. %package qt5 Summary: An end-user Qt5 GUI for the %{name_pretty} crypto-currency @@ -72,30 +81,44 @@ Requires(postun): update-desktop-files %description qt5 -%{name_pretty} is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. +%{name_pretty} is a free open source peer-to-peer electronic cash system +that is completely decentralized, without the need for a central server or +trusted parties. Users hold the crypto keys to their own money and +transact directly with each other, with the help of a P2P network to check +for double-spending. -Full transaction history is stored locally at each client. This requires several GB of space, slowly growing. +Full transaction history is stored locally at each client. This requires +several GB of space, slowly growing. -This package provides %{name_pretty}-Qt, a GUI for %{name_pretty} based on Qt. +This package provides %{name_pretty}-Qt, a GUI for %{name_pretty} based on +Qt. %package utils Summary: An end-user cli for the %{name_pretty} crypto-currency Group: Productivity/Networking/Other %description utils -%{name_pretty} is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. +%{name_pretty} is a free open source peer-to-peer electronic cash system +that is completely decentralized, without the need for a central server or +trusted parties. Users hold the crypto keys to their own money and +transact directly with each other, with the help of a P2P network to check +for double-spending. -Full transaction history is stored locally at each client. This requires several GB of space, slowly growing. +Full transaction history is stored locally at each client. This requires +several GB of space, slowly growing. This package provides %{name}-cli - CLI tool to interact with the daemon. %if %{consensus} == 1 %package -n lib%{name}consensus0 Summary: %{name_pretty} consensus library -Group: System/Library +Group: System/Libraries %description -n lib%{name}consensus0 -The purpose of this library is to make the verification functionality that is critical to %{name_pretty}’s consensus available to other applications, e.g. to language bindings such as python-%{name}lib or alternative node implementations. +The purpose of this library is to make the verification functionality that +is critical to %{name_pretty}’s consensus available to other applications, +e.g. to language bindings such as python-%{name}lib or alternative node +implementations. %package -n lib%{name}consensus-devel Summary: Developmont files for %{name} consensus library @@ -103,7 +126,10 @@ Requires: lib%{name}consensus0 = %{version}-%{release} %description -n lib%{name}consensus-devel -The purpose of this library is to make the verification functionality that is critical to %{name_pretty}’s consensus available to other applications, e.g. to language bindings such as python-%{name}lib or alternative node implementations. +The purpose of this library is to make the verification functionality that +is critical to %{name_pretty}’s consensus available to other applications, +e.g. to language bindings such as python-%{name}lib or alternative node +implementations. This package contains development files. %endif @@ -113,9 +139,14 @@ Group: Development/Libraries/Other %description -n %{name}d -%{name_pretty} is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. +%{name_pretty} is a free open source peer-to-peer electronic cash system +that is completely decentralized, without the need for a central server or +trusted parties. Users hold the crypto keys to their own money and +transact directly with each other, with the help of a P2P network to check +for double-spending. -Full transaction history is stored locally at each client. This requires several GB of space, slowly growing. +Full transaction history is stored locally at each client. This requires +several GB of space, slowly growing. This package provides %{name}d, headless %{name} daemon. @@ -124,15 +155,19 @@ Group: Development/Libraries/Other %description test -%{name_pretty} is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. +%{name_pretty} is a free open source peer-to-peer electronic cash system +that is completely decentralized, without the need for a central server or +trusted parties. Users hold the crypto keys to their own money and +transact directly with each other, with the help of a P2P network to check +for double-spending. -Full transaction history is stored locally at each client. This requires several GB of space, slowly growing. +Full transaction history is stored locally at each client. This requires +several GB of space, slowly growing. This package provides automated tests for %{name}-qt5 and %{name}d. %prep %setup -q -%patch1 -p1 # remove 128 resolution from Icon= line sed -i s/128// contrib/debian/%{name}-qt.desktop @@ -203,7 +238,6 @@ %if %{consensus} == 1 %post -n lib%{name}consensus0 -p /sbin/ldconfig - %postun -n lib%{name}consensus0 -p /sbin/ldconfig %endif ++++++ bitcoin-0.12.0.tar.gz -> bitcoin-0.12.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/bitcoin/bitcoin-0.12.0.tar.gz /work/SRC/openSUSE:Factory/.bitcoin.new/bitcoin-0.12.1.tar.gz differ: char 28, line 1

1 0

commit gwenhywfar for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package gwenhywfar for openSUSE:Factory checked in at 2016-05-02 10:44:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwenhywfar (Old) and /work/SRC/openSUSE:Factory/.gwenhywfar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gwenhywfar" Changes: -------- --- /work/SRC/openSUSE:Factory/gwenhywfar/gwenhywfar.changes 2016-01-15 10:41:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gwenhywfar.new/gwenhywfar.changes 2016-05-02 10:45:00.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Apr 30 11:23:03 UTC 2016 - nico.kruber(a)gmail.com + +- Update to 4.15.3 + + improve and simplify the TLS code + + fix an error in the message parser (MsgEngine) that caused + problems with some special HBCI messages + + new (experimental) QT5 front-end (not enabled yet here) + +------------------------------------------------------------------- Old: ---- gwenhywfar-4.15.2beta.tar.gz New: ---- gwenhywfar-4.15.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenhywfar.spec ++++++ --- /var/tmp/diff_new_pack.9c4BTP/_old 2016-05-02 10:45:01.000000000 +0200 +++ /var/tmp/diff_new_pack.9c4BTP/_new 2016-05-02 10:45:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gwenhywfar # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define libversion 60 %define devversion 4.15 Name: gwenhywfar -Version: 4.15.2beta +Version: 4.15.3 Release: 0 Summary: Multiplatform helper library for other libraries License: GPL-2.0+ and LGPL-2.1+ @@ -115,7 +115,7 @@ This package provides the GTK+ implementation of the generic UI toolkit. %package -n libgwengui-qt4-0 -Summary: Multiplatform Helper Library for Other Libraries -- Qt UI Backend +Summary: Multiplatform Helper Library for Other Libraries -- Qt4 UI Backend License: LGPL-2.1+ Group: System/Libraries @@ -126,7 +126,7 @@ configuration files, reading and writing of XML files, and interprocess communication). -This package provides the Qt implementation of the generic UI toolkit. +This package provides the Qt4 implementation of the generic UI toolkit. %package -n libgwengui-fox16-0 Summary: FOX interface for Gwenhywfar @@ -267,6 +267,7 @@ %{_libdir}/pkgconfig/gwengui-fox16.pc %dir %{_libdir}/cmake %{_libdir}/cmake/%{name}-%{devversion} +%{_libdir}/cmake/gwengui-cpp-%{devversion} %{_libdir}/cmake/gwengui-qt4-%{devversion} %files lang -f %{name}.lang ++++++ gwenhywfar-4.15.2beta.tar.gz -> gwenhywfar-4.15.3.tar.gz ++++++ ++++ 31742 lines of diff (skipped)

1 0

commit aqbanking for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package aqbanking for openSUSE:Factory checked in at 2016-05-02 10:44:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqbanking (Old) and /work/SRC/openSUSE:Factory/.aqbanking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aqbanking" Changes: -------- --- /work/SRC/openSUSE:Factory/aqbanking/aqbanking.changes 2016-04-07 13:32:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aqbanking.new/aqbanking.changes 2016-05-02 10:44:58.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Apr 30 07:21:22 UTC 2016 - nico.kruber(a)gmail.com + +- Update to 5.6.10: + + fixes problems with some special HBCI messages + + support HHD 1.3.2 (Flicker codes for PIN/TAN) again + (thanks to Martin Kuehn) +- Update to 5.6.9beta: + + support old-version Flicker codes which are still used by + some banks (thanks to Martin Kuehn) + +------------------------------------------------------------------- Old: ---- aqbanking-5.6.8beta.tar.gz New: ---- aqbanking-5.6.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqbanking.spec ++++++ --- /var/tmp/diff_new_pack.udBqDI/_old 2016-05-02 10:44:59.000000000 +0200 +++ /var/tmp/diff_new_pack.udBqDI/_new 2016-05-02 10:44:59.000000000 +0200 @@ -26,7 +26,7 @@ %define q4b_cfgmoddir %{fronts_libdir}/q4banking/cfgmodules Name: aqbanking -Version: 5.6.8beta +Version: 5.6.10 Release: 0 Summary: Library for Online Banking Functions and Financial Data Import and Export License: GPL-2.0 or GPL-3.0 ++++++ aqbanking-5.6.8beta.tar.gz -> aqbanking-5.6.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/ChangeLog new/aqbanking-5.6.10/ChangeLog --- old/aqbanking-5.6.8beta/ChangeLog 2016-03-11 00:20:06.000000000 +0100 +++ new/aqbanking-5.6.10/ChangeLog 2016-04-23 18:33:21.000000000 +0200 @@ -1,4 +1,34 @@ ------------------------------------------------------------------ +2016-04-23 18:30:49 +0200 Martin Preuss +Prepared release 5.6.10. + +------------------------------------------------------------------ +2016-04-18 21:01:06 +0200 Elias Oltmanns +AqHBCI: Minor adjustments to make segment definitions comply with the specs. + +------------------------------------------------------------------ +2016-04-10 18:27:49 +0200 Martin Preuss +Prepared release 5.6.9beta. + +------------------------------------------------------------------ +2016-04-05 07:58:01 +0200 Martin Kuehn +ChipTAN: added support for fallback to HHD 1.3.2 if control bytes are missing + +------------------------------------------------------------------ +2016-03-23 22:45:50 +0100 Martin Preuss +Moved AB_Transaction_SetEndToEndReference() to the right place. + +------------------------------------------------------------------ +2016-03-13 16:21:11 +0100 Martin Preuss +aqbanking-cli: Added option "ignoreUnsupported". +This is used with the command "aqbanking-cli request" to make the tool +ignore requests for accounts which don't support them. + +Without this option an error is returned if a request is made for an account +which does not support that request (i.e. requesting transactions for +unsupported accounts). + +------------------------------------------------------------------ 2016-03-11 00:17:40 +0100 Martin Preuss Prepared release 5.6.8beta. @@ -512,39 +542,3 @@ ------------------------------------------------------------------ 2014-08-03 23:14:31 +0200 Martin Preuss AqHBCI: Fixed a typo. - ------------------------------------------------------------------- -2014-08-03 23:14:19 +0200 Martin Preuss -Added new CMAKE files to .gitignore. - ------------------------------------------------------------------- -2014-08-03 23:07:16 +0200 Martin Preuss -Added CMake package configuration files -Makes live for cmake users a lot easier. - -It is not platform idependent as the library extension .so is hard -coded. - -Signed-off-by: Martin Preuss <martin(a)aquamaniac.de> - ------------------------------------------------------------------- -2014-08-03 19:17:42 +0200 Martin Preuss -AqHBCI: Started working on job SepaGetStandingOrders. - ------------------------------------------------------------------- -2014-08-03 19:16:59 +0200 Martin Preuss -AqBanking: Added job SepaGetStandingOrders. -Also added handling for some other jobs in AB_Job_Type2Char() and -AB_Job_Type2LocalChar(). - ------------------------------------------------------------------- -2014-08-02 18:24:36 +0200 Martin Preuss -Added test-driver to .gitingore. - ------------------------------------------------------------------- -2014-08-02 18:24:05 +0200 Martin Preuss -Force IBAN and BIC for SEPA transfers and debit notes. -The group "kti_i" his quite vague, it allows for either national or -international specification of the local bank account, the parser can't handle -that too well. Some jobs need SEPA info (e.g. the SEPA transfer jobs), and -for those the parser should fail if IBAN or BIC are missing. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/aqbanking.iss new/aqbanking-5.6.10/aqbanking.iss --- old/aqbanking-5.6.8beta/aqbanking.iss 2016-03-11 00:19:20.000000000 +0100 +++ new/aqbanking-5.6.10/aqbanking.iss 2016-04-23 18:30:21.000000000 +0200 @@ -8,7 +8,7 @@ [Setup] ; Using the name here directly because we want it capitalized AppName=AqBanking -AppVerName=AqBanking 5.6.8beta +AppVerName=AqBanking 5.6.10 AppPublisher=AqBanking Development Team AppPublisherURL=http://sourceforge.net/projects/aqbanking AppSupportURL=http://sourceforge.net/support/getsupport.php?group_id=115695 @@ -18,7 +18,7 @@ DirExistsWarning=no InfoAfterFile=README LicenseFile=COPYING -OutputBaseFilename=aqbanking-5.6.8beta-setup +OutputBaseFilename=aqbanking-5.6.10-setup OutputDir=. UninstallFilesDir={app}\uninstall\aqbanking @@ -151,9 +151,9 @@ StringChange(FileString, '@'+'aqbanking_pkgdatadir@', pkgdatadir); StringChange(FileString, '@'+'AQBANKING_VERSION_MAJOR@', '5'); StringChange(FileString, '@'+'AQBANKING_VERSION_MINOR@', '6'); - StringChange(FileString, '@'+'AQBANKING_VERSION_PATCHLEVEL@', '8'); + StringChange(FileString, '@'+'AQBANKING_VERSION_PATCHLEVEL@', '10'); StringChange(FileString, '@'+'AQBANKING_VERSION_BUILD@', '0'); - StringChange(FileString, '@'+'AQBANKING_VERSION_TAG@', 'beta'); + StringChange(FileString, '@'+'AQBANKING_VERSION_TAG@', 'stable'); StringChange(FileString, '@'+'cbanking_libs@', '-L' + bindir + ' @cbanking_libs@'); StringChange(FileString, '@'+'cbanking_includes@', '-I'+includedir); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/aqbanking.spec new/aqbanking-5.6.10/aqbanking.spec --- old/aqbanking-5.6.8beta/aqbanking.spec 2016-03-11 00:19:20.000000000 +0100 +++ new/aqbanking-5.6.10/aqbanking.spec 2016-04-23 18:30:21.000000000 +0200 @@ -2,7 +2,7 @@ # neededforbuild gwenhywfar gwenhywfar-devel ktoblzcheck python python-ctypes pyyxml libchipcard2-devel libchipcard2 pkgconfig gettext-devel libacl-devel libacl libattr-devel libattr %define name aqbanking -%define version 5.6.8beta +%define version 5.6.10 %define dist Ubuntu %define disttag ubuntu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/configure new/aqbanking-5.6.10/configure --- old/aqbanking-5.6.8beta/configure 2016-03-11 00:19:03.000000000 +0100 +++ new/aqbanking-5.6.10/configure 2016-04-23 18:30:04.000000000 +0200 @@ -2743,9 +2743,9 @@ AQBANKING_VERSION_MAJOR=5 AQBANKING_VERSION_MINOR=6 -AQBANKING_VERSION_PATCHLEVEL=8 +AQBANKING_VERSION_PATCHLEVEL=10 AQBANKING_VERSION_BUILD=0 -AQBANKING_VERSION_TAG="beta" +AQBANKING_VERSION_TAG="stable" @@ -2760,7 +2760,7 @@ AQBANKING_SO_CURRENT=40 AQBANKING_SO_AGE=5 -AQBANKING_SO_REVISION=8 +AQBANKING_SO_REVISION=10 AQBANKING_SO_EFFECTIVE="`echo \$(($AQBANKING_SO_CURRENT-$AQBANKING_SO_AGE))`" # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/configure.ac new/aqbanking-5.6.10/configure.ac --- old/aqbanking-5.6.8beta/configure.ac 2016-03-11 00:18:45.000000000 +0100 +++ new/aqbanking-5.6.10/configure.ac 2016-04-23 18:29:09.000000000 +0200 @@ -25,10 +25,10 @@ AQBANKING_VERSION_MAJOR=5 AQBANKING_VERSION_MINOR=6 -AQBANKING_VERSION_PATCHLEVEL=8 +AQBANKING_VERSION_PATCHLEVEL=10 AQBANKING_VERSION_BUILD=0 dnl "stable", "rcX", "betaX", "svn" -AQBANKING_VERSION_TAG="beta" +AQBANKING_VERSION_TAG="stable" @@ -43,7 +43,7 @@ AQBANKING_SO_CURRENT=40 AQBANKING_SO_AGE=5 -AQBANKING_SO_REVISION=8 +AQBANKING_SO_REVISION=10 AQBANKING_SO_EFFECTIVE="`echo \$(($AQBANKING_SO_CURRENT-$AQBANKING_SO_AGE))`" # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/src/plugins/backends/aqhbci/plugin/applayer/hhd.c new/aqbanking-5.6.10/src/plugins/backends/aqhbci/plugin/applayer/hhd.c --- old/aqbanking-5.6.8beta/src/plugins/backends/aqhbci/plugin/applayer/hhd.c 2015-12-20 20:45:17.000000000 +0100 +++ new/aqbanking-5.6.10/src/plugins/backends/aqhbci/plugin/applayer/hhd.c 2016-04-10 16:32:53.000000000 +0200 @@ -102,6 +102,8 @@ unsigned int numCtrlBytes; unsigned int moreCtrlBytes; unsigned int numBytes; + /* preset bit masks for HHD 1.4 */ + unsigned int maskLen = 0x3f; /* read LC */ rv=AH_HHD14_ReadBytesHex(code, 2); @@ -132,7 +134,7 @@ moreCtrlBytes = LSandFlags & 0x80; while (moreCtrlBytes) { - rv=AH_HHD14_ReadBytesHex(code+numCtrlBytes*2, 2); /* LS */ + rv=AH_HHD14_ReadBytesHex(code+numCtrlBytes*2, 2); if (rv<0) { DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d) at [%s]", rv, code); return rv; @@ -140,7 +142,11 @@ numCtrlBytes++; moreCtrlBytes = (unsigned int) rv & 0x80; } - numBytes = (LSandFlags & 0x3f) + numCtrlBytes; + if (numCtrlBytes == 0) { + /* set bit mask for HHD 1.3.2 */ + maskLen = 0x0f; + } + numBytes = (LSandFlags & maskLen) + numCtrlBytes; GWEN_Buffer_AppendBytes(xbuf, code, numBytes*2); code += numBytes*2; i += numBytes + 2; /* add length of LC and LS */ @@ -155,7 +161,7 @@ return rv; } /* v=((unsigned int) rv) & 0xf; */ - v=((unsigned int) rv) & 0x3f; /* as suggested by Martin Kuehn */ + v=((unsigned int) rv) & maskLen; code+=2; if (i+v+1 > len) { DBG_INFO(AQHBCI_LOGDOMAIN, "try to read past the end of code (%d) at [%s]", v, code); @@ -268,6 +274,11 @@ unsigned int inLen; unsigned int outLenAndFlags; unsigned int outLen; + /* preset bit masks for HHD 1.4 */ + unsigned int maskLen = 0x3f; + unsigned int maskAscFlag = 0x40; + unsigned int maskCtlFlag = 0x80; + int rv; GWEN_BUFFER *xbuf; char numbuf[16]; @@ -295,17 +306,17 @@ return rv; } inLenAndFlags=(unsigned int) rv; - inLen=inLenAndFlags & 0x3f; + inLen=inLenAndFlags & maskLen; code+=2; outLen=(inLen+1)/2; - outLenAndFlags=outLen | (inLenAndFlags & 0x80); + outLenAndFlags=outLen | (inLenAndFlags & maskCtlFlag); snprintf(numbuf, sizeof(numbuf)-1, "%02x", outLenAndFlags); numbuf[sizeof(numbuf)-1]=0; GWEN_Buffer_AppendString(xbuf, numbuf); /* copy control bytes, if necessary */ - if (inLenAndFlags & 0x80) { + if (inLenAndFlags & maskCtlFlag) { unsigned int ctrl=0; do { @@ -322,7 +333,12 @@ numbuf[sizeof(numbuf)-1]=0; GWEN_Buffer_AppendString(xbuf, numbuf); code+=2; - } while (ctrl & 0x80); + } while (ctrl & maskCtlFlag); + } + else { + DBG_ERROR(AQHBCI_LOGDOMAIN, "no control bytes fallback to HHD 1.3.2"); + maskLen = 0xf; + maskAscFlag = 0x10; } if (inLen) { @@ -335,7 +351,7 @@ /* read DE's */ while (*code) { - /* length is in dec and contains flags */ + /* input length is in dec usually no AscFlag for DE's is provided */ rv=AH_HHD14_ReadBytesDec(code, 2); if (rv<0) { DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); @@ -343,29 +359,28 @@ return rv; } inLenAndFlags=(unsigned int) rv; - inLen=inLenAndFlags & 0x3f; + inLen=inLenAndFlags & maskLen; code+=2; - /* check whether we need to switch to ASC */ - if ((inLenAndFlags & 0x40)==0) { + /* so we have to check whether we need to switch to ASC */ + if ((inLenAndFlags & maskAscFlag)==0) { int i; for (i=0; i<inLen; i++) { if (code[i]<'0' || code[i]>'9'){ - /* contains something other than digits, use ascii encoding */ - DBG_ERROR(AQHBCI_LOGDOMAIN, "Switched to ASCII"); - inLenAndFlags|=0x40; + /* contains something other than digits, use ascii encoding */ + DBG_ERROR(AQHBCI_LOGDOMAIN, "Switched to ASCII"); + inLenAndFlags|=maskAscFlag; break; } } } /* write to outbuffer */ - if (inLenAndFlags & 0x40) { + if (inLenAndFlags & maskAscFlag) { /* ascii */ - //outLen=(inLen+1)/2; outLen=inLen; - outLenAndFlags=outLen | 0x40; /* add encoding flag to length (bit 6) */ + outLenAndFlags=outLen | maskAscFlag; /* add encoding flag to length (bit 6 or 4) */ snprintf(numbuf, sizeof(numbuf)-1, "%02x", outLenAndFlags); numbuf[sizeof(numbuf)-1]=0; GWEN_Buffer_AppendString(xbuf, numbuf); @@ -375,7 +390,7 @@ code+=inLen; } else { - /* bcd */ + /* bcd, pack 2 digits into 1 Byte */ outLen=(inLen+1)/2; outLenAndFlags=outLen; snprintf(numbuf, sizeof(numbuf)-1, "%02x", outLenAndFlags); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/src/plugins/backends/aqhbci/plugin/applayer/xml/fints300seg.xml new/aqbanking-5.6.10/src/plugins/backends/aqhbci/plugin/applayer/xml/fints300seg.xml --- old/aqbanking-5.6.8beta/src/plugins/backends/aqhbci/plugin/applayer/xml/fints300seg.xml 2016-01-07 23:10:21.000000000 +0100 +++ new/aqbanking-5.6.10/src/plugins/backends/aqhbci/plugin/applayer/xml/fints300seg.xml 2016-04-22 16:39:17.000000000 +0200 @@ -440,7 +440,7 @@ <ELEM name="version" type="num" maxsize="3" /> <ELEM name="ignoreUPDJobs" type="num" maxsize="1" /> <ELEM name="userName" type="ascii" maxsize="35" minnum="0" /> - <ELEM name="genericExt" type="ascii" maxsize="2048" minnum="0" /> + <ELEM name="genericExt" type="an" maxsize="2048" minnum="0" /> <VALUES> <VALUE path="head/code">%code</VALUE> @@ -489,8 +489,8 @@ <ELEM name="customer" type="ascii" maxsize="65" trustlevel="3" /> <ELEM name="type" type="num" maxsize="2" minnum="0" /> <ELEM name="currency" type="an" maxsize="65" minnum="0" /> - <ELEM name="name1" type="an" maxsize="27" /> - <ELEM name="name2" type="an" maxsize="27" minnum="0" /> + <ELEM name="name1" type="an" maxsize="35" /> + <ELEM name="name2" type="an" maxsize="35" minnum="0" /> <ELEM name="account/name" type="an" maxsize="30" minnum="0" /> <GROUP type="limit" name="limit" minnum="0" trustlevel="4" version="1" /> <GROUP type="updjob" name="updjob" minnum="0" maxnum="999" version="1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/src/plugins/backends/aqofxconnect/version.h new/aqbanking-5.6.10/src/plugins/backends/aqofxconnect/version.h --- old/aqbanking-5.6.8beta/src/plugins/backends/aqofxconnect/version.h 2016-03-11 00:19:20.000000000 +0100 +++ new/aqbanking-5.6.10/src/plugins/backends/aqofxconnect/version.h 2016-04-23 18:30:21.000000000 +0200 @@ -16,11 +16,11 @@ #define AQOFXCONNECT_VERSION_MAJOR 5 #define AQOFXCONNECT_VERSION_MINOR 6 -#define AQOFXCONNECT_VERSION_PATCHLEVEL 8 +#define AQOFXCONNECT_VERSION_PATCHLEVEL 10 #define AQOFXCONNECT_VERSION_BUILD 0 -#define AQOFXCONNECT_VERSION_TAG "beta" -#define AQOFXCONNECT_VERSION_FULL_STRING "5.6.8.0beta" -#define AQOFXCONNECT_VERSION_STRING "5.6.8" +#define AQOFXCONNECT_VERSION_TAG "stable" +#define AQOFXCONNECT_VERSION_FULL_STRING "5.6.10.0stable" +#define AQOFXCONNECT_VERSION_STRING "5.6.10" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/src/tools/aqbanking-cli/request.c new/aqbanking-5.6.10/src/tools/aqbanking-cli/request.c --- old/aqbanking-5.6.8beta/src/tools/aqbanking-cli/request.c 2014-08-04 21:32:44.000000000 +0200 +++ new/aqbanking-5.6.10/src/tools/aqbanking-cli/request.c 2016-03-13 16:19:28.000000000 +0100 @@ -46,6 +46,7 @@ int reqSto=0; int reqSepaSto=0; int reqDT=0; + int ignoreUnsupported=0; GWEN_TIME *fromTime=0; GWEN_TIME *toTime=0; AB_JOB_LIST2 *jobList; @@ -172,6 +173,17 @@ "Request dated transfers" /* long description */ }, { + 0, + GWEN_ArgsType_Int, + "ignoreUnsupported", + 0, + 1, + 0, + "ignoreUnsupported", + "let AqBanking ignore unsupported requests for accounts", + "let AqBanking ignore unsupported requests for accounts", + }, + { GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ GWEN_ArgsType_Char, /* type */ "fromDate", /* name */ @@ -193,6 +205,7 @@ "Specify the first date for which transactions are wanted (YYYYMMDD)", /* short */ "Specify the first date for which transactions are wanted (YYYYMMDD)" /* long */ }, + { GWEN_ARGS_FLAGS_HELP | GWEN_ARGS_FLAGS_LAST, /* flags */ GWEN_ArgsType_Int, /* type */ @@ -228,6 +241,7 @@ return 0; } + ignoreUnsupported=GWEN_DB_GetIntValue(db, "ignoreUnsupported", 0, 0); reqTrans=GWEN_DB_GetIntValue(db, "reqTrans", 0, 0); reqBalance=GWEN_DB_GetIntValue(db, "reqBalance", 0, 0); reqSto=GWEN_DB_GetIntValue(db, "reqSto", 0, 0); @@ -306,7 +320,41 @@ a=AB_Account_List2Iterator_Data(ait); assert(a); while(a) { - int matches=1; + int matches=1; + GWEN_BUFFER *accNameBuf; + + accNameBuf=GWEN_Buffer_new(0, 256, 0, 1); + + s=AB_Account_GetBankName(a); + if (s) { + GWEN_Buffer_AppendString(accNameBuf, " Bank Name: "); + GWEN_Buffer_AppendString(accNameBuf, s); + } + + s=AB_Account_GetBankCode(a); + if (s) { + GWEN_Buffer_AppendString(accNameBuf, " Bank Code: "); + GWEN_Buffer_AppendString(accNameBuf, s); + } + + s=AB_Account_GetAccountName(a); + if (s) { + GWEN_Buffer_AppendString(accNameBuf, " Account Name: "); + GWEN_Buffer_AppendString(accNameBuf, s); + } + + s=AB_Account_GetAccountNumber(a); + if (s) { + GWEN_Buffer_AppendString(accNameBuf, " Account Num: "); + GWEN_Buffer_AppendString(accNameBuf, s); + } + + s=AB_Account_GetSubAccountId(a); + if (s) { + GWEN_Buffer_AppendString(accNameBuf, " Account Suffix: "); + GWEN_Buffer_AppendString(accNameBuf, s); + } + if (matches && bankId) { s=AB_Account_GetBankCode(a); @@ -339,118 +387,176 @@ } if (matches) { + if (reqTrans) { AB_JOB *j; j=AB_JobGetTransactions_new(a); rv=AB_Job_CheckAvailability(j); - if (rv<0) { - DBG_ERROR(0, - "Error requesting transactions for %s/%s: %d", - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a), - rv); - AB_Account_List2Iterator_free(ait); - AB_Account_List2_free(al); - AB_Job_List2_FreeAll(jobList); - GWEN_Time_free(toTime); - GWEN_Time_free(fromTime); - return 3; + if (rv>=0) { + if (fromTime) + AB_JobGetTransactions_SetFromTime(j, fromTime); + if (toTime) + AB_JobGetTransactions_SetToTime(j, toTime); + AB_Job_List2_PushBack(jobList, j); + requests++; + } + else { + if (ignoreUnsupported) { + DBG_ERROR(0, + "Ignoring transfer request for %s: %d", + GWEN_Buffer_GetStart(accNameBuf), + rv); + AB_Job_free(j); + } + else { + DBG_ERROR(0, + "Error requesting transfers for %s: %d", + GWEN_Buffer_GetStart(accNameBuf), + rv); + GWEN_Buffer_free(accNameBuf); + AB_Account_List2Iterator_free(ait); + AB_Account_List2_free(al); + AB_Job_List2_FreeAll(jobList); + GWEN_Time_free(toTime); + GWEN_Time_free(fromTime); + return 3; + } } - if (fromTime) - AB_JobGetTransactions_SetFromTime(j, fromTime); - if (toTime) - AB_JobGetTransactions_SetToTime(j, toTime); + } - AB_Job_List2_PushBack(jobList, j); - requests++; - } if (reqBalance) { AB_JOB *j; j=AB_JobGetBalance_new(a); rv=AB_Job_CheckAvailability(j); - if (rv<0) { - DBG_ERROR(0, - "Error requesting balance for %s/%s: %d", - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a), - rv); - AB_Account_List2Iterator_free(ait); - AB_Account_List2_free(al); - AB_Job_List2_FreeAll(jobList); - GWEN_Time_free(toTime); - GWEN_Time_free(fromTime); - return 3; + if (rv>=0) { + AB_Job_List2_PushBack(jobList, j); + requests++; + } + else { + if (ignoreUnsupported) { + DBG_ERROR(0, + "Ignoring balance request for %s: %d", + GWEN_Buffer_GetStart(accNameBuf), + rv); + AB_Job_free(j); + } + else { + DBG_ERROR(0, + "Error requesting balance for %s: %d", + GWEN_Buffer_GetStart(accNameBuf), + rv); + GWEN_Buffer_free(accNameBuf); + AB_Account_List2Iterator_free(ait); + AB_Account_List2_free(al); + AB_Job_List2_FreeAll(jobList); + GWEN_Time_free(toTime); + GWEN_Time_free(fromTime); + return 3; + } } - AB_Job_List2_PushBack(jobList, j); - requests++; } if (reqSto) { AB_JOB *j; j=AB_JobGetStandingOrders_new(a); rv=AB_Job_CheckAvailability(j); - if (rv<0) { - DBG_ERROR(0, - "Error requesting standing order for %s/%s: %d", - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a), - rv); - AB_Account_List2Iterator_free(ait); - AB_Account_List2_free(al); - AB_Job_List2_FreeAll(jobList); - GWEN_Time_free(toTime); - GWEN_Time_free(fromTime); - return 3; + if (rv>=0) { + AB_Job_List2_PushBack(jobList, j); + requests++; + } + else { + if (ignoreUnsupported) { + DBG_ERROR(0, + "Ignoring standing order request for %s: %d", + GWEN_Buffer_GetStart(accNameBuf), + rv); + AB_Job_free(j); + } + else { + DBG_ERROR(0, + "Error requesting standing orders for %s: %d", + GWEN_Buffer_GetStart(accNameBuf), + rv); + GWEN_Buffer_free(accNameBuf); + AB_Account_List2Iterator_free(ait); + AB_Account_List2_free(al); + AB_Job_List2_FreeAll(jobList); + GWEN_Time_free(toTime); + GWEN_Time_free(fromTime); + return 3; + } } - AB_Job_List2_PushBack(jobList, j); - requests++; } if (reqSepaSto) { AB_JOB *j; j=AB_JobSepaGetStandingOrders_new(a); rv=AB_Job_CheckAvailability(j); - if (rv<0) { - DBG_ERROR(0, - "Error requesting SEPA standing order for %s/%s: %d", - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a), - rv); - AB_Account_List2Iterator_free(ait); - AB_Account_List2_free(al); - AB_Job_List2_FreeAll(jobList); - GWEN_Time_free(toTime); - GWEN_Time_free(fromTime); - return 3; + if (rv>=0) { + AB_Job_List2_PushBack(jobList, j); + requests++; + } + else { + if (ignoreUnsupported) { + DBG_ERROR(0, + "Ignoring SEPA standing order request for %s: %d", + GWEN_Buffer_GetStart(accNameBuf), + rv); + AB_Job_free(j); + } + else { + DBG_ERROR(0, + "Error requesting SEPA standing orders for %s: %d", + GWEN_Buffer_GetStart(accNameBuf), + rv); + GWEN_Buffer_free(accNameBuf); + AB_Account_List2Iterator_free(ait); + AB_Account_List2_free(al); + AB_Job_List2_FreeAll(jobList); + GWEN_Time_free(toTime); + GWEN_Time_free(fromTime); + return 3; + } } - AB_Job_List2_PushBack(jobList, j); - requests++; } if (reqDT) { AB_JOB *j; j=AB_JobGetDatedTransfers_new(a); rv=AB_Job_CheckAvailability(j); - if (rv<0) { - DBG_ERROR(0, - "Error requesting dated transfers for %s/%s: %d", - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a), - rv); - AB_Account_List2Iterator_free(ait); - AB_Account_List2_free(al); - AB_Job_List2_FreeAll(jobList); - GWEN_Time_free(toTime); - GWEN_Time_free(fromTime); - return 3; + if (rv>=0) { + AB_Job_List2_PushBack(jobList, j); + requests++; + } + else { + if (ignoreUnsupported) { + DBG_ERROR(0, + "Ignoring dated transfers request for %s: %d", + GWEN_Buffer_GetStart(accNameBuf), + rv); + AB_Job_free(j); + } + else { + DBG_ERROR(0, + "Error requesting dated transfers for %s: %d", + GWEN_Buffer_GetStart(accNameBuf), + rv); + GWEN_Buffer_free(accNameBuf); + AB_Account_List2Iterator_free(ait); + AB_Account_List2_free(al); + AB_Job_List2_FreeAll(jobList); + GWEN_Time_free(toTime); + GWEN_Time_free(fromTime); + return 3; + } } - AB_Job_List2_PushBack(jobList, j); - requests++; - } + } } + GWEN_Buffer_free(accNameBuf); + a=AB_Account_List2Iterator_Next(ait); } AB_Account_List2Iterator_free(ait); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/src/tools/aqbanking-cli/util.c new/aqbanking-5.6.10/src/tools/aqbanking-cli/util.c --- old/aqbanking-5.6.8beta/src/tools/aqbanking-cli/util.c 2016-03-04 17:25:19.000000000 +0100 +++ new/aqbanking-5.6.10/src/tools/aqbanking-cli/util.c 2016-03-23 22:45:14.000000000 +0100 @@ -234,10 +234,6 @@ return 0; } - s=GWEN_DB_GetCharValue(db, "endToEndReference", 0, 0); - if (s && *s) - AB_Transaction_SetEndToEndReference(t, s); - // dated transfer s=GWEN_DB_GetCharValue(db, "executionDate", 0, 0); @@ -441,6 +437,10 @@ return NULL; } + s=GWEN_DB_GetCharValue(db, "endToEndReference", 0, 0); + if (s && *s) + AB_Transaction_SetEndToEndReference(t, s); + /* dated transfer, SEPA debit notes */ s=GWEN_DB_GetCharValue(db, "executionDate", 0, 0); if (s && *s) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.8beta/version.h new/aqbanking-5.6.10/version.h --- old/aqbanking-5.6.8beta/version.h 2016-03-11 00:19:20.000000000 +0100 +++ new/aqbanking-5.6.10/version.h 2016-04-23 18:30:21.000000000 +0200 @@ -13,15 +13,15 @@ #define AQBANKING_VERSION_MAJOR 5 #define AQBANKING_VERSION_MINOR 6 -#define AQBANKING_VERSION_PATCHLEVEL 8 +#define AQBANKING_VERSION_PATCHLEVEL 10 #define AQBANKING_VERSION_BUILD 0 -#define AQBANKING_VERSION_TAG "beta" -#define AQBANKING_VERSION_FULL_STRING "5.6.8.0beta" -#define AQBANKING_VERSION_STRING "5.6.8" +#define AQBANKING_VERSION_TAG "stable" +#define AQBANKING_VERSION_FULL_STRING "5.6.10.0stable" +#define AQBANKING_VERSION_STRING "5.6.10" #define AQBANKING_SO_CURRENT 40 -#define AQBANKING_SO_REVISION 8 +#define AQBANKING_SO_REVISION 10 #define AQBANKING_SO_AGE 5 #define AQBANKING_SO_EFFECTIVE 35

1 0

commit spec-cleaner for openSUSE:Factory
by root＠hilbert.suse.de 02 May '16

02 May '16

Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2016-05-02 10:44:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spec-cleaner" Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2016-04-28 16:56:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2016-05-02 10:44:57.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 29 20:42:17 UTC 2016 - tchvatal(a)suse.com + +- Version update to 0.8.2: + * Add switch to disable copyright generating + * Few small fixes + * Tweak pkgconfig addition to work on all distros not just openSUSE + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.8.1.tar.gz New: ---- spec-cleaner-0.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.n5T93r/_old 2016-05-02 10:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.n5T93r/_new 2016-05-02 10:44:58.000000000 +0200 @@ -20,7 +20,7 @@ # This is used for Fedora, we need to sync this %{!?py3_ver: %define py3_ver %{python3_version}} Name: spec-cleaner -Version: 0.8.1 +Version: 0.8.2 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause @@ -104,6 +104,7 @@ %{_datadir}/%{name}/licenses_changes.txt %{_datadir}/%{name}/pkgconfig_conversions.txt %{_datadir}/%{name}/allowed_groups.txt +%{_datadir}/%{name}/licences_exceptions.txt %files format_spec_file %defattr(-,root,root) ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.n5T93r/_old 2016-05-02 10:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.n5T93r/_new 2016-05-02 10:44:58.000000000 +0200 @@ -1,4 +1,10 @@ -spec-cleaner (0.8.0-1) stable; urgency=low +spec-cleaner (0.8.2-1) stable; urgency=low + + * Update to upstream 0.8.2 release + + -- Tomáš Chvátal <tchvatal(a)suse.cz> Thu, 29 Apr 2016 22:30:00 +0100 + +spec-cleaner (0.8.1-1) stable; urgency=low * Update to upstream 0.8.1 release ++++++ spec-cleaner-0.8.1.tar.gz -> spec-cleaner-0.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/README.md new/spec-cleaner-spec-cleaner-0.8.2/README.md --- old/spec-cleaner-spec-cleaner-0.8.1/README.md 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/README.md 2016-04-29 22:12:42.000000000 +0200 @@ -2,6 +2,7 @@ [![Build Status](https://travis-ci.org/openSUSE/spec-cleaner.svg?branch=master)](htt… [![Coverage Status](https://coveralls.io/repos/openSUSE/spec-cleaner/badge.svg?branch=master&service=github)](https://coveralls.io/github/openSUSE/spec-cleaner?branch=master) +[![Code Health](https://landscape.io/github/openSUSE/spec-cleaner/master/landscape.svg?style=flat)](https://landscape.io/github/openSUSE/spec-cleaner/master) spec-cleaner is a tool that is planned to be replacement for "osc service localrun format_spec_file". It is intended to provide same or better features in order for us to be able to unify all the spec files in obs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/README.md.in new/spec-cleaner-spec-cleaner-0.8.2/README.md.in --- old/spec-cleaner-spec-cleaner-0.8.1/README.md.in 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/README.md.in 2016-04-29 22:12:42.000000000 +0200 @@ -2,6 +2,7 @@ [![Build Status](https://travis-ci.org/openSUSE/spec-cleaner.svg?branch=master)](htt… [![Coverage Status](https://coveralls.io/repos/openSUSE/spec-cleaner/badge.svg?branch=master&service=github)](https://coveralls.io/github/openSUSE/spec-cleaner?branch=master) +[![Code Health](https://landscape.io/github/openSUSE/spec-cleaner/master/landscape.svg?style=flat)](https://landscape.io/github/openSUSE/spec-cleaner/master) spec-cleaner is a tool that is planned to be replacement for "osc service localrun format_spec_file". It is intended to provide same or better features in order for us to be able to unify all the spec files in obs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/RELEASE.md new/spec-cleaner-spec-cleaner-0.8.2/RELEASE.md --- old/spec-cleaner-spec-cleaner-0.8.1/RELEASE.md 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/RELEASE.md 2016-04-29 22:12:42.000000000 +0200 @@ -2,7 +2,7 @@ ======================= Steps to create a new release: -1. check that the version bump was done in setup.py +1. check that the version bump was done in spec_cleaner/__init__.py 2. tag the new release: `git tag -s spec-cleaner-X.Y.Z` -3. upload to pypi: `python setup.py sdist upload -4. post release version bump in setup.py +3. upload to pypi: `python setup.py sdist upload` +4. post release version bump in spec_cleaner/__init__.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/data/licences_exceptions.txt new/spec-cleaner-spec-cleaner-0.8.2/data/licences_exceptions.txt --- old/spec-cleaner-spec-cleaner-0.8.1/data/licences_exceptions.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/data/licences_exceptions.txt 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,25 @@ +389-exception +Autoconf-exception-2.0 +Autoconf-exception-3.0 +Bison-exception-2.2 +CLISP-exception-2.0 +Classpath-exception-2.0 +DigiRule-FOSS-exception +FLTK-exception +Fawkes-Runtime-exception +Font-exception-2.0 +GCC-exception-2.0 +GCC-exception-3.1 +LZMA-exception +Libtool-exception +Nokia-Qt-exception-1.1 +OCCT-exception-1.0 +Qwt-exception-1.0 +WxWindows-exception-3.1 +eCos-exception-2.0 +freertos-exception-2.0 +gnu-javamail-exception +i2p-gpl-java-exception +mif-exception +openvpn-openssl-exception +u-boot-exception-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/license-update.sh new/spec-cleaner-spec-cleaner-0.8.2/license-update.sh --- old/spec-cleaner-spec-cleaner-0.8.1/license-update.sh 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/license-update.sh 2016-04-29 22:12:42.000000000 +0200 @@ -1,23 +1,24 @@ +#!/bin/bash export LC_ALL=C curl -s 'https://docs.google.com/spreadsheets/d/14AdaJ6cmU0kvQ4ulq9pWpjdZL5tkR03exRS…' | grep -v "New format" \ | sed -e 's,\s*$,,' > licenses_changes.ntxt : > licenses_changes.ptxt -grep ^SUSE- licenses_changes.ntxt | cut -d' ' -f1 | while read l; do +grep ^SUSE- licenses_changes.ntxt | cut -d' ' -f1 | while read -r l; do echo "$l+ $l+" >> licenses_changes.ptxt ; done -for i in `w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,.* ,,;'`; do +for i in $(w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,.* ,,;'); do echo "$i $i" >> licenses_changes.ntxt ; echo "$i+ $i+" >> licenses_changes.ptxt ; done IFS=: -dups=$(tr ' ' ':' < licenses_changes.ntxt | while read nl ol; do echo "$nl"; done | sed -e 's,^,B-,; s,B-SUSE-,A-,' | sort | uniq | sed -e 's,^.-,,' | sort | uniq -d) +dups=$(tr ' ' ':' < licenses_changes.ntxt | while read -r nl ol; do echo "$nl"; done | sed -e 's,^,B-,; s,B-SUSE-,A-,' | sort | uniq | sed -e 's,^.-,,' | sort | uniq -d) if test -n "$dups"; then echo "DUPS $dups" exit 1 fi -dups=$(tr ' ' ':' < licenses_changes.ntxt | while read nl ol; do echo "$ol"; done | sort | uniq -d) +dups=$(tr ' ' ':' < licenses_changes.ntxt | while read -r nl ol; do echo "$ol"; done | sort | uniq -d) unset IFS if test -n "$dups"; then echo "DUPS $dups" @@ -33,7 +34,7 @@ echo "License Tag | Description" echo "----------- | -----------" IFS=: -w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,\s* $[^ ]*$$,:\1,' | while read text license; do +w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,\s* $[^ ]*$$,:\1,' | while read -r text license; do echo "$license | $text" echo "$license" >> licenses_changes.raw done @@ -46,7 +47,7 @@ echo "|-----------|" IFS=: -grep ^SUSE- licenses_changes.ntxt | cut -d' ' -f1 | sort -u | while read nl; do +grep ^SUSE- licenses_changes.ntxt | cut -d' ' -f1 | sort -u | while read -r nl; do echo "|$nl|" done unset IFS @@ -54,6 +55,13 @@ rm licenses_changes.raw ) > README.md +for i in `w3m -dump -cols 1000 http://spdx.org/licenses/exceptions-index.html | grep "License Exception Text" | sed -e 's, *Y *License Exception Text,,; s, *License Exception Text,,; s,\s* $[^ ]*$$,:\1,' | cut -d: -f2`; do + echo "$i" >> license_exceptions.ntxt ; +done + +cat license_exceptions.ntxt | sort -u -o data/licences_exceptions.txt +rm license_exceptions.ntxt + cat licenses_changes.ntxt licenses_changes.ptxt | sort -u -o licenses_changes.stxt ( echo "First line" ; cat licenses_changes.stxt ) > data/licenses_changes.txt rm licenses_changes.ntxt licenses_changes.stxt licenses_changes.ptxt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/obs/clean_spec_file new/spec-cleaner-spec-cleaner-0.8.2/obs/clean_spec_file --- old/spec-cleaner-spec-cleaner-0.8.1/obs/clean_spec_file 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/obs/clean_spec_file 2016-04-29 22:12:42.000000000 +0200 @@ -16,7 +16,7 @@ shift ;; *) - echo Unknown parameter $1. + echo Unknown parameter "$1". echo 'Usage: this service does not expect additional arguments.' exit 1 ;; @@ -26,12 +26,12 @@ if [ -z "${MYOUTDIR}" ]; then # we want to format both specs and the templates that create them - MYSPECFILES="$(ls -1 *.spec 2>/dev/null) $(ls -1 *.spec.in 2>/dev/null)" + MYSPECFILES="$(ls -1 ./*.spec 2>/dev/null) $(ls -1 ./*.spec.in 2>/dev/null)" fi if [ -z "${MYSPECFILES}" ]; then # we want to format both specs and the templates that create them - MYSPECFILES="$(ls -1 *.spec 2>/dev/null) $(ls -1 *.spec.in 2>/dev/null)" + MYSPECFILES="$(ls -1 ./*.spec 2>/dev/null) $(ls -1 ./*.spec.in 2>/dev/null)" fi if [ "x${MYSPECFILES}" = "x " ]; then @@ -44,7 +44,7 @@ echo "WARNING: spec file \"${i}\" is not writeable." continue fi - /usr/bin/spec-cleaner -f "$i" -i 2>&1 > /dev/null + /usr/bin/spec-cleaner -f "$i" -i > /dev/null 2>&1 if [ $? -ne 0 ]; then echo "ERROR: failed conversion of spec file: \"${i}\"" RETVAL=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/obs/format_spec_file new/spec-cleaner-spec-cleaner-0.8.2/obs/format_spec_file --- old/spec-cleaner-spec-cleaner-0.8.1/obs/format_spec_file 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/obs/format_spec_file 2016-04-29 22:12:42.000000000 +0200 @@ -16,7 +16,7 @@ shift ;; *) - echo Unknown parameter $1. + echo Unknown parameter "$1". echo 'Usage: this service does not expect additional arguments.' exit 1 ;; @@ -26,12 +26,12 @@ if [ -z "${MYOUTDIR}" ]; then # we want to format both specs and the templates that create them - MYSPECFILES="$(ls -1 *.spec 2>/dev/null) $(ls -1 *.spec.in 2>/dev/null)" + MYSPECFILES="$(ls -1 ./*.spec 2>/dev/null) $(ls -1 ./*.spec.in 2>/dev/null)" fi if [ -z "${MYSPECFILES}" ]; then # we want to format both specs and the templates that create them - MYSPECFILES="$(ls -1 *.spec 2>/dev/null) $(ls -1 *.spec.in 2>/dev/null)" + MYSPECFILES="$(ls -1 ./*.spec 2>/dev/null) $(ls -1 ./*.spec.in 2>/dev/null)" fi if [ "x${MYSPECFILES}" = "x " ]; then @@ -44,7 +44,7 @@ echo "WARNING: spec file \"${i}\" is not writeable." continue fi - /usr/bin/spec-cleaner -m -f "$i" -i 2>&1 > /dev/null + /usr/bin/spec-cleaner -m -f "$i" -i > /dev/null 2>&1 if [ $? -ne 0 ]; then echo "ERROR: failed conversion of spec file: \"${i}\"" RETVAL=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/pkgconfig-update.sh new/spec-cleaner-spec-cleaner-0.8.2/pkgconfig-update.sh --- old/spec-cleaner-spec-cleaner-0.8.1/pkgconfig-update.sh 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/pkgconfig-update.sh 2016-04-29 22:12:42.000000000 +0200 @@ -1,6 +1,7 @@ -#!/bin/sh +#!/bin/bash fetch() { - local status="$(curl -o /dev/null -LsIw '%{http_code}' "$1" 2>&1)" + local status + status="$(curl -o /dev/null -LsIw '%{http_code}' "$1" 2>&1)" if [ "$status" != 200 ]; then echo >&2 "Unable to download the repodata from \"$1\": $status" exit 1 @@ -16,4 +17,4 @@ BASEURL="http://download.opensuse.org/distribution/$1/repo/oss/suse/" fetch "${BASEURL}$(fetch "${BASEURL}repodata/repomd.xml" \ | perl -ne 'print $1 if /"(.*?primary.xml.gz)"/')" \ - | zcat | perl "$(cd "`dirname $0`" && pwd)/pkgconfig-update.pl" + | zcat | perl "$(cd "$(dirname $0)" && pwd)/pkgconfig-update.pl" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/__init__.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/__init__.py 2016-04-29 22:12:42.000000000 +0200 @@ -12,7 +12,7 @@ from .rpmcleaner import RpmSpecCleaner -__version__ = '0.8.1' +__version__ = '0.8.2' def process_args(argv): @@ -40,6 +40,8 @@ help='inline the changes directly to the parsed file.') parser.add_argument('-m', '--minimal', action='store_true', default=False, help='run in minimal mode that does not do anything intrusive (ie. just sets the Copyright)') + parser.add_argument('--no-copyright', action='store_true', default=False, + help='don\'t handle or add a copyright header') output_group.add_argument('-o', '--output', default='', help='specify the output file for the cleaned spec content.') parser.add_argument('-p', '--pkgconfig', action='store_true', default=False, @@ -74,6 +76,7 @@ 'diff': options.diff, 'diff_prog': options.diff_prog, 'minimal': options.minimal, + 'no_copyright': options.no_copyright, } return options_dict diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmcleaner.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmcleaner.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmcleaner.py 2016-04-29 22:12:42.000000000 +0200 @@ -55,6 +55,7 @@ self.diff = options['diff'] self.diff_prog = options['diff_prog'] self.minimal = options['minimal'] + self.no_copyright = options['no_copyright'] # run gvim(diff) in foreground mode if self.diff_prog.startswith("gvim") and " -f" not in self.diff_prog: self.diff_prog += " -f" @@ -97,25 +98,25 @@ self.fout = sys.stdout def _load_licenses(self): - # detect all present licenses in the spec and detect if we have more - # than one. If we do put license to each subpkg - licenses = [] - filecontent = open(self.specfile) - for line in filecontent: - if self.reg.re_license.match(line): - line = line.rstrip('\n') - line = line.rstrip('\r') - line = line.rstrip() - match = self.reg.re_license.match(line) - value = match.groups()[len(match.groups()) - 1] - if not value in licenses: - licenses.append(value) - filecontent.close() - filecontent = None - if len(licenses) > 1: - self._subpkg_licenses = True - # put first license as placeholder if main preamble is missing one - self._main_license = licenses[0] + # detect all present licenses in the spec and detect if we have more + # than one. If we do put license to each subpkg + licenses = [] + filecontent = open(self.specfile) + for line in filecontent: + if self.reg.re_license.match(line): + line = line.rstrip('\n') + line = line.rstrip('\r') + line = line.rstrip() + match = self.reg.re_license.match(line) + value = match.groups()[len(match.groups()) - 1] + if value not in licenses: + licenses.append(value) + filecontent.close() + filecontent = None + if len(licenses) > 1: + self._subpkg_licenses = True + # put first license as placeholder if main preamble is missing one + self._main_license = licenses[0] def _detect_preamble_section(self, line): # This is seriously ugly but can't think of cleaner way @@ -204,7 +205,8 @@ def run(self): # We always start with Copyright - self.current_section = RpmCopyright(self.specfile, self.minimal) + self.current_section = RpmCopyright(self.specfile, self.minimal, + self.no_copyright) # FIXME: we need to store the content localy and then reorder # to maintain the specs all the same (eg somebody put diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmcopyright.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmcopyright.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmcopyright.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmcopyright.py 2016-04-29 22:12:42.000000000 +0200 @@ -14,8 +14,9 @@ that are still relevant. Everything else is ignored. """ - def __init__(self, specfile, minimal): + def __init__(self, specfile, minimal, no_copyright): Section.__init__(self, specfile, minimal) + self.no_copyright = no_copyright self.copyrights = [] self.buildrules = [] self.my_copyright = '' @@ -84,6 +85,8 @@ return def output(self, fout, newline=True, new_class=None): + if self.no_copyright: + return self._add_modelines() self._add_pkg_header() self._add_copyright() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmdescription.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmdescription.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmdescription.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmdescription.py 2016-04-29 22:12:42.000000000 +0200 @@ -29,7 +29,7 @@ if not self.previous_line or len(self.previous_line) == 0: return - if line == 'Authors:' and not self.minimal: + if (line == 'Authors:' or line == 'Author:') and not self.minimal: self.removing_authors = True return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmpreamble.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmpreamble.py 2016-04-29 22:12:42.000000000 +0200 @@ -289,11 +289,21 @@ len(self.paragraph['bconds']) > 0: self._condition_define = True self.paragraph = self._oldstore.pop(-1) - self.paragraph['conditions'].append(lines) + if isinstance(lines, str): + self.paragraph['conditions'].append(lines) + else: + self.paragraph['conditions'] += lines # If we are on endif we check the condition content # and if we find the defines we put it on top. if endif or not self.condition: + # check if we are doing the ppc64 migration and delete it + if not self.minimal and \ + isinstance(self.paragraph['conditions'][0], list) and \ + len(self.paragraph['conditions']) == 3 and \ + self.paragraph['conditions'][0][0] == '# bug437293' and \ + self.paragraph['conditions'][1].endswith('64bit'): + self.paragraph['conditions'] = [] if self._condition_define: # If we have define conditions and possible bcond start # we need to put it bellow bcond definitions as otherwise @@ -315,7 +325,7 @@ self._condition_bcond = False self.paragraph['conditions'] = [] - def _end_paragraph(self, needs_license = False): + def _end_paragraph(self, needs_license=False): lines = [] # add license to the package if missing and needed @@ -372,10 +382,11 @@ pkgname = value.split()[0] version = value.replace(pkgname, '') pkgconfig = [] - if pkgname == 'pkgconfig(pkg-config)': + if pkgname == 'pkgconfig(pkg-config)' or \ + pkgname == 'pkg-config': # If we have pkgconfig dep in pkgconfig it is nuts, replace it - return ['pkg-config{0}'.format(version)] - if pkgname not in self.pkgconfig_conversions or pkgname == 'pkg-config': + return ['pkgconfig{0}'.format(version)] + if pkgname not in self.pkgconfig_conversions: # first check if the pacakge is in the replacements return [value] else: @@ -426,8 +437,8 @@ expanded += token # Add pkg-config dep if we have in BR or R the pkgconfig(dependency) if any(item.startswith('pkgconfig(') for item in expanded) \ - and not 'pkg-config' in expanded: - expanded.append('pkg-config') + and 'pkgconfig' not in expanded: + expanded.append('pkgconfig') # and then sort them :) expanded.sort() @@ -659,7 +670,7 @@ elif self.reg.re_release.match(line): match = self.reg.re_release.match(line) value = match.group(1) - if re.search('[a-zA-Z\s]', value): + if re.search(r'[a-zA-Z\s]', value): self._add_line_value_to('release', value) else: self._add_line_value_to('release', '0') @@ -678,7 +689,7 @@ match = self.reg.re_group.match(line) value = match.group(1) if not self.minimal: - if not self.previous_line.startswith('# FIXME') and not value in self.allowed_groups: + if not self.previous_line.startswith('# FIXME') and value not in self.allowed_groups: self.current_group.append('# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"') self._add_line_value_to('group', value) return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmregexp.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmregexp.py 2016-04-29 22:12:42.000000000 +0200 @@ -91,7 +91,7 @@ re_jobs = re.compile(r'%{?(_smp_mflags|\?_smp_flags|\?jobs:\s*-j\s*%(jobs|{jobs}))}?') re_make = re.compile(r'(^|(.*\s)?)make($|(\s.*)?)') re_optflags_quotes = re.compile(r'=\s*\${?RPM_OPT_FLAGS}?\s*$') - re_optflags = re.compile('\${?RPM_OPT_FLAGS}?') + re_optflags = re.compile(r'\${?RPM_OPT_FLAGS}?') # rpmcopyright re_copyright = re.compile(r'^#\s*Copyright\ $c$\s*(.*)', re.IGNORECASE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmscriplets.py new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmscriplets.py --- old/spec-cleaner-spec-cleaner-0.8.1/spec_cleaner/rpmscriplets.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/spec_cleaner/rpmscriplets.py 2016-04-29 22:12:42.000000000 +0200 @@ -11,17 +11,18 @@ def output(self, fout, newline=True, new_class=None): if not self.minimal: - self._collapse_multiline_ldconfig(newline) + self._collapse_multiline_ldconfig() Section.output(self, fout, newline, new_class) - def _collapse_multiline_ldconfig(self, newline): - nolines = len(self.lines) - # if we have 2 or 3 lines where last one is empty - if nolines == 2 or (nolines == 3 and self.lines[2] == ''): - if self.lines[0] != '' and self.lines[1] == '': + def _collapse_multiline_ldconfig(self): + # if we have 2 lines or rest of them are empty, pop those + for i in reversed(self.lines): + if i: + break + else: self.lines.pop() - if len(self.lines) >= 2: - if self.lines[1] == '/sbin/ldconfig': - pkg = self.lines[0] - self.lines = [] - self.lines.append('{0} -p /sbin/ldconfig'.format(pkg)) + if len(self.lines) == 2: + if self.lines[1] == '/sbin/ldconfig': + pkg = self.lines[0] + self.lines = [] + self.lines.append('{0} -p /sbin/ldconfig'.format(pkg)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/acceptance-tests.py new/spec-cleaner-spec-cleaner-0.8.2/tests/acceptance-tests.py --- old/spec-cleaner-spec-cleaner-0.8.1/tests/acceptance-tests.py 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/acceptance-tests.py 2016-04-29 22:12:42.000000000 +0200 @@ -113,6 +113,7 @@ 'diff': False, 'diff_prog': 'vimdiff', 'minimal': False, + 'no_copyright': False, } self._run_individual_test(options) with open(compare) as ref, open(tmp_file) as test: @@ -127,6 +128,7 @@ 'diff': False, 'diff_prog': 'vimdiff', 'minimal': False, + 'no_copyright': False, } self._run_individual_test(options) with open(compare) as ref, open(self.tmp_file_rerun.name) as test: @@ -150,6 +152,7 @@ 'diff': False, 'diff_prog': 'vimdiff', 'minimal': True, + 'no_copyright': False, } self._run_individual_test(options) with open(compare) as ref, open(tmp_file) as test: @@ -164,12 +167,42 @@ 'diff': False, 'diff_prog': 'vimdiff', 'minimal': True, + 'no_copyright': False, } self._run_individual_test(options) with open(compare) as ref, open(self.tmp_file_rerun.name) as test: self.assertStreamEqual(ref, test) @patch('spec_cleaner.rpmcopyright.datetime') + def test_no_copyright_output(self, datetime_mock): + datetime_mock.datetime.now.return_value = ( + datetime.datetime(2013, 1, 1)) + spec_str="""%check +make check + +%changelog +""" + tmp_file = os.path.join(self.tmp_dir, "no_copyright_test.spec") + out_file = os.path.join(self.tmp_dir, "no_copyright_test_out.spec") + with open(tmp_file, "w+") as t: + t.write(spec_str) + + # first try to generate cleaned content from messed up + options = { + 'specfile': tmp_file, + 'output': out_file, + 'pkgconfig': True, + 'inline': False, + 'diff': False, + 'diff_prog': 'vimdiff', + 'minimal': True, + 'no_copyright': True, + } + self._run_individual_test(options) + with open(out_file) as ref, open(tmp_file) as test: + self.assertStreamEqual(ref, test) + + @patch('spec_cleaner.rpmcopyright.datetime') def test_inline_function(self, datetime_mock): datetime_mock.datetime.now.return_value = ( datetime.datetime(2013, 1, 1)) @@ -188,6 +221,7 @@ 'diff': False, 'diff_prog': 'vimdiff', 'minimal': False, + 'no_copyright': False, } self._run_individual_test(options) with open(compare) as ref, open(tmp_file) as test: @@ -208,6 +242,7 @@ 'diff': False, 'diff_prog': 'gvimdiff', 'minimal': False, + 'no_copyright': False, } self._run_individual_test(options) @@ -228,5 +263,6 @@ 'diff': True, 'diff_prog': 'gvimdiff', 'minimal': False, + 'no_copyright': False, } self._run_individual_test(options) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/in/description.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/in/description.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/in/description.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/in/description.spec 2016-04-29 22:12:42.000000000 +0200 @@ -17,3 +17,10 @@ * Tim Cera * Peter Funk * Jay Painter + +%description devel +Headers and another development files for TomMath library. + +Author: +-------- + Tom St Denis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/in/ldconfigscriptlets.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/in/ldconfigscriptlets.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/in/ldconfigscriptlets.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/in/ldconfigscriptlets.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,8 @@ +%post -n %{libsoname} +/sbin/ldconfig + + +%postun -n %{libsoname} +/sbin/ldconfig + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/in/ppcoldsupport.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/in/ppcoldsupport.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/in/ppcoldsupport.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/in/ppcoldsupport.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,28 @@ +%package libcap +Requires: bash +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-64bit +%endif + +%package libcap-devel +BuildRequires: pkg-config +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-64bit +%endif + +%package crazypackage +Requires: weirddep +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-32bit +%endif + +%package crazypackage2 +Requires: weirddep +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-64bit +BuildRequires: somethinghandwritten +%endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/in/rpmpreamble.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/in/rpmpreamble.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/in/rpmpreamble.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/in/rpmpreamble.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,142 @@ +# +# spec file for package rpmpreamble +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2010,2011,2012 Stephan Kleine +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%global libmicrohttpd libmicrohttpd12 +Name: libmicrohttpd +Version: 0.9.49 +Release: 0 +Summary: Small Embeddable HTTP Server Library +License: LGPL-2.1+ +Group: Productivity/Networking/Web/Servers +Url: https://www.gnu.org/software/libmicrohttpd/ +Source0: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz +Source1: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig +Source2: libmicrohttpd.keyring +# PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS) +Patch1: disable-stalling-test.patch +Patch2: libmicrohttpd_test_data.patch +BuildRequires: curl +BuildRequires: file-devel +BuildRequires: libgcrypt-devel >= 1.2.4 +BuildRequires: libtool +BuildRequires: makeinfo +BuildRequires: openssl-devel +BuildRequires: pkg-config +BuildRequires: socat +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libtasn1) +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +GNU libmicrohttpd is a small C library that is supposed to make it easy to run +an HTTP server as part of another application. GNU libmicrohttpd is free software +and part of the GNU project. Key features that distinguish libmicrohttpd from +other projects are: + + * C library: fast and small + * API is simple, expressive and fully reentrant + * Implementation is http 1.1 compliant + * HTTP server can listen on multiple ports + * Support for IPv6 + * Support for incremental processing of POST data + * Creates binary of only 30k (without TLS/SSL support) + * Three different threading models + * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, + Symbian and z/OS + * Optional support for SSL3 and TLS (requires libgcrypt) + +libmicrohttpd was started because the author needed an easy way to add a concurrent +HTTP server to other projects. Existing alternatives were either non-free, not +reentrant, standalone, of terrible code quality or a combination thereof. Do not +use libmicrohttpd if you are looking for a standalone http server, there are many +other projects out there that provide that kind of functionality already. However, +if you want to be able to serve simple WWW pages from within your C or C++ +application, check it out. + +%package -n %{libmicrohttpd} +Summary: Small embeddable http server library +Group: System/Libraries + +%description -n %{libmicrohttpd} +Shared library for %{name} (%{summary}). + +%package devel +Summary: Small Embeddable HTTP Server Library +Group: Development/Libraries/C and C++ +Requires: %{libmicrohttpd} = %{version} +Requires: pkg-config +Requires: pkgconfig(gnutls) +Requires(post): info +Requires(preun): info + +%description devel +Headers, pkg-config files, so link and other development files for %{name} +(%{summary}). + +%prep +%setup -q +%patch1 +%patch2 + +%build +%configure \ + --enable-bauth \ + --enable-dauth \ + --enable-epoll \ + --enable-messages \ + --enable-postprocessor \ + --enable-https \ + --disable-static \ + --disable-examples \ + --enable-curl +make %{?_smp_mflags} + +%install +make %{?_smp_mflags} DESTDIR=%{buildroot} install +find %{buildroot} -type f -name "*.la" -delete -print + +%check +# Paralel execution of tests fail +make -j 1 check + +%post -n %{libmicrohttpd} -p /sbin/ldconfig +%postun -n %{libmicrohttpd} -p /sbin/ldconfig +%post devel +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} + +%preun devel +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} + +%files -n %{libmicrohttpd} +%defattr(-,root,root) +%{_libdir}/%{name}.so.* + +%files devel +%defattr(-,root,root) +%doc ChangeLog +%{_includedir}/microhttpd.h +%{_libdir}/%{name}.so +%{_libdir}/pkgconfig/%{name}.pc +%{_infodir}/%{name}*.info%{ext_info} +%{_mandir}/man3/%{name}.3%{ext_man} + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/bracketdeps.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/bracketdeps.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/bracketdeps.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/bracketdeps.spec 2016-04-29 22:12:42.000000000 +0200 @@ -18,7 +18,7 @@ BuildRequires: cbla-devel BuildRequires: perl-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: rocket-devel BuildRequires: something-devel BuildRequires: cmake(bla) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/conditions.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/conditions.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/conditions.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/conditions.spec 2016-04-29 22:12:42.000000000 +0200 @@ -25,7 +25,7 @@ Source1: apparmor-%{version}.tar.gz.asc Source2: %{name}.keyring BuildRequires: bbb -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python Requires: insserv BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/depredux.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/depredux.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/depredux.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/depredux.spec 2016-04-29 22:12:42.000000000 +0200 @@ -19,7 +19,7 @@ Name: depredux # comment one # comment two -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libva) %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/description.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/description.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/description.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/description.spec 2016-04-29 22:12:42.000000000 +0200 @@ -25,4 +25,7 @@ also includes support for CvsGraph -- a program to graphically display the revision trees and branches. +%description devel +Headers and another development files for TomMath library. + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/interestingheader.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/interestingheader.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/interestingheader.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/interestingheader.spec 2016-04-29 22:12:42.000000000 +0200 @@ -31,7 +31,7 @@ BuildRequires: autoconf BuildRequires: gcc-c++ BuildRequires: libircclient-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(fftw3f) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/ldconfigscriptlets.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/ldconfigscriptlets.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/ldconfigscriptlets.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/ldconfigscriptlets.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,22 @@ +# +# spec file for package ldconfigscriptlets +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%post -n %{libsoname} -p /sbin/ldconfig +%postun -n %{libsoname} -p /sbin/ldconfig + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconf.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconf.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconf.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconf.spec 2016-04-29 22:12:42.000000000 +0200 @@ -16,7 +16,7 @@ # -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libiodbc) BuildRequires: pkgconfig(xxf86vm) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconfigdeps.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconfigdeps.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconfigdeps.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconfigdeps.spec 2016-04-29 22:12:42.000000000 +0200 @@ -17,7 +17,7 @@ BuildRequires: gtk2 -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(gail) >= 2.13 BuildRequires: pkgconfig(gdk-2.0) >= 2.13 BuildRequires: pkgconfig(gdk-x11-2.0) >= 2.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconfrequires.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconfrequires.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/pkgconfrequires.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/pkgconfrequires.spec 2016-04-29 22:12:42.000000000 +0200 @@ -16,9 +16,9 @@ # -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(blabla) -Requires: pkg-config +Requires: pkgconfig Requires: pkgconfig(blabla) %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/ppcoldsupport.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/ppcoldsupport.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/ppcoldsupport.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/ppcoldsupport.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,40 @@ +# +# spec file for package ppcoldsupport +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%package libcap +Requires: bash + +%package libcap-devel +BuildRequires: pkgconfig + +%package crazypackage +Requires: weirddep +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-32bit +%endif + +%package crazypackage2 +Requires: weirddep +# bug437293 +%ifarch ppc64 +BuildRequires: somethinghandwritten +Obsoletes: libcap-devel-64bit +%endif + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/requires.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/requires.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/requires.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/requires.spec 2016-04-29 22:12:42.000000000 +0200 @@ -33,7 +33,7 @@ Requires: jjj > %{version} Requires: kkk Requires: php5 >= %{phpversion} -Requires: pkg-config +Requires: pkgconfig Requires: rrr >= %{version} Requires: zzz Requires: perl(DBD::SQLite) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out/rpmpreamble.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out/rpmpreamble.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out/rpmpreamble.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out/rpmpreamble.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,142 @@ +# +# spec file for package rpmpreamble +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2010,2011,2012 Stephan Kleine +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%global libmicrohttpd libmicrohttpd12 +Name: libmicrohttpd +Version: 0.9.49 +Release: 0 +Summary: Small Embeddable HTTP Server Library +License: LGPL-2.1+ +Group: Productivity/Networking/Web/Servers +Url: https://www.gnu.org/software/libmicrohttpd/ +Source0: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz +Source1: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig +Source2: libmicrohttpd.keyring +# PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS) +Patch1: disable-stalling-test.patch +Patch2: libmicrohttpd_test_data.patch +BuildRequires: curl +BuildRequires: file-devel +BuildRequires: libgcrypt-devel >= 1.2.4 +BuildRequires: libtool +BuildRequires: makeinfo +BuildRequires: openssl-devel +BuildRequires: pkgconfig +BuildRequires: socat +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libtasn1) +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +GNU libmicrohttpd is a small C library that is supposed to make it easy to run +an HTTP server as part of another application. GNU libmicrohttpd is free software +and part of the GNU project. Key features that distinguish libmicrohttpd from +other projects are: + + * C library: fast and small + * API is simple, expressive and fully reentrant + * Implementation is http 1.1 compliant + * HTTP server can listen on multiple ports + * Support for IPv6 + * Support for incremental processing of POST data + * Creates binary of only 30k (without TLS/SSL support) + * Three different threading models + * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, + Symbian and z/OS + * Optional support for SSL3 and TLS (requires libgcrypt) + +libmicrohttpd was started because the author needed an easy way to add a concurrent +HTTP server to other projects. Existing alternatives were either non-free, not +reentrant, standalone, of terrible code quality or a combination thereof. Do not +use libmicrohttpd if you are looking for a standalone http server, there are many +other projects out there that provide that kind of functionality already. However, +if you want to be able to serve simple WWW pages from within your C or C++ +application, check it out. + +%package -n %{libmicrohttpd} +Summary: Small embeddable http server library +Group: System/Libraries + +%description -n %{libmicrohttpd} +Shared library for %{name} (%{summary}). + +%package devel +Summary: Small Embeddable HTTP Server Library +Group: Development/Libraries/C and C++ +Requires: %{libmicrohttpd} = %{version} +Requires: pkgconfig +Requires: pkgconfig(gnutls) +Requires(post): info +Requires(preun): info + +%description devel +Headers, pkg-config files, so link and other development files for %{name} +(%{summary}). + +%prep +%setup -q +%patch1 +%patch2 + +%build +%configure \ + --enable-bauth \ + --enable-dauth \ + --enable-epoll \ + --enable-messages \ + --enable-postprocessor \ + --enable-https \ + --disable-static \ + --disable-examples \ + --enable-curl +make %{?_smp_mflags} + +%install +make %{?_smp_mflags} DESTDIR=%{buildroot} install +find %{buildroot} -type f -name "*.la" -delete -print + +%check +# Paralel execution of tests fail +make -j 1 check + +%post -n %{libmicrohttpd} -p /sbin/ldconfig +%postun -n %{libmicrohttpd} -p /sbin/ldconfig +%post devel +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} + +%preun devel +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} + +%files -n %{libmicrohttpd} +%defattr(-,root,root) +%{_libdir}/%{name}.so.* + +%files devel +%defattr(-,root,root) +%doc ChangeLog +%{_includedir}/microhttpd.h +%{_libdir}/%{name}.so +%{_libdir}/pkgconfig/%{name}.pc +%{_infodir}/%{name}*.info%{ext_info} +%{_mandir}/man3/%{name}.3%{ext_man} + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/bracketdeps.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/bracketdeps.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/bracketdeps.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/bracketdeps.spec 2016-04-29 22:12:42.000000000 +0200 @@ -18,7 +18,7 @@ BuildRequires: cbla-devel BuildRequires: perl-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: rocket-devel BuildRequires: something-devel BuildRequires: cmake(bla) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/conditions.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/conditions.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/conditions.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/conditions.spec 2016-04-29 22:12:42.000000000 +0200 @@ -25,7 +25,7 @@ Source1: apparmor-%{version}.tar.gz.asc Source2: %{name}.keyring BuildRequires: bbb -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python Requires: insserv BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/depredux.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/depredux.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/depredux.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/depredux.spec 2016-04-29 22:12:42.000000000 +0200 @@ -19,7 +19,7 @@ Name: depredux # comment one # comment two -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libva) %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/description.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/description.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/description.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/description.spec 2016-04-29 22:12:42.000000000 +0200 @@ -34,4 +34,11 @@ * Peter Funk * Jay Painter +%description devel +Headers and another development files for TomMath library. + +Author: +-------- + Tom St Denis + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/interestingheader.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/interestingheader.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/interestingheader.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/interestingheader.spec 2016-04-29 22:12:42.000000000 +0200 @@ -31,7 +31,7 @@ BuildRequires: autoconf BuildRequires: gcc-c++ BuildRequires: libircclient-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(fftw3f) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/ldconfigscriptlets.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/ldconfigscriptlets.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/ldconfigscriptlets.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/ldconfigscriptlets.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,27 @@ +# +# spec file for package ldconfigscriptlets +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%post -n %{libsoname} +/sbin/ldconfig + + +%postun -n %{libsoname} +/sbin/ldconfig + + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconf.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconf.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconf.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconf.spec 2016-04-29 22:12:42.000000000 +0200 @@ -16,7 +16,7 @@ # -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libiodbc) BuildRequires: pkgconfig(xxf86vm) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconfigdeps.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconfigdeps.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconfigdeps.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconfigdeps.spec 2016-04-29 22:12:42.000000000 +0200 @@ -17,7 +17,7 @@ BuildRequires: gtk2 -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(gail) >= 2.13 BuildRequires: pkgconfig(gdk-2.0) >= 2.13 BuildRequires: pkgconfig(gdk-x11-2.0) >= 2.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconfrequires.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconfrequires.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/pkgconfrequires.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/pkgconfrequires.spec 2016-04-29 22:12:42.000000000 +0200 @@ -16,9 +16,9 @@ # -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(blabla) -Requires: pkg-config +Requires: pkgconfig Requires: pkgconfig(blabla) %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/ppcoldsupport.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/ppcoldsupport.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/ppcoldsupport.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/ppcoldsupport.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,48 @@ +# +# spec file for package ppcoldsupport +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%package libcap +Requires: bash +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-64bit +%endif + +%package libcap-devel +BuildRequires: pkgconfig +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-64bit +%endif + +%package crazypackage +Requires: weirddep +# bug437293 +%ifarch ppc64 +Obsoletes: libcap-devel-32bit +%endif + +%package crazypackage2 +Requires: weirddep +# bug437293 +%ifarch ppc64 +BuildRequires: somethinghandwritten +Obsoletes: libcap-devel-64bit +%endif + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/requires.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/requires.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/requires.spec 2016-04-14 21:24:35.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/requires.spec 2016-04-29 22:12:42.000000000 +0200 @@ -33,7 +33,7 @@ Requires: jjj > %{version} Requires: kkk Requires: php5 >= %{phpversion} -Requires: pkg-config +Requires: pkgconfig Requires: rrr >= %{version} Requires: zzz Requires: perl(DBD::SQLite) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/rpmpreamble.spec new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/rpmpreamble.spec --- old/spec-cleaner-spec-cleaner-0.8.1/tests/out-minimal/rpmpreamble.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.8.2/tests/out-minimal/rpmpreamble.spec 2016-04-29 22:12:42.000000000 +0200 @@ -0,0 +1,142 @@ +# +# spec file for package rpmpreamble +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2010,2011,2012 Stephan Kleine +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%global libmicrohttpd libmicrohttpd12 +Name: libmicrohttpd +Version: 0.9.49 +Release: 0 +Summary: Small Embeddable HTTP Server Library +License: LGPL-2.1+ +Group: Productivity/Networking/Web/Servers +Url: https://www.gnu.org/software/libmicrohttpd/ +Source0: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz +Source1: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig +Source2: libmicrohttpd.keyring +# PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS) +Patch1: disable-stalling-test.patch +Patch2: libmicrohttpd_test_data.patch +BuildRequires: curl +BuildRequires: file-devel +BuildRequires: libgcrypt-devel >= 1.2.4 +BuildRequires: libtool +BuildRequires: makeinfo +BuildRequires: openssl-devel +BuildRequires: pkgconfig +BuildRequires: socat +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libtasn1) +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +GNU libmicrohttpd is a small C library that is supposed to make it easy to run +an HTTP server as part of another application. GNU libmicrohttpd is free software +and part of the GNU project. Key features that distinguish libmicrohttpd from +other projects are: + + * C library: fast and small + * API is simple, expressive and fully reentrant + * Implementation is http 1.1 compliant + * HTTP server can listen on multiple ports + * Support for IPv6 + * Support for incremental processing of POST data + * Creates binary of only 30k (without TLS/SSL support) + * Three different threading models + * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, + Symbian and z/OS + * Optional support for SSL3 and TLS (requires libgcrypt) + +libmicrohttpd was started because the author needed an easy way to add a concurrent +HTTP server to other projects. Existing alternatives were either non-free, not +reentrant, standalone, of terrible code quality or a combination thereof. Do not +use libmicrohttpd if you are looking for a standalone http server, there are many +other projects out there that provide that kind of functionality already. However, +if you want to be able to serve simple WWW pages from within your C or C++ +application, check it out. + +%package -n %{libmicrohttpd} +Summary: Small embeddable http server library +Group: System/Libraries + +%description -n %{libmicrohttpd} +Shared library for %{name} (%{summary}). + +%package devel +Summary: Small Embeddable HTTP Server Library +Group: Development/Libraries/C and C++ +Requires: %{libmicrohttpd} = %{version} +Requires: pkgconfig +Requires: pkgconfig(gnutls) +Requires(post): info +Requires(preun): info + +%description devel +Headers, pkg-config files, so link and other development files for %{name} +(%{summary}). + +%prep +%setup -q +%patch1 +%patch2 + +%build +%configure \ + --enable-bauth \ + --enable-dauth \ + --enable-epoll \ + --enable-messages \ + --enable-postprocessor \ + --enable-https \ + --disable-static \ + --disable-examples \ + --enable-curl +make %{?_smp_mflags} + +%install +make %{?_smp_mflags} DESTDIR=%{buildroot} install +find %{buildroot} -type f -name "*.la" -delete -print + +%check +# Paralel execution of tests fail +make -j 1 check + +%post -n %{libmicrohttpd} -p /sbin/ldconfig +%postun -n %{libmicrohttpd} -p /sbin/ldconfig +%post devel +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} + +%preun devel +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} + +%files -n %{libmicrohttpd} +%defattr(-,root,root) +%{_libdir}/%{name}.so.* + +%files devel +%defattr(-,root,root) +%doc ChangeLog +%{_includedir}/microhttpd.h +%{_libdir}/%{name}.so +%{_libdir}/pkgconfig/%{name}.pc +%{_infodir}/%{name}*.info%{ext_info} +%{_mandir}/man3/%{name}.3%{ext_man} + +%changelog ++++++ spec-cleaner.dsc ++++++ --- /var/tmp/diff_new_pack.n5T93r/_old 2016-05-02 10:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.n5T93r/_new 2016-05-02 10:44:58.000000000 +0200 @@ -1,6 +1,6 @@ Format: 3.0 (quilt) Source: spec-cleaner -Version: 0.8.1-1 +Version: 0.8.2-1 Binary: spec-cleaner Maintainer: Přemysl Janouch <pjanouch(a)suse.com> Architecture: all

1 0