Merge branch 'master' into el6

This commit is contained in:
Jindrich Luza 2014-03-13 14:00:50 +01:00
commit 77ecf44a77
3 changed files with 4 additions and 31 deletions

29
.gitignore vendored
View File

@ -1,28 +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-a137f37f553fb675b2eedf1aa4c8a750df9eec4f.tar.gz
/libcomps-3a9603c4b774ec3906ac63491f68a810927f0a48.tar.gz
/libcomps-a747d1289d7597882424bf50b1979170507484da.tar.gz
/libcomps-de7b804e81bfb269f16be81fa70e7656a9477a88.tar.gz
/libcomps-b4770cbebc79d40532bb812242af4e53712ccbb2.tar.gz
/libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz
/libcomps-9d897b26a99a698556d4db18307f064f2f9acf3b.tar.gz
/libcomps-ae61b99bed0825e1774ead547109bf9839371a64.tar.gz
/libcomps-670fcc98a789cdc0d14a792384a1c2f5c8d36f61.tar.gz
/libcomps-ea7a72ba00cb98cee678a7e8becaae97283d03ed.tar.gz
/libcomps-1780ba5a0fc425341977da13294905b608a49e40.tar.gz
/libcomps-*.tar.gz

View File

@ -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

View File

@ -1 +1 @@
c8e2a0e2d9e626fb21599d9189bb4609 libcomps-1780ba5a0fc425341977da13294905b608a49e40.tar.gz
8db4be813d135cfb3c3d00981769195c libcomps-9946f7032f6d4f923628213bf34ffed609a3e305.tar.gz