rpms/libcomps
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- spec fixed

Browse Source
This commit is contained in:
Jindrich Luza 2014-02-27 13:56:36 +01:00
parent 77ecfc0069
commit 3302b0aa39
3 changed files with 106 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -15,3 +15,5 @@
/libcomps-d28ab081062357e38b1f6c0f3c5958e818dd9d41.tar.gz
/libcomps-6307666529da570efd61599c276909a23e934df0.tar.gz
/libcomps-698ae33fa595d20b937839ce875495773b4482bb.tar.gz
/libcomps-a137f37f553fb675b2eedf1aa4c8a750df9eec4f.tar.gz
/libcomps-3a9603c4b774ec3906ac63491f68a810927f0a48.tar.gz

115
libcomps.spec
View File

@ -1,8 +1,18 @@
%global commit 698ae33fa595d20b937839ce875495773b4482bb
%global commit 3a9603c4b774ec3906ac63491f68a810927f0a48
%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.3
Release: 6%{?dist}
Version: 0.1.6
Release: 3%{?dist}
Summary: Comps XML file manipulation library
Group: Development/Libraries
@ -24,7 +34,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 +42,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
@ -49,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
@ -57,36 +78,48 @@ 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/
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}
make %{?_smp_mflags} docs
popd
%endif
%check devel
%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
@ -106,23 +139,80 @@ 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__
%if %{python3_build}
%files -n python3-libcomps
%{_libdir}/python3*
%exclude %{_libdir}/python3/libcomps/__pycache__
%endif
%changelog
* Tue Sep 17 2013 Jindrich Luza <jluza@redhat.com> 0.1.3.git698ae33
- release bump
* Wed Jan 29 2014 Jindrich Luza <jluza@redhat.com> 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 <jluza@redhat.com> 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 <jluza@redhat.com> 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 <jluza@redhat.com> 0.1.4
- added missing files
- 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 <jluza@redhat.com> 0.1.3
- finished default attribute support in groupid object
@ -137,7 +227,6 @@ rm -rf $buildroot
- fixed issue #14
- libcomps.Dict is now behave more like python dict. Implemented iter(libcomps.Dict)
- libcomps.iteritems() and libcomps.itervalues()
- added <packagereq requires=...> 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,
@ -148,15 +237,15 @@ 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
- added <packagereq requires=...> support
- new prop system in progress....
- separated doc package
- some minor fixes in CMakeFiles
- improved integrated tests
* Tue Jun 25 2013 Jindrich Luza <jluza@redhat.com> 0.1.1-1
- Automatic commit of package [libcomps] release [0.1.1-1].

2
sources
View File

@ -1 +1 @@
0e62d61efeecb3c57fedc5f142ff75a1 libcomps-698ae33fa595d20b937839ce875495773b4482bb.tar.gz
d52e46c709cd990949dc3cbbee164cf9 libcomps-3a9603c4b774ec3906ac63491f68a810927f0a48.tar.gz