diff --git a/.gitignore b/.gitignore index dae415c..31b8953 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /tracer-0.6.7.tar.gz /tracer-0.6.8.tar.gz /tracer-0.6.9.tar.gz +/tracer-0.6.10.tar.gz diff --git a/sources b/sources index a156c23..ea595d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -521028b75124c732ae1b6fdfe525187c tracer-0.6.9.tar.gz +e10933d06a629858663ad667ffd67d51 tracer-0.6.10.tar.gz diff --git a/tracer.spec b/tracer.spec index 1364a1b..005d578 100644 --- a/tracer.spec +++ b/tracer.spec @@ -1,6 +1,6 @@ Name: tracer -Version: 0.6.9 -Release: 2%{?dist} +Version: 0.6.10 +Release: 1%{?dist} Summary: Finds outdated running applications in your system BuildArch: noarch @@ -13,21 +13,14 @@ URL: http://tracer-package.com/ # tito build --tgz Source0: %{name}-%{version}.tar.gz -BuildRequires: asciidoc -BuildRequires: gettext BuildRequires: python2-devel BuildRequires: python3-devel -%if 0%{?with_python3} -BuildRequires: python3-sphinx -BuildRequires: python3-beautifulsoup4 -BuildRequires: python3-psutil -BuildRequires: python3-pygments -BuildRequires: python3-lxml -Requires: rpm-python3 -Requires: python3 -Requires: python3-beautifulsoup4 -Requires: python3-psutil -%else +BuildRequires: asciidoc +BuildRequires: gettext + +%package -n python2-%{name} +Summary: %{summary} +Provides: %{name} = %{version}-%{release} BuildRequires: python-sphinx BuildRequires: python-beautifulsoup4 BuildRequires: python-psutil @@ -37,7 +30,21 @@ Requires: rpm-python Requires: python Requires: python-beautifulsoup4 Requires: python-psutil -%endif +%{?python_provide:%python_provide python2-%{name}} + +%package -n python3-%{name} +Summary: %{summary} +BuildRequires: python3-sphinx +BuildRequires: python3-beautifulsoup4 +BuildRequires: python3-psutil +BuildRequires: python3-pygments +BuildRequires: python3-lxml +Requires: rpm-python3 +Requires: python3 +Requires: python3-beautifulsoup4 +Requires: python3-psutil +%{?python_provide:%python_provide python3-%{name}} + %description Tracer determines which applications use outdated files and prints them. For @@ -47,21 +54,50 @@ simple idea. If application has loaded in memory any version of a file which is provided by any package updated since system was booted up, tracer consider this application as outdated. +%description -n python2-%{name} +Tracer determines which applications use outdated files and prints them. For +special kind of applications such as services or daemons, it suggests a standard +command to restart it. Detecting whether file is outdated or not is based on a +simple idea. If application has loaded in memory any version of a file +which is provided by any package updated since system was booted up, tracer +consider this application as outdated. + +%description -n python3-%{name} +Tracer determines which applications use outdated files and prints them. For +special kind of applications such as services or daemons, it suggests a standard +command to restart it. Detecting whether file is outdated or not is based on a +simple idea. If application has loaded in memory any version of a file +which is provided by any package updated since system was booted up, tracer +consider this application as outdated. + + %prep %setup -q %build +%py2_build +%py3_build make %{?_smp_mflags} man +sed "s/\/usr\/bin\/python/\/usr\/bin\/python2/" bin/tracer.py > bin/tracer-2 +sed "s/\/usr\/bin\/python/\/usr\/bin\/python3/" bin/tracer.py > bin/tracer-3 +chmod +x bin/tracer-2 bin/tracer-3 %install +# @TODO use following macros +# %%py2_install +# %%py3_install mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_datadir}/tracer -mkdir -p %{buildroot}%{_mandir}/man8 +mkdir -p %{buildroot}/%{_mandir}/man8 mkdir -p %{buildroot}/%{python2_sitelib}/tracer mkdir -p %{buildroot}/%{python3_sitelib}/tracer -cp -a bin/tracer.py %{buildroot}/%{_bindir}/tracer + +cp -a bin/tracer-2 %{buildroot}/%{_bindir}/ +cp -a bin/tracer-3 %{buildroot}/%{_bindir}/ +ln -s %{_bindir}/tracer-2 %{buildroot}/%{_bindir}/tracer + cp -a data/* %{buildroot}/%{_datadir}/tracer/ cp -ar tracer/* tests %{buildroot}/%{python2_sitelib}/tracer/ cp -ar tracer/* tests %{buildroot}/%{python3_sitelib}/tracer/ @@ -70,17 +106,30 @@ make DESTDIR=%{buildroot}/usr/share/ mo %find_lang %{name} -%files -f %{name}.lang -%doc LICENSE README.md -%doc %{_mandir}/man8/tracer.8* +%files -n python2-%{name} -f %{name}.lang +%license LICENSE +%doc README.md +%{python2_sitelib}/tracer +%{_bindir}/tracer-2 %{_bindir}/tracer %{_datadir}/tracer/ -%{python2_sitelib}/tracer/ -%{python3_sitelib}/tracer/ +%doc %{_mandir}/man8/tracer.8* + +%files -n python3-%{name} -f %{name}.lang +%license LICENSE +%doc README.md +%{python3_sitelib}/tracer +%{_bindir}/tracer-3 +%{_datadir}/tracer/ +%doc %{_mandir}/man8/tracer.8* + %changelog -* Tue Jul 19 2016 Fedora Release Engineering - 0.6.9-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages +* Mon Aug 01 2016 Jakub Kadlčík 0.6.10-1 +- Split RPM package into separate python2 and python3 subpackages + (frostyx@email.cz) +- Fix localization errors from exception texts (frostyx@email.cz) +- Release for F23, F24 and rawhide (frostyx@email.cz) * Thu Apr 14 2016 Jakub Kadlčík 0.6.9-1 - Declare official python3 support (frostyx@email.cz)