diff options
| author | SoonKyu Park <sk7.park@samsung.com> | 2016-07-25 20:53:31 +0900 |
|---|---|---|
| committer | SoonKyu Park <sk7.park@samsung.com> | 2016-07-25 20:53:31 +0900 |
| commit | 77958da8a32b9f39356684e05842579a74c4a46f (patch) | |
| tree | b4babcbfce543e21abfa2fb09049d546cb049481 /packaging | |
| parent | 31a52b28de3581b2859fd020a0d221d54d8e57f7 (diff) | |
| parent | 06e10c8b1f4f355e884d52a61b7762e733975d55 (diff) | |
| download | git-buildpackage-77958da8a32b9f39356684e05842579a74c4a46f.tar.gz git-buildpackage-77958da8a32b9f39356684e05842579a74c4a46f.tar.bz2 git-buildpackage-77958da8a32b9f39356684e05842579a74c4a46f.zip | |
Handle conflicts from git merge masterdevel_psk_20160727
Change-Id: I9dfa02fb546a04f97aade855615ad2843790a2c1
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/git-buildpackage.changes | 3 | ||||
| -rwxr-xr-x | packaging/git-buildpackage.spec | 16 |
2 files changed, 9 insertions, 10 deletions
diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes index 5f8ecf55..7f8a5ef3 100755 --- 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 bc6c190f..60939602 100755 --- 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 @@ -12,15 +12,11 @@ URL: https://honk.sigxcpu.org/piki/projects/git-buildpackage/ Source0: %{name}_%{version}.tar.gz # Conditional package names for requirements -%if 0%{?fedora} || 0%{?centos_ver} > 7 -%define dpkg_pkg_name dpkg-dev -%else -%if 0%{?centos_version} +%if 0%{?fedora} || 0%{?centos_ver} %define dpkg_pkg_name dpkg-devel %else %define dpkg_pkg_name dpkg %endif -%endif %if 0%{?suse_version} && 0%{?suse_version} < 1230 %define devscripts_pkg_name devscripts-fixes @@ -34,7 +30,7 @@ Source0: %{name}_%{version}.tar.gz %define man_pkg_name man %endif -%if 0%{?fedora} || 0%{?centos_version} || 0%{?centos_ver} || 0%{?tizen_version:1} +%if 0%{?fedora} || 0%{?centos_ver} || 0%{?tizen_version:1} %define python_pkg_name python %else %define python_pkg_name python-base @@ -177,6 +173,7 @@ GIT_CEILING_DIRECTORIES=%{_builddir} \ %install rm -rf %{buildroot} WITHOUT_NOSETESTS=1 %{__python} ./setup.py install --root=%{buildroot} --prefix=/usr +rm -rf %{buildroot}%{python_sitelib}/*info %if %{with docs} # Install man pages @@ -222,8 +219,8 @@ cat >> files.list << EOF EOF %endif -# Disable the debian tools for old CentOS -%if 0%{?centos_version} && 0%{?centos_ver} < 7 +# Disable the debian tools for CentOS +%if 0%{?centos_version} for f in `cat files.list`; do rm -rfv %{buildroot}/$f done @@ -244,7 +241,6 @@ done %dir %{python_sitelib}/gbp/pkg %dir %{python_sitelib}/gbp/scripts %dir %{python_sitelib}/gbp/scripts/common -%{python_sitelib}/gbp-* %{python_sitelib}/gbp/*.py* %{python_sitelib}/gbp/scripts/__init__.py* %{python_sitelib}/gbp/scripts/clone.py* |