From 25303094976f3f9f890124ff231d0ccf458fe042 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Tue, 1 Oct 2013 17:01:33 +0200 Subject: [PATCH 01/16] libcomps-0.1.4-1 --- .gitignore | 2 ++ libcomps.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d5fa528..25261e4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /libcomps-d28ab081062357e38b1f6c0f3c5958e818dd9d41.tar.gz /libcomps-6307666529da570efd61599c276909a23e934df0.tar.gz /libcomps-698ae33fa595d20b937839ce875495773b4482bb.tar.gz +/libcomps-706260866c0d2d5f48992d2140b96bf9f2b2a988.tar.gz +/libcomps-6c04e1caf6873713f23502b7bcfbf0b167f9a003.tar.gz diff --git a/libcomps.spec b/libcomps.spec index a2171dd..538c885 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,8 +1,8 @@ -%global commit 698ae33fa595d20b937839ce875495773b4482bb +%global commit 6c04e1caf6873713f23502b7bcfbf0b167f9a003 Name: libcomps -Version: 0.1.3 -Release: 6%{?dist} +Version: 0.1.4 +Release: 1%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries @@ -116,8 +116,14 @@ rm -rf $buildroot %changelog -* Tue Sep 17 2013 Jindrich Luza 0.1.3.git698ae33 -- release bump +* Tue Oct 01 2013 Jindrich Luza 0.1.4.git6c04e1c +- changelog fixed + +* Tue Oct 01 2013 Jindrich Luza 0.1.4 +- added missing files +- added missing files +- version bumped. Python bindings is now easier. +- architectural redesign finished - fixed #1003986 by Gustavo Luiz Duarte guidelines (but not tested on ppc) - fixed bug #1000449 - fixed bug #1000442 diff --git a/sources b/sources index d310fb4..634ae31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e62d61efeecb3c57fedc5f142ff75a1 libcomps-698ae33fa595d20b937839ce875495773b4482bb.tar.gz +09174a5f2e6ad430aec172b38f58641f libcomps-6c04e1caf6873713f23502b7bcfbf0b167f9a003.tar.gz From 802c638c9a74ccf225a9fef6d43819f326081478 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Mon, 7 Oct 2013 14:41:00 +0200 Subject: [PATCH 02/16] - 0.4.1-2 build --- .gitignore | 1 + libcomps.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 25261e4..b07d5ee 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /libcomps-698ae33fa595d20b937839ce875495773b4482bb.tar.gz /libcomps-706260866c0d2d5f48992d2140b96bf9f2b2a988.tar.gz /libcomps-6c04e1caf6873713f23502b7bcfbf0b167f9a003.tar.gz +/libcomps-6fa3d286dc144078095cb3595a757e42283086d4.tar.gz diff --git a/libcomps.spec b/libcomps.spec index 538c885..aeac76e 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -2,7 +2,7 @@ Name: libcomps Version: 0.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries diff --git a/sources b/sources index 634ae31..ec01b09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09174a5f2e6ad430aec172b38f58641f libcomps-6c04e1caf6873713f23502b7bcfbf0b167f9a003.tar.gz +80ea7b447908ab96fd179f4c8f29f715 libcomps-6fa3d286dc144078095cb3595a757e42283086d4.tar.gz From b5d67b5d04634500829b9f3a110d409a48a1cd7b Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Mon, 7 Oct 2013 14:53:37 +0200 Subject: [PATCH 03/16] - spec fixed --- libcomps.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libcomps.spec b/libcomps.spec index aeac76e..c41645c 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,4 +1,4 @@ -%global commit 6c04e1caf6873713f23502b7bcfbf0b167f9a003 +%global commit 6fa3d286dc144078095cb3595a757e42283086d4 Name: libcomps Version: 0.1.4 @@ -116,8 +116,11 @@ rm -rf $buildroot %changelog -* Tue Oct 01 2013 Jindrich Luza 0.1.4.git6c04e1c -- changelog fixed +* Fri Oct 04 2013 Jindrich Luza 0.1.4.git6fa3d28 +- fixed PyCOMPSDict_print +- - fixed PyCOMPSGroup_print +- - fixed PyCOMPSCategory_print +- - fixed PyCOMPSEnv_print * Tue Oct 01 2013 Jindrich Luza 0.1.4 - added missing files From 2d610cc2a451192a703c4ebdec03673d35de1380 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Tue, 22 Oct 2013 13:21:43 +0200 Subject: [PATCH 04/16] - PyCOMPSDict.get() throwing KeyError exception fixed --- .gitignore | 1 + libcomps.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b07d5ee..f9566dc 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /libcomps-706260866c0d2d5f48992d2140b96bf9f2b2a988.tar.gz /libcomps-6c04e1caf6873713f23502b7bcfbf0b167f9a003.tar.gz /libcomps-6fa3d286dc144078095cb3595a757e42283086d4.tar.gz +/libcomps-3b262476abc6b599b75706156180f2a3c0b36a47.tar.gz diff --git a/libcomps.spec b/libcomps.spec index c41645c..f40a5c4 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,8 +1,8 @@ -%global commit 6fa3d286dc144078095cb3595a757e42283086d4 +%global commit 3b262476abc6b599b75706156180f2a3c0b36a47 Name: libcomps Version: 0.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries @@ -116,11 +116,11 @@ rm -rf $buildroot %changelog -* Fri Oct 04 2013 Jindrich Luza 0.1.4.git6fa3d28 -- fixed PyCOMPSDict_print -- - fixed PyCOMPSGroup_print -- - fixed PyCOMPSCategory_print -- - fixed PyCOMPSEnv_print +* Tue Oct 22 2013 Jindrich Luza 0.1.5.git3b26247 +- release bumped to libcomps-0.1.4-3 + +* Tue Oct 08 2013 Jindrich Luza 0.1.5 +- version bump * Tue Oct 01 2013 Jindrich Luza 0.1.4 - added missing files diff --git a/sources b/sources index ec01b09..ee7a904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80ea7b447908ab96fd179f4c8f29f715 libcomps-6fa3d286dc144078095cb3595a757e42283086d4.tar.gz +51af4bfa44bb0b34fea92322e9d9faa0 libcomps-3b262476abc6b599b75706156180f2a3c0b36a47.tar.gz From f01b741ed6e7d91b87b9bb7ea762c73b5d685cb5 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Wed, 23 Oct 2013 16:46:29 +0200 Subject: [PATCH 05/16] - group.uservisible is true by default now. --- .gitignore | 1 + libcomps.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f9566dc..0306216 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /libcomps-6c04e1caf6873713f23502b7bcfbf0b167f9a003.tar.gz /libcomps-6fa3d286dc144078095cb3595a757e42283086d4.tar.gz /libcomps-3b262476abc6b599b75706156180f2a3c0b36a47.tar.gz +/libcomps-2c56e049c2b01af0127b6b0a86ef55125b7721f5.tar.gz diff --git a/libcomps.spec b/libcomps.spec index f40a5c4..c1862b7 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,8 +1,8 @@ -%global commit 3b262476abc6b599b75706156180f2a3c0b36a47 +%global commit 2c56e049c2b01af0127b6b0a86ef55125b7721f5 Name: libcomps Version: 0.1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries @@ -116,11 +116,11 @@ rm -rf $buildroot %changelog -* Tue Oct 22 2013 Jindrich Luza 0.1.5.git3b26247 -- release bumped to libcomps-0.1.4-3 +* Wed Oct 23 2013 Jindrich Luza 0.1.4-4 +- group.uservisible is true by default now. -* Tue Oct 08 2013 Jindrich Luza 0.1.5 -- version bump +* Wed Oct 22 2013 Jindrich Luza 0.1.4-4 +- PyCOMPSDict.get() throwing KeyError exception fixed * Tue Oct 01 2013 Jindrich Luza 0.1.4 - added missing files diff --git a/sources b/sources index ee7a904..0222db9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51af4bfa44bb0b34fea92322e9d9faa0 libcomps-3b262476abc6b599b75706156180f2a3c0b36a47.tar.gz +08271d1a5f074f4c73312a4652d7f639 libcomps-2c56e049c2b01af0127b6b0a86ef55125b7721f5.tar.gz From da123f9b9800bf8d898a721fd4b34ad85ba91d2c Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Tue, 3 Dec 2013 13:34:12 +0100 Subject: [PATCH 06/16] - libcomps-0.1.5 --- .gitignore | 1 + libcomps.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0306216..7975f2f 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /libcomps-6fa3d286dc144078095cb3595a757e42283086d4.tar.gz /libcomps-3b262476abc6b599b75706156180f2a3c0b36a47.tar.gz /libcomps-2c56e049c2b01af0127b6b0a86ef55125b7721f5.tar.gz +/libcomps-e77f33d2b87eb55c37a94777d1909076589ca6a7.tar.gz diff --git a/libcomps.spec b/libcomps.spec index c1862b7..b182cff 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,8 +1,8 @@ -%global commit 2c56e049c2b01af0127b6b0a86ef55125b7721f5 +%global commit e77f33d2b87eb55c37a94777d1909076589ca6a7 Name: libcomps -Version: 0.1.4 -Release: 4%{?dist} +Version: 0.1.5 +Release: 1%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries @@ -116,11 +116,14 @@ rm -rf $buildroot %changelog +* Tue Dec 03 2013 Jindrich Luza 0.1.5.gite77f33d +- dict.get() exception error fixed + * Wed Oct 23 2013 Jindrich Luza 0.1.4-4 - group.uservisible is true by default now. -* Wed Oct 22 2013 Jindrich Luza 0.1.4-4 -- PyCOMPSDict.get() throwing KeyError exception fixed +* Tue Oct 08 2013 Jindrich Luza 0.1.5 +- version bump * Tue Oct 01 2013 Jindrich Luza 0.1.4 - added missing files diff --git a/sources b/sources index 0222db9..a957021 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08271d1a5f074f4c73312a4652d7f639 libcomps-2c56e049c2b01af0127b6b0a86ef55125b7721f5.tar.gz +b16024a7bd7d2c63f632fe688ee716a8 libcomps-e77f33d2b87eb55c37a94777d1909076589ca6a7.tar.gz From 20871b60e3ea02b1cdca9277e9f4647c620fab53 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Tue, 21 Jan 2014 15:22:32 +0100 Subject: [PATCH 07/16] - libcomps-0.1.6.1 --- .gitignore | 1 + libcomps.spec | 61 ++++++++++++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 43 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 7975f2f..bc11391 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /libcomps-3b262476abc6b599b75706156180f2a3c0b36a47.tar.gz /libcomps-2c56e049c2b01af0127b6b0a86ef55125b7721f5.tar.gz /libcomps-e77f33d2b87eb55c37a94777d1909076589ca6a7.tar.gz +/libcomps-89e74eac90c9c1734158e00b397718cb325fe511.tar.gz diff --git a/libcomps.spec b/libcomps.spec index b182cff..556e44d 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,7 +1,7 @@ -%global commit e77f33d2b87eb55c37a94777d1909076589ca6a7 +%global commit 89e74eac90c9c1734158e00b397718cb325fe511 Name: libcomps -Version: 0.1.5 +Version: 0.1.6 Release: 1%{?dist} Summary: Comps XML file manipulation library @@ -24,7 +24,7 @@ comps XML files. Supports read/write XML file, structure(s) modification. %package doc Summary: Documentation files for libcomps library -Group: Development/Libraries +Group: Documentation Requires: %{name} = %{version}-%{release} BuildArch: noarch BuildRequires: doxygen @@ -32,6 +32,16 @@ BuildRequires: doxygen %description doc Documentation files for libcomps library +%package -n python-libcomps-doc +Summary: Documentation files for python bindings libcomps library +Group: Documentation +Requires: %{name} = %{version}-%{release} +BuildArch: noarch +BuildRequires: python-sphinx + +%description -n python-libcomps-doc +Documentation files for python bindings libcomps library + %package devel Summary: Development files for libcomps library Group: Development/Libraries @@ -71,16 +81,19 @@ mv ../py3 ./ %cmake -DPYTHON_DESIRED:STRING=2 libcomps/ make %{?_smp_mflags} make %{?_smp_mflags} docs +make %{?_smp_mflags} pydocs pushd py3 %cmake -DPYTHON_DESIRED:STRING=3 libcomps/ make %{?_smp_mflags} -make %{?_smp_mflags} docs popd -%check devel - make test +%check +make test +pushd py3 +make pytest +popd %install make install DESTDIR=%{buildroot} @@ -106,6 +119,9 @@ rm -rf $buildroot %files doc %doc docs/libcomps-doc/html +%files -n python-libcomps-doc +%doc src/python/docs/html + %files -n python-libcomps %{_libdir}/python2* %exclude %{_libdir}/python2/libcomps/__pycache__ @@ -116,25 +132,31 @@ rm -rf $buildroot %changelog -* Tue Dec 03 2013 Jindrich Luza 0.1.5.gite77f33d -- dict.get() exception error fixed - * Wed Oct 23 2013 Jindrich Luza 0.1.4-4 - group.uservisible is true by default now. +- fixed comps_mobjradix parent node problem +- implemented bindings for blacklist, whiteout and langpacks +- COMPS_Logger redesigned * Tue Oct 08 2013 Jindrich Luza 0.1.5 - version bump +- PyCOMPS_Sequence.__getitem__["objectid"] implemented for libcomps.GroupList, libcomps.CategoryList, libcomps.EnvList +- added missing files +- missing display_order fix for libcomps.Environment * Tue Oct 01 2013 Jindrich Luza 0.1.4 - added missing files -- added missing files -- version bumped. Python bindings is now easier. - architectural redesign finished - fixed #1003986 by Gustavo Luiz Duarte guidelines (but not tested on ppc) - fixed bug #1000449 - fixed bug #1000442 - added GroupId.default test - some minor unreported bugs discovered during testing fixed +- finished default attribute support in groupid object +- Comps.get_last_parse_errors and Comps.get_last_parse_log has been renamed +- as Comps.get_last_errors and Comps.get_last_log +- version bumped. Python bindings is now easier. +- added missing files * Tue Aug 20 2013 Jindrich Luza 0.1.3 - finished default attribute support in groupid object @@ -146,10 +168,17 @@ rm -rf $buildroot * Thu Jul 18 2013 Jindrich Luza 0.1.2 - automatic changelog system +- improved integrated tests +- prop system complete +- fixed issue 1 +- fixed issue 3 +- added support +- new prop system in progress.... +- separated doc package +- some minor fixes in CMakeFiles - fixed issue #14 - libcomps.Dict is now behave more like python dict. Implemented iter(libcomps.Dict) - libcomps.iteritems() and libcomps.itervalues() -- added support - remaked error reporting system. - libcomps.Comps.fromxml_f and libcomps.Comps.fromxml_str now return - -1, 0 or 1. 0 means parse procedure completed without any problem, @@ -160,15 +189,7 @@ rm -rf $buildroot - libcomps.Comps.get_last_parse_errors - all log is given by - libcomps.Comps.get_last_parse_log -- improved integrated tests -- prop system complete -- fixed issue 1 -- fixed issue 3 -- new prop system in progress.... -- separated doc package -- some minor fixes in CMakeFiles * Tue Jun 25 2013 Jindrich Luza 0.1.1-1 - Automatic commit of package [libcomps] release [0.1.1-1]. - diff --git a/sources b/sources index a957021..bd79de0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b16024a7bd7d2c63f632fe688ee716a8 libcomps-e77f33d2b87eb55c37a94777d1909076589ca6a7.tar.gz +070d1d9df4c2a7eea65060005fc04233 libcomps-89e74eac90c9c1734158e00b397718cb325fe511.tar.gz From f452dc24806bf7d1715503fd47d104b097a19c91 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Wed, 29 Jan 2014 12:30:44 +0100 Subject: [PATCH 08/16] - changelog fixed - so version fixed --- .gitignore | 1 + libcomps.spec | 55 +++++++++++++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index bc11391..eb53e51 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /libcomps-2c56e049c2b01af0127b6b0a86ef55125b7721f5.tar.gz /libcomps-e77f33d2b87eb55c37a94777d1909076589ca6a7.tar.gz /libcomps-89e74eac90c9c1734158e00b397718cb325fe511.tar.gz +/libcomps-b098d1b7dc00951490b262b533df7af2103bd4d4.tar.gz diff --git a/libcomps.spec b/libcomps.spec index 556e44d..6184f2c 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,8 +1,8 @@ -%global commit 89e74eac90c9c1734158e00b397718cb325fe511 +%global commit b098d1b7dc00951490b262b533df7af2103bd4d4 Name: libcomps Version: 0.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries @@ -132,6 +132,41 @@ rm -rf $buildroot %changelog +* Wed Jan 29 2014 Jindrich Luza 0.1.6 +- version bumped +- added libcomps.MDict.keys() +- libcomps.MDict.values() +- libcomps.MDict.items() +- libcomps.MDict.clear() +- libcomps.MDict.update() +- libcomps.MDict.copy() +- COMPS_List replaced with COMPS_HSList +- added missing basearchonly to DocGroupPackage +- python3/CMakeLists.txt fixed +- added explicit attributes support for xml options +- added arch_filter test for python +- insert method in libcomps.Sequence +- Unioning is now accomplished with replace x append policy +- Weaker package equality check (comparing only name now) +- Fixed leeks in unioning +- modified test_merge_comps test_libcomps +- dictionaries are now storing keys in alphabetical order +- comps parser redesigned +- change python/tests directory composition +- added elem attributes check in parser +- xml output '_arch' attribute support +- parser and xml output defaults options for specify defaults values +- comps object validation in python +- added validity checker before append/set object to list (python only) +- .validate() method +- added libcomps.Dict.keys +- libcomps.Dict.values +- libcomps.Dict.items +- libcomps.Dict.clear +- libcomps.Dict.update +- libcomps.Dict.copy +- added xml output options (comps.xml_str([options = {}]), comps.xml_f(options = {})) + * Wed Oct 23 2013 Jindrich Luza 0.1.4-4 - group.uservisible is true by default now. - fixed comps_mobjradix parent node problem @@ -168,14 +203,6 @@ rm -rf $buildroot * Thu Jul 18 2013 Jindrich Luza 0.1.2 - automatic changelog system -- improved integrated tests -- prop system complete -- fixed issue 1 -- fixed issue 3 -- added support -- new prop system in progress.... -- separated doc package -- some minor fixes in CMakeFiles - fixed issue #14 - libcomps.Dict is now behave more like python dict. Implemented iter(libcomps.Dict) - libcomps.iteritems() and libcomps.itervalues() @@ -189,6 +216,14 @@ rm -rf $buildroot - libcomps.Comps.get_last_parse_errors - all log is given by - libcomps.Comps.get_last_parse_log +- prop system complete +- fixed issue 1 +- fixed issue 3 +- added support +- new prop system in progress.... +- separated doc package +- some minor fixes in CMakeFiles +- improved integrated tests * Tue Jun 25 2013 Jindrich Luza 0.1.1-1 - Automatic commit of package [libcomps] release [0.1.1-1]. diff --git a/sources b/sources index bd79de0..8c68692 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -070d1d9df4c2a7eea65060005fc04233 libcomps-89e74eac90c9c1734158e00b397718cb325fe511.tar.gz +f5a5c8cb0fcb88cc12705a6ff81d0a54 libcomps-b098d1b7dc00951490b262b533df7af2103bd4d4.tar.gz From 0014dc12168700417111de7c182b9f674122b022 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Thu, 27 Feb 2014 12:03:50 +0100 Subject: [PATCH 09/16] - '_arch' attribute change to 'arch' - empty 'arch' attribute will be ommited from output from now --- .gitignore | 1 + libcomps.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eb53e51..4be9c23 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /libcomps-e77f33d2b87eb55c37a94777d1909076589ca6a7.tar.gz /libcomps-89e74eac90c9c1734158e00b397718cb325fe511.tar.gz /libcomps-b098d1b7dc00951490b262b533df7af2103bd4d4.tar.gz +/libcomps-01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6.tar.gz diff --git a/libcomps.spec b/libcomps.spec index 6184f2c..00d4637 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,8 +1,8 @@ -%global commit b098d1b7dc00951490b262b533df7af2103bd4d4 +%global commit 01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6 Name: libcomps Version: 0.1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries diff --git a/sources b/sources index 8c68692..3649d9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f5a5c8cb0fcb88cc12705a6ff81d0a54 libcomps-b098d1b7dc00951490b262b533df7af2103bd4d4.tar.gz +3897db73766d00a568f1379b52f4b572 libcomps-01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6.tar.gz From 82f696833951da612e30e9c97ca4868e105e0f11 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Thu, 6 Mar 2014 11:03:36 +0100 Subject: [PATCH 10/16] - libcomps-0.1.6-4 --- .gitignore | 1 + libcomps.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4be9c23..41e1d38 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /libcomps-89e74eac90c9c1734158e00b397718cb325fe511.tar.gz /libcomps-b098d1b7dc00951490b262b533df7af2103bd4d4.tar.gz /libcomps-01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6.tar.gz +/libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz diff --git a/libcomps.spec b/libcomps.spec index 00d4637..b596bf3 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,4 +1,4 @@ -%global commit 01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6 +%global commit c57510dda1b9db6143da38656c7e518586ca59cc Name: libcomps Version: 0.1.6 diff --git a/sources b/sources index 3649d9f..107cf46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3897db73766d00a568f1379b52f4b572 libcomps-01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6.tar.gz +92dc9a89efcd8401a798ee5c028fd895 libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz From 27fe6f9f6981a658b2b9550c9d0a72e87606e5b9 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Thu, 6 Mar 2014 11:10:50 +0100 Subject: [PATCH 11/16] - release bumped --- .gitignore | 1 + libcomps.spec | 41 +++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 41e1d38..953787c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /libcomps-b098d1b7dc00951490b262b533df7af2103bd4d4.tar.gz /libcomps-01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6.tar.gz /libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz +/libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz diff --git a/libcomps.spec b/libcomps.spec index b596bf3..a59b674 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,8 +1,18 @@ -%global commit c57510dda1b9db6143da38656c7e518586ca59cc +%global commit a756363ce4a0dc7cb9395d2f57315428c22a4efb + +%if 0%{?rhel} && 0%{?rhel} <= 6 +%define python3_build 0 +#%{!?__python2: %global __python2 /usr/bin/python2} +#%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +#%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%else +%define python3_build 1 +%endif + Name: libcomps Version: 0.1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries @@ -12,11 +22,11 @@ Source0: https://github.com/midnightercz/libcomps/archive/%{commit}/libco BuildRequires: libxml2-devel BuildRequires: check-devel BuildRequires: expat-devel -%if 0%{?rhel} == 6 -BuildRequires: cmake28 -%else +#%if 0%{?rhel} == 6 +#BuildRequires: cmake28 +#%else BuildRequires: cmake -%endif +#%endif %description Libcomps is library for structure-like manipulation with content of @@ -59,6 +69,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python-libcomps Python2 bindings for libcomps library +%if %python3_build %package -n python3-libcomps Summary: Python3 bindings for libcomps library Group: Development/Libraries @@ -67,15 +78,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python3-libcomps Python3 bindings for libcomps library - +%endif %prep %setup -qn %{name}-%{commit} +%if %python3_build == 1 rm -rf py3 mkdir ../py3 cp -a . ../py3/ mv ../py3 ./ +%endif %build %cmake -DPYTHON_DESIRED:STRING=2 libcomps/ @@ -83,23 +96,30 @@ make %{?_smp_mflags} make %{?_smp_mflags} docs make %{?_smp_mflags} pydocs +%if %python3_build == 1 pushd py3 %cmake -DPYTHON_DESIRED:STRING=3 libcomps/ make %{?_smp_mflags} popd +%endif %check make test +%if %{python3_build} pushd py3 make pytest popd +%endif %install make install DESTDIR=%{buildroot} + +%if %{python3_build} pushd py3 make install DESTDIR=%{buildroot} popd +%endif %clean rm -rf $buildroot @@ -124,12 +144,13 @@ rm -rf $buildroot %files -n python-libcomps %{_libdir}/python2* -%exclude %{_libdir}/python2/libcomps/__pycache__ +#%exclude %{_libdir}/python2/libcomps/__pycache__ +%if %{python3_build} %files -n python3-libcomps %{_libdir}/python3* -%exclude %{_libdir}/python3/libcomps/__pycache__ - +#%exclude %{_libdir}/python3/libcomps/__pycache__ +%endif %changelog * Wed Jan 29 2014 Jindrich Luza 0.1.6 diff --git a/sources b/sources index 107cf46..330f824 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92dc9a89efcd8401a798ee5c028fd895 libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz +736bfe32a07fe8a8e54faab952ce72b4 libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz From 837b5e4d10c5fa43231b766e399d9a9cfd62fca4 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Thu, 6 Mar 2014 11:38:18 +0100 Subject: [PATCH 12/16] - fix rhbz#1073079 --- .gitignore | 1 + libcomps.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 953787c..e546419 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /libcomps-01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6.tar.gz /libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz /libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz +/libcomps-0665574b51a64ec7ea6a71a47281f67cd2768b80.tar.gz diff --git a/libcomps.spec b/libcomps.spec index a59b674..e884058 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,4 +1,4 @@ -%global commit a756363ce4a0dc7cb9395d2f57315428c22a4efb +%global commit 0665574b51a64ec7ea6a71a47281f67cd2768b80 %if 0%{?rhel} && 0%{?rhel} <= 6 %define python3_build 0 @@ -12,7 +12,7 @@ Name: libcomps Version: 0.1.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries diff --git a/sources b/sources index 330f824..13d5f6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -736bfe32a07fe8a8e54faab952ce72b4 libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz +c9698fa2cf291fa26c31cc187a49d6f4 libcomps-0665574b51a64ec7ea6a71a47281f67cd2768b80.tar.gz From 12644fbd7d889b8b9b60668d1aec4990e2c689d0 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Mon, 10 Mar 2014 16:49:53 +0100 Subject: [PATCH 13/16] - fixed rhbz#1073979, rhbz#1073890, rhbz#1073885 --- .gitignore | 1 + libcomps.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e546419..a33668c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz /libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz /libcomps-0665574b51a64ec7ea6a71a47281f67cd2768b80.tar.gz +/libcomps-670fcc98a789cdc0d14a792384a1c2f5c8d36f61.tar.gz diff --git a/libcomps.spec b/libcomps.spec index e884058..3ce80cd 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,4 +1,4 @@ -%global commit 0665574b51a64ec7ea6a71a47281f67cd2768b80 +%global commit 670fcc98a789cdc0d14a792384a1c2f5c8d36f61 %if 0%{?rhel} && 0%{?rhel} <= 6 %define python3_build 0 @@ -12,7 +12,7 @@ Name: libcomps Version: 0.1.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries diff --git a/sources b/sources index 13d5f6f..b3421a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9698fa2cf291fa26c31cc187a49d6f4 libcomps-0665574b51a64ec7ea6a71a47281f67cd2768b80.tar.gz +f1f0855477b46348a7798eba0572fbd7 libcomps-670fcc98a789cdc0d14a792384a1c2f5c8d36f61.tar.gz From 229c622451f4b57acddfd7cdb269e31f15fdf055 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Wed, 12 Mar 2014 14:47:04 +0100 Subject: [PATCH 14/16] .gitingore changes --- .gitignore | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index a33668c..76312f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1 @@ -/libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz -<<<<<<< HEAD -======= -/libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz ->>>>>>> master -/libcomps-44ee40c5d69f53c0b0707c502fbcfff0c9acf8ec.tar.gz -/libcomps-36336e79a2b08cd7507c90f5df5b7f850058fef7.tar.gz -/libcomps-a054fcfde528bb23fbab7a24b4938b7c86ecc7ce.tar.gz -/libcomps-951226b59c6915de5b44fac79a84f42d5277a8bc.tar.gz -/libcomps-313e3e9c9361530e0ea8f6813b9d3f44ad02dceb.tar.gz -/libcomps-1138c013476c521cf0ef4df22b0a7effe6cd0b29.tar.gz -/libcomps-bc1c9d1a2ee4546012fa11eee425f1752d74436b.tar.gz -/libcomps-4b283af9fe7cf0e0faee292db40624b16cf0be89.tar.gz -/libcomps-bc0489a9fd55914016746eae0add4477d1af673a.tar.gz -/libcomps-d28ab081062357e38b1f6c0f3c5958e818dd9d41.tar.gz -/libcomps-6307666529da570efd61599c276909a23e934df0.tar.gz -/libcomps-698ae33fa595d20b937839ce875495773b4482bb.tar.gz -/libcomps-706260866c0d2d5f48992d2140b96bf9f2b2a988.tar.gz -/libcomps-6c04e1caf6873713f23502b7bcfbf0b167f9a003.tar.gz -/libcomps-6fa3d286dc144078095cb3595a757e42283086d4.tar.gz -/libcomps-3b262476abc6b599b75706156180f2a3c0b36a47.tar.gz -/libcomps-2c56e049c2b01af0127b6b0a86ef55125b7721f5.tar.gz -/libcomps-e77f33d2b87eb55c37a94777d1909076589ca6a7.tar.gz -/libcomps-89e74eac90c9c1734158e00b397718cb325fe511.tar.gz -/libcomps-b098d1b7dc00951490b262b533df7af2103bd4d4.tar.gz -/libcomps-01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6.tar.gz -/libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz -/libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz -/libcomps-0665574b51a64ec7ea6a71a47281f67cd2768b80.tar.gz -/libcomps-670fcc98a789cdc0d14a792384a1c2f5c8d36f61.tar.gz +/libcomps-*.tar.gz From a9f2cc70eb957b68a6ee21c8638b778dfd893945 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Wed, 12 Mar 2014 14:49:08 +0100 Subject: [PATCH 15/16] - biarchonly typo error fix --- libcomps.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcomps.spec b/libcomps.spec index 3ce80cd..43d88fc 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,4 +1,4 @@ -%global commit 670fcc98a789cdc0d14a792384a1c2f5c8d36f61 +%global commit 1780ba5a0fc425341977da13294905b608a49e40 %if 0%{?rhel} && 0%{?rhel} <= 6 %define python3_build 0 @@ -12,7 +12,7 @@ Name: libcomps Version: 0.1.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries From 525e03de162576a232796be28ca29cbbafc4d2fb Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Thu, 13 Mar 2014 13:57:11 +0100 Subject: [PATCH 16/16] - comps dtd problem fix --- libcomps.spec | 4 ++-- sources | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libcomps.spec b/libcomps.spec index 43d88fc..7f3d909 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,4 +1,4 @@ -%global commit 1780ba5a0fc425341977da13294905b608a49e40 +%global commit 9946f7032f6d4f923628213bf34ffed609a3e305 %if 0%{?rhel} && 0%{?rhel} <= 6 %define python3_build 0 @@ -12,7 +12,7 @@ Name: libcomps Version: 0.1.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Comps XML file manipulation library Group: Development/Libraries diff --git a/sources b/sources index b3421a7..4cc0ace 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1f0855477b46348a7798eba0572fbd7 libcomps-670fcc98a789cdc0d14a792384a1c2f5c8d36f61.tar.gz +8db4be813d135cfb3c3d00981769195c libcomps-9946f7032f6d4f923628213bf34ffed609a3e305.tar.gz