diff --git a/clufter.spec b/clufter.spec index af188a0..bf71623 100644 --- a/clufter.spec +++ b/clufter.spec @@ -3,12 +3,12 @@ %{!?_licensedir:%global license %doc} Name: clufter -Version: 0.55.0 +Version: 0.56.0 Release: 1%{?dist} Group: System Environment/Base Summary: Tool/library for transforming/analyzing cluster configuration formats License: GPLv2+ -URL: https://github.com/jnpkrn/%{name} +URL: https://pagure.io/%{name} # required for autosetup macro BuildRequires: git @@ -20,8 +20,6 @@ BuildRequires: python-lxml Source0: https://people.redhat.com/jpokorny/pkgs/%{name}/%{name}-%{version}.tar.gz Source1: https://people.redhat.com/jpokorny/pkgs/%{name}/%{name}-%{version}-tests.tar.xz -Patch0: filter-get-along-without-dev-tty-that-may-not-exist.patch - %description While primarily aimed at (CMAN,rgmanager)->(Corosync/CMAN,Pacemaker) cluster stacks configuration conversion (as per RHEL trend), the command-filter-format @@ -111,6 +109,8 @@ formats and filters. --editor='%{_bindir}/nano' \ --ra-metadata-dir='%{_datadir}/cluster' \ --ra-metadata-ext='metadata' +%{__python} setup.py saveopts -f setup.cfg pkg_prepare \ +--report-bugs='https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=clufter' %build %{__python2} setup.py build @@ -143,6 +143,11 @@ while read cmd; do '1s:\(.*\):\1\n\\\&\\fIcluster.conf\\fR\\\|(5), \\\&\\fIccs\\fR\\\|(7), :' \ .see-also ;;& + ccs2pcs*) + sed -i \ + '1s:\(.*\):\1\n\\\&\\fI%{_defaultdocdir}/%{name}-%{version}/rgmanager-pacemaker\\fR\\\|, :' \ + .see-also + ;;& *[2-]pcscmd*) sed -i '1s:\(.*\):\1\n\\\&\\fIpcs\\fR\\\|(8), :' .see-also ;;& @@ -185,10 +190,10 @@ cat >.bashcomp-files <<-EOF %verify(not size md5 mtime) %{_sysconfdir}/%{name}/bash-completion EOF %{__mkdir_p} -- '%{buildroot}%{_mandir}' -%{__cp} -a -- .manpages/* '%{buildroot}%{_mandir}' +%{__cp} -a -t '%{buildroot}%{_mandir}' -- .manpages/* %{__mkdir_p} -- '%{buildroot}%{_defaultdocdir}/%{name}-%{version}' -%{__install} -pm 644 -- gpl-2.0.txt doc/*.txt \ - '%{buildroot}%{_defaultdocdir}/%{name}-%{version}' +%{__cp} -a -t '%{buildroot}%{_defaultdocdir}/%{name}-%{version}' \ + -- gpl-2.0.txt doc/*.txt doc/rgmanager-pacemaker %check # just a basic sanity check @@ -233,10 +238,12 @@ test -x '%{_bindir}/%{name}' && test -f "${bashcomp}" \ %{python2_sitelib}/%{name}/__main__.py* %{python2_sitelib}/%{name}/main.py* %{python2_sitelib}/%{name}/completion.py* +# only useful here, rest of egg-info pulled through internal dependency +%{python2_sitelib}/%{name}-*.egg-info/entry_points.txt %files -n python-%{name} %dir %{_defaultdocdir}/%{name}-%{version} -%{_defaultdocdir}/%{name}-%{version}/*[^[:digit:]].txt +%{_defaultdocdir}/%{name}-%{version}/*[^[:digit:]] %license %{_defaultdocdir}/%{name}-%{version}/*[[:digit:]].txt %exclude %{python2_sitelib}/%{name}/__main__.py* %exclude %{python2_sitelib}/%{name}/main.py* @@ -244,6 +251,8 @@ test -x '%{_bindir}/%{name}' && test -f "${bashcomp}" \ %exclude %{python2_sitelib}/%{name}/ext-plugins/*/ %{python2_sitelib}/%{name} %{python2_sitelib}/%{name}-*.egg-info +# entry_points.txt only useful for -cli package +%exclude %{python2_sitelib}/%{name}-*.egg-info/entry_points.txt %{_libexecdir}/%{name}-%{version} %{_datadir}/cluster @@ -257,6 +266,12 @@ test -x '%{_bindir}/%{name}' && test -f "${bashcomp}" \ %{python2_sitelib}/%{name}/ext-plugins/lib-pcs %changelog +* Tue Feb 02 2016 Jan Pokorný - 0.56.0-1 +- move entry_points.txt to clufter-cli sub-package +- general spec file refresh (pagure.io as a default project base, etc.) +- bump upstream package, see + https://github.com/jnpkrn/clufter/releases/tag/v0.56.0 + * Mon Dec 21 2015 Jan Pokorný - 0.55.0-1 - auto-generate SEE ALSO sections for the man pages - bump upstream package (intentional jump on upstream front), diff --git a/sources b/sources index fa9ba13..d0620bc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -52064cfc423525b72c60fbce66563d94 clufter-0.55.0.tar.gz -0799c55df627c24c2c40c6e86a83f203 clufter-0.55.0-tests.tar.xz +dd7121bdfccc6fb7c5bff94b53f7fa48 clufter-0.56.0.tar.gz +e6c8fcf32ff6734a2a95bcbb9a2af4fa clufter-0.56.0-tests.tar.xz