diff --git a/langtable.spec b/langtable.spec index e7cfdf7..c78ec30 100644 --- a/langtable.spec +++ b/langtable.spec @@ -6,7 +6,7 @@ Name: langtable Version: 0.0.34 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Guessing reasonable defaults for locale, keyboard layout, territory, and language. Group: Development/Tools # the translations in languages.xml and territories.xml are (mostly) @@ -66,30 +66,20 @@ This package contains the data files for langtable. %prep %setup -q -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif # with_python3 - %build perl -pi -e "s,_datadir = '(.*)',_datadir = '%{_datadir}/langtable'," langtable.py -%{__python} setup.py build +%py2_build %if 0%{?with_python3} -pushd %{py3dir} -perl -pi -e "s,_datadir = '(.*)',_datadir = '%{_datadir}/langtable'," langtable.py -%{__python3} setup.py build -popd +%py3_build %endif # with_python3 %install -%{__python} setup.py install --skip-build --prefix=%{_prefix} --install-data=%{_datadir}/langtable --root $RPM_BUILD_ROOT +%py2_install -- --install-data=%{_datadir}/langtable gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/langtable/*.xml %if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install --skip-build --prefix=%{_prefix} --install-data=%{_datadir}/langtable --root $RPM_BUILD_ROOT -popd +%py3_install -- --install-data=%{_datadir}/langtable # the .xml files copied by the “python3 setup.py install” are identical # to those copied in the “python2 setup.py install”, # it does not hurt to gzip them again: @@ -97,7 +87,7 @@ gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/langtable/*.xml %endif # with_python3 %check -(cd $RPM_BUILD_DIR/%{name}-%{version}/data; PYTHONPATH=.. %{__python} ../test_cases.py; %{__python} ../langtable.py) +(cd $RPM_BUILD_DIR/%{name}-%{version}/data; PYTHONPATH=.. %{__python2} ../test_cases.py; %{__python2} ../langtable.py) %if 0%{?with_python3} (cd $RPM_BUILD_DIR/%{name}-%{version}/data; LC_CTYPE=en_US.UTF-8 PYTHONPATH=.. %{__python3} ../test_cases.py; %{__python3} ../langtable.py) %endif # with_python3 @@ -108,7 +98,8 @@ xmllint --noout --relaxng $RPM_BUILD_ROOT/%{_datadir}/langtable/schemas/timezone xmllint --noout --relaxng $RPM_BUILD_ROOT/%{_datadir}/langtable/schemas/timezones.rng $RPM_BUILD_ROOT/%{_datadir}/langtable/timezones.xml.gz %files -%doc README COPYING ChangeLog unicode-license.txt test_cases.py +%license COPYING unicode-license.txt +%doc README ChangeLog test_cases.py %dir %{_datadir}/langtable/ %{_datadir}/langtable/schemas @@ -117,7 +108,9 @@ xmllint --noout --relaxng $RPM_BUILD_ROOT/%{_datadir}/langtable/schemas/timezone %if 0%{?with_python3} %files python3 -%{python3_sitelib}/* +%{python3_sitelib}/langtable.py +%{python3_sitelib}/langtable-*.egg-info +%{python3_sitelib}/__pycache__/* %endif # with_python3 %files data @@ -125,6 +118,10 @@ xmllint --noout --relaxng $RPM_BUILD_ROOT/%{_datadir}/langtable/schemas/timezone %{_datadir}/langtable/*.xml.gz %changelog +* Wed Feb 3 2016 Orion Poplawski - 0.0.34-3 +- Modernize spec +- Fix python3 package file ownership + * Tue Nov 03 2015 Robert Kuska - 0.0.34-2 - Rebuilt for Python3.5 rebuild