From 09922a8da25b1d76aaf3ea2e86c25ac80af497fb Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Thu, 8 Aug 2013 14:46:31 +0200 Subject: [PATCH 1/3] Initial import (libcomps) --- .gitignore | 1 + libcomps.spec | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 152 insertions(+) create mode 100644 libcomps.spec diff --git a/.gitignore b/.gitignore index e69de29..251e92e 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz diff --git a/libcomps.spec b/libcomps.spec new file mode 100644 index 0000000..b687660 --- /dev/null +++ b/libcomps.spec @@ -0,0 +1,150 @@ +%global commit 257459634117baa067c3dde2a8ea83def6851094 + +Name: libcomps +Version: 0.1.2 +Release: 2%{?dist} +Summary: Comps XML file manipulation library + +Group: Development/Libraries +License: GPLv2+ +URL: https://github.com/midnightercz/libcomps/ +Source0: https://github.com/midnightercz/libcomps/archive/%{commit}/libcomps-%{commit}.tar.gz +BuildRequires: libxml2-devel +BuildRequires: check-devel +BuildRequires: expat-devel +%if 0%{?rhel} == 6 +BuildRequires: cmake28 +%else +BuildRequires: cmake +%endif + +%description +Libcomps is library for structure-like manipulation with content of +comps XML files. Supports read/write XML file, structure(s) modification. + +%package doc +Summary: Documentation files for libcomps library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +BuildArch: noarch +BuildRequires: doxygen + +%description doc +Documentation files for libcomps library + +%package devel +Summary: Development files for libcomps library +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Development files for libcomps library + +%package -n python-libcomps +Summary: Python2 bindings for libcomps library +Group: Development/Libraries +BuildRequires: python-devel +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n python-libcomps +Python2 bindings for libcomps library + +%package -n python3-libcomps +Summary: Python3 bindings for libcomps library +Group: Development/Libraries +BuildRequires: python3-devel +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n python3-libcomps +Python3 bindings for libcomps library + + +%prep +%setup -qn %{name}-%{commit} + +rm -rf py3 +mkdir ../py3 +cp -a . ../py3/ +mv ../py3 ./ + +%build +%cmake -DPYTHON_DESIRED:STRING=2 libcomps/ +make %{?_smp_mflags} +make %{?_smp_mflags} docs + +pushd py3 +%cmake -DPYTHON_DESIRED:STRING=3 libcomps/ +make %{?_smp_mflags} +make %{?_smp_mflags} docs +popd + + +%check devel + make test + +%install +make install DESTDIR=%{buildroot} +pushd py3 +make install DESTDIR=%{buildroot} +popd + +%clean +rm -rf $buildroot + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%{_libdir}/libcomps.so.* +%doc README.md COPYING + +%files devel +%{_libdir}/libcomps.so +%{_includedir}/* + +%files doc +%doc docs/libcomps-doc/html + +%files -n python-libcomps +%{_libdir}/python2* +%exclude %{_libdir}/python2/libcomps/__pycache__ + +%files -n python3-libcomps +%{_libdir}/python3* +%exclude %{_libdir}/python3/libcomps/__pycache__ + + +%changelog +* Thu Aug 08 2013 Jindrich Luza 0.1.2.git2574596 +- spec modified + +* Thu Jul 18 2013 Jindrich Luza 0.1.2 +- automatic changelog system +- 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, +- 1 means there's some errors or warnings but not fatal. -1 indicates +- fatal error problem (some results maybe given, but probably incomplete +- and invalid) +- errors catched during parsing can be obtained by calling +- libcomps.Comps.get_last_parse_errors +- all log is given by +- libcomps.Comps.get_last_parse_log +- improved integrated tests +- documentation is now isolated make target ('make docs') +- 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 e69de29..8a0b59f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +8c37e88f0b7880eaca5225454cc7a1e5 libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz From 1cb04e0e42d0439305776fa7c97452c19a397e20 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Thu, 8 Aug 2013 16:09:35 +0200 Subject: [PATCH 2/3] Initial import (#987433) From adde9f57ece49e369580eb8448e282ee912be25a Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Wed, 14 Aug 2013 11:40:07 +0200 Subject: [PATCH 3/3] fix #995451 --- .gitignore | 1 + libcomps.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 251e92e..6668567 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz +/libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz diff --git a/libcomps.spec b/libcomps.spec index b687660..aca5a28 100644 --- a/libcomps.spec +++ b/libcomps.spec @@ -1,4 +1,4 @@ -%global commit 257459634117baa067c3dde2a8ea83def6851094 +%global commit 4951a3ec8b8e9a210471c4d42be370a310cc78ab Name: libcomps Version: 0.1.2 @@ -116,8 +116,8 @@ rm -rf $buildroot %changelog -* Thu Aug 08 2013 Jindrich Luza 0.1.2.git2574596 -- spec modified +* Wed Aug 14 2013 Jindrich Luza 0.1.2.git4951a3e +- __test.py print removed * Thu Jul 18 2013 Jindrich Luza 0.1.2 - automatic changelog system diff --git a/sources b/sources index 8a0b59f..e38295a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c37e88f0b7880eaca5225454cc7a1e5 libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz +8952cd6f4670123eb8b12d169f347157 libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz