From b086d4f372ec47b04d05700ed3a5309aaf9fefd0 Mon Sep 17 00:00:00 2001 From: Michal Luscon Date: May 25 2015 15:49:10 +0000 Subject: New release 0.1.5-3 --- diff --git a/dnf-plugins-core-0.1.5-1-to-dnf-plugins-core-0.1.5-2.patch b/dnf-plugins-core-0.1.5-1-to-dnf-plugins-core-0.1.5-2.patch index de5d18a..297e722 100644 --- a/dnf-plugins-core-0.1.5-1-to-dnf-plugins-core-0.1.5-2.patch +++ b/dnf-plugins-core-0.1.5-1-to-dnf-plugins-core-0.1.5-2.patch @@ -1898,12 +1898,12 @@ index 0000000..ffeb709 +branches = f21 diff --git a/rel-eng/tito.props b/rel-eng/tito.props new file mode 100644 -index 0000000..c008eb3 +index 0000000..1084386 --- /dev/null +++ b/rel-eng/tito.props @@ -0,0 +1,5 @@ +[buildconfig] -+builder = tito.builder.Builder ++builder = tito.distributionbuilder.DistributionBuilder +tagger = tito.tagger.ReleaseTagger +changelog_do_not_remove_cherrypick = 1 +changelog_format = %s (%a) diff --git a/dnf-plugins-core-0.1.5-2-to-dnf-plugins-core-0.1.5-3.patch b/dnf-plugins-core-0.1.5-2-to-dnf-plugins-core-0.1.5-3.patch new file mode 100644 index 0000000..71b9da4 --- /dev/null +++ b/dnf-plugins-core-0.1.5-2-to-dnf-plugins-core-0.1.5-3.patch @@ -0,0 +1,105 @@ +diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec +index b9e0a38..12283ff 100644 +--- a/dnf-plugins-core.spec ++++ b/dnf-plugins-core.spec +@@ -2,7 +2,7 @@ + + Name: dnf-plugins-core + Version: 0.1.5 +-Release: 2%{?dist} ++Release: 3%{?dist} + Summary: Core Plugins for DNF + Group: System Environment/Base + License: GPLv2+ +@@ -21,7 +21,9 @@ BuildRequires: python-sphinx + BuildRequires: python2-devel + Requires: dnf = %{dnf_version} + Requires: pykickstart ++%if 0%{?fedora} + Requires: python-requests ++%endif + + %description + Core Plugins for DNF. This package enhance DNF with builddep, config-manager, +@@ -29,6 +31,7 @@ copr, debuginfo-install, download, kickstart, needs-restarting, repoquery and + reposync commands. Additionally provides generate_completion_cache, noroot and + protected_packages passive plugins. + ++%if 0%{?fedora} + %package -n python3-dnf-plugins-core + Summary: Core Plugins for DNF + Group: System Environment/Base +@@ -43,34 +46,45 @@ Core Plugins for DNF, Python 3 version. This package enhance DNF with builddep, + config-manager, copr, debuginfo-install, download, kickstart, needs-restarting, + repoquery and reposync commands. Additionally provides generate_completion_cache, + noroot and protected_packages passive plugins. ++%endif + + %prep + %setup -q -n dnf-plugins-core-%{version} ++%if 0%{?fedora} + rm -rf py3 + mkdir ../py3 + cp -a . ../py3/ + mv ../py3 ./ ++%endif + + %build + %cmake . + make %{?_smp_mflags} + make doc-man ++%if 0%{?fedora} + pushd py3 + %cmake -DPYTHON_DESIRED:str=3 . + make %{?_smp_mflags} + make doc-man + popd ++%endif + + %install + make install DESTDIR=$RPM_BUILD_ROOT + %find_lang %{name} ++%if 0%{?fedora} + pushd py3 + make install DESTDIR=$RPM_BUILD_ROOT + popd ++%else ++rm $RPM_BUILD_ROOT/%{python_sitelib}/dnf-plugins/copr.py ++%endif + + %check + PYTHONPATH=./plugins /usr/bin/nosetests-2.* -s tests/ ++%if 0%{?fedora} + PYTHONPATH=./plugins /usr/bin/nosetests-3.* -s tests/ ++%endif + + %files -f %{name}.lang + %doc AUTHORS COPYING README.rst +@@ -80,6 +94,7 @@ PYTHONPATH=./plugins /usr/bin/nosetests-3.* -s tests/ + %{python_sitelib}/dnfpluginscore/ + %{_mandir}/man8/dnf.plugin.* + ++%if 0%{?fedora} + %files -n python3-dnf-plugins-core -f %{name}.lang + %doc AUTHORS COPYING README.rst + %dir %{_sysconfdir}/dnf/protected.d +@@ -89,8 +104,12 @@ PYTHONPATH=./plugins /usr/bin/nosetests-3.* -s tests/ + %{python3_sitelib}/dnf-plugins/__pycache__/* + %{python3_sitelib}/dnfpluginscore/ + %{_mandir}/man8/dnf.plugin.* ++%endif + + %changelog ++* Mon May 25 2015 Michal Luscon 0.1.5-3 ++- spec: remove python3 subpackage from epel build (Michal Luscon) ++ + * Mon Apr 13 2015 Michal Luscon 0.1.5-2 + - prepare repo for tito build system (Michal Luscon) + - migrate raw_input() to Python3 (RhBug:1208399) (Miroslav Suchý) +diff --git a/rel-eng/packages/dnf-plugins-core b/rel-eng/packages/dnf-plugins-core +index d7b9e19..9548c6f 100644 +--- a/rel-eng/packages/dnf-plugins-core ++++ b/rel-eng/packages/dnf-plugins-core +@@ -1 +1 @@ +-0.1.5-2 ./ ++0.1.5-3 ./ diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index 69ae81a..2bbe727 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -2,7 +2,7 @@ Name: dnf-plugins-core Version: 0.1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core Plugins for DNF Group: System Environment/Base License: GPLv2+ @@ -11,6 +11,7 @@ URL: https://github.com/rpm-software-management/dnf-plugins-core # source archive is created by running package/archive from a git checkout Source0: dnf-plugins-core-%{version}.tar.gz Patch0: dnf-plugins-core-0.1.5-1-to-dnf-plugins-core-0.1.5-2.patch +Patch1: dnf-plugins-core-0.1.5-2-to-dnf-plugins-core-0.1.5-3.patch BuildArch: noarch BuildRequires: cmake @@ -22,7 +23,9 @@ BuildRequires: python-sphinx BuildRequires: python2-devel Requires: dnf = %{dnf_version} Requires: pykickstart +%if 0%{?fedora} Requires: python-requests +%endif %description Core Plugins for DNF. This package enhance DNF with builddep, config-manager, @@ -30,6 +33,7 @@ copr, debuginfo-install, download, kickstart, needs-restarting, repoquery and reposync commands. Additionally provides generate_completion_cache, noroot and protected_packages passive plugins. +%if 0%{?fedora} %package -n python3-dnf-plugins-core Summary: Core Plugins for DNF Group: System Environment/Base @@ -44,35 +48,47 @@ Core Plugins for DNF, Python 3 version. This package enhance DNF with builddep, config-manager, copr, debuginfo-install, download, kickstart, needs-restarting, repoquery and reposync commands. Additionally provides generate_completion_cache, noroot and protected_packages passive plugins. +%endif %prep %setup -q -n dnf-plugins-core-%{version} %patch0 -p1 +%patch1 -p1 +%if 0%{?fedora} rm -rf py3 mkdir ../py3 cp -a . ../py3/ mv ../py3 ./ +%endif %build %cmake . make %{?_smp_mflags} make doc-man +%if 0%{?fedora} pushd py3 %cmake -DPYTHON_DESIRED:str=3 . make %{?_smp_mflags} make doc-man popd +%endif %install make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} +%if 0%{?fedora} pushd py3 make install DESTDIR=$RPM_BUILD_ROOT popd +%else +rm $RPM_BUILD_ROOT/%{python_sitelib}/dnf-plugins/copr.py +%endif %check PYTHONPATH=./plugins /usr/bin/nosetests-2.* -s tests/ +%if 0%{?fedora} PYTHONPATH=./plugins /usr/bin/nosetests-3.* -s tests/ +%endif %files -f %{name}.lang %doc AUTHORS COPYING README.rst @@ -82,6 +98,7 @@ PYTHONPATH=./plugins /usr/bin/nosetests-3.* -s tests/ %{python_sitelib}/dnfpluginscore/ %{_mandir}/man8/dnf.plugin.* +%if 0%{?fedora} %files -n python3-dnf-plugins-core -f %{name}.lang %doc AUTHORS COPYING README.rst %dir %{_sysconfdir}/dnf/protected.d @@ -91,8 +108,12 @@ PYTHONPATH=./plugins /usr/bin/nosetests-3.* -s tests/ %{python3_sitelib}/dnf-plugins/__pycache__/* %{python3_sitelib}/dnfpluginscore/ %{_mandir}/man8/dnf.plugin.* +%endif %changelog +* Mon May 25 2015 Michal Luscon 0.1.5-3 +- spec: remove python3 subpackage from epel build (Michal Luscon) + * Mon Apr 13 2015 Michal Luscon 0.1.5-2 - prepare repo for tito build system (Michal Luscon) - migrate raw_input() to Python3 (RhBug:1208399) (Miroslav Suchý)