diff options
| author | SoonKyu Park <sk7.park@samsung.com> | 2016-06-16 17:32:15 +0900 |
|---|---|---|
| committer | SoonKyu Park <sk7.park@samsung.com> | 2016-06-16 17:32:15 +0900 |
| commit | 06e10c8b1f4f355e884d52a61b7762e733975d55 (patch) | |
| tree | d16f1113bd5460842228e1b7e75ff38deb438163 /packaging | |
| parent | 8e7c90b9ae69aad55495a8f5be4e94b498052166 (diff) | |
| parent | 7d042a8203461117e8743bf1e879af431d3c31cd (diff) | |
| download | git-buildpackage-06e10c8b1f4f355e884d52a61b7762e733975d55.tar.gz git-buildpackage-06e10c8b1f4f355e884d52a61b7762e733975d55.tar.bz2 git-buildpackage-06e10c8b1f4f355e884d52a61b7762e733975d55.zip | |
Handle conflicts from git merge release-20160531release-20160930release-20160615
Change-Id: I1cae90068ab2576d756188e36e112550c7c293de
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/git-buildpackage.changes | 3 | ||||
| -rw-r--r-- | packaging/git-buildpackage.spec | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes index 5f8ecf55..7f8a5ef3 100644 --- a/packaging/git-buildpackage.changes +++ b/packaging/git-buildpackage.changes @@ -1,3 +1,6 @@ +* Sat May 14 2016 Jun Wang <junbill.wang@samsung.com> tizen/0.7.4-20160514 +- Upgrade version to 0.7.4 + * Wed Mar 02 2016 Jun Wang <junbill.wang@samsung.com> tizen/0.6.27-20160302 - Upgrade version to 0.6.27 diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec index 1a2f49b8..60939602 100644 --- a/packaging/git-buildpackage.spec +++ b/packaging/git-buildpackage.spec @@ -3,7 +3,7 @@ Name: git-buildpackage Summary: Build packages from git -Version: 0.6.27 +Version: 0.7.4 Release: 0 Group: Development/Tools/Building License: GPLv2 @@ -118,6 +118,20 @@ Set of tools from Debian that integrate the package build system with Git. This package contains the tools for building RPM packages. +%package bb +Summary: Build with BitBake from git +Group: Development/Tools/Building +Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-rpm = %{version}-%{release} +%if 0%{?suse_version} || 0%{?tizen_version:1} +Recommends: bitbake +%endif + +%description bb +Set of tools from Debian that integrate the package build system with Git. +This package contains the tools for building with the BitBake tool. + + %if %{with docs} %package doc Summary: Documentation for the git-buildpackage suite @@ -261,6 +275,13 @@ done %endif +%files bb +%defattr(-,root,root,-) +%dir %{python_sitelib}/gbp/bb +%{python_sitelib}/gbp/scripts/*bb*.py* +%{python_sitelib}/gbp/bb/*py* + + %if %{with docs} %files doc %defattr(-,root,root,-) |