rpms/zanata-python-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve conflict

Browse source
This commit is contained in:
Sundeep Anand 2016-04-15 16:54:54 +05:30
commit 5c745912eb
3 changed files with 44 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -8,3 +8,5 @@
/v1.3.22.tar.gz
/v1.4.0.tar.gz
/zpc-v1.4.1.tar.gz
/v1.4.2.tar.gz
/v1.5.0.tar.gz

2
sources
View file

@ -1 +1 @@
077fee479e135c3d61098c6edb47e27a zpc-v1.4.1.tar.gz
b48962a5930e55f464b81caa96311229 v1.5.0.tar.gz

53
zanata-python-client.spec
View file

@ -1,22 +1,26 @@
%{!?__python2: %define __python2 %{__python}}
%{!?python2_sitelib: %define python2_sitelib %{python_sitelib}}
%{!?__python2: %global __python2 %{__python}}
%{!?python2_sitelib: %global python2_sitelib %{python_sitelib}}
Name: zanata-python-client
Version: 1.4.1
Version: 1.5.0
Release: 2%{?dist}
Summary: Python Client for Zanata Server
License: LGPLv2+
Group: Applications/Text
URL: http://zanata.org
Source0: https://github.com/zanata/zanata-python-client/archive/zpc-v%{version}.tar.gz
Source0: https://github.com/zanata/zanata-python-client/archive/v%{version}.tar.gz
BuildArch: noarch
BuildRequires: python-setuptools
Requires: python-polib >= 1.0.0-1
Requires: python-httplib2 >= 0.7.4-6
Requires: python-lxml
%if 0%{?rhel}
%if 0%{?rhel} < 6
Requires: python-hashlib
Requires: python-simplejson
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-hashlib
Requires: python-simplejson
Requires: python-ordereddict
%endif
%endif
@ -30,7 +34,7 @@ Obsoletes: flies-python-client < 1.1
Zanata Python client is a client that communicate with Zanata server.
%prep
%setup -q -n zanata-python-client-zpc-v%{version}
%setup -q -n %{name}-%{version}
%build
%{__python2} setup.py build
@ -40,17 +44,44 @@ cp -pr zanataclient/VERSION-FILE build/lib/zanataclient
%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT/%{_docdir}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc README.rst COPYING.LESSER zanata.ini CHANGELOG
%doc README.rst COPYING.LESSER zanata.ini zanata_example.xml CHANGELOG
%{_bindir}/*
%{python2_sitelib}
%changelog
* Fri Apr 15 2016 Sundeep Anand <suanand@redhat.com> - 1.5.0-2
- add build requires, v1.5.0 release notes:
- Bug 1139950 - Translation files mapping rules
- Bug 1311705 - traceback when trying to push
- ZNTA-303 - podir projects handling
- ZNTA-927 - Project Status and Versions
- ZNTA-929 - failed to retrieve version in non-git environment
- ZNTA-934 - init failed to generate java-client compatible zanata.xml
- ZNTA-936 - error message for unexpected html response
- ZNTA-946 - Cannot push with zanata Python client 1.4.2
* Fri Apr 15 2016 Ding-Yi Chen <dchen@redhat.com> - 1.5.0-1
- Upstream update to 1.5.0-1
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jan 21 2016 Ding-Yi Chen <dchen@redhat.com> - 1.4.2-1
- Upstream update to 1.4.2
* Wed Jan 20 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.4.1-4
- Change define -> global to fix build issue with epel-rpm-macros.
* Thu Jan 14 2016 Ding-Yi Chen <dchen@redhat.com> - 1.4.1-3
Fix the EPEL5 build.
* Thu Jan 14 2016 Ding-Yi Chen <dchen@redhat.com> - 1.4.1-2
Fix the Fedora 22 rpmlint error.
- Fix the Fedora 22 rpmlint error.
* Wed Jan 13 2016 Ding-Yi Chen <dchen@redhat.com> - 1.4.1-1
- Upsteam update to 1.4.1 which fixed: