Compare commits

...

5 Commits

Author SHA1 Message Date
Gregory Hellings 325ed816fb Reverted some rawhide changes not for EPEL 2018-03-27 10:13:39 -05:00
Gregory Hellings 63e674a967 Merge branch 'master' into epel7 2018-03-27 09:55:06 -05:00
Greg Hellings 4c523e3197 Merge branch 'master' into epel7
Conflicts:
	sword.spec
2016-02-08 17:12:40 +00:00
Matěj Cepl b00b784faf Merge branch 'master' into epel7 2014-11-03 12:03:13 +01:00
Christopher Meng 67e63a8397 Cleanup. 2014-08-05 17:45:02 +08:00
1 changed files with 8 additions and 19 deletions

View File

@ -55,19 +55,12 @@ a packaged release as updates to the utilities do not affect the
release schedule of the library. However, these utilities were the
latest at the time of the current library release.
%package -n python2-sword
%{?python_provide:%python_provide python2-sword}
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Provides: python-%{name}
Obsoletes: %{name}-python < %{version}-%{release}
Obsoletes: python-%{name} < %{version}-%{release}
%package python
Summary: Python bindings for Sword
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: python2
Requires: python
%description -n python2-sword
%description python
Python bindings for The SWORD Library.
%prep
@ -95,6 +88,10 @@ mkdir -p %{buildroot}%{_datadir}/sword/modules
find %{buildroot} -type f -name "*.la" -delete -print
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%check
make tests
@ -132,7 +129,7 @@ make tests
%{_bindir}/mod2osis
%{_bindir}/emptyvss
%files -n python2-sword
%files python
%{python2_sitearch}/Sword.py
%{python2_sitearch}/Sword.pyc
%{python2_sitearch}/Sword.pyo
@ -142,7 +139,6 @@ make tests
%changelog
* Sun Feb 18 2018 Gregory Hellings <greg.hellings@gmail.com> - 1.8.1-3
- Remove post/postun for F28+
- Rename python-sword to python2-sword
- Add BR for gcc/g++ per F28+ changes
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org>
@ -164,10 +160,6 @@ make tests
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.7.4-14
- Add Provides for the old name without %%_isa
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.7.4-13
- Python 2 binary package renamed to python2-sword
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
@ -234,9 +226,6 @@ make tests
* Sat Aug 02 2014 Christopher Meng <rpm@cicku.me> - 1.7.3-3
- devel subpkg cleanup
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue May 06 2014 Greg Hellings <greg.hellings@gmail.com> - 1.7.3-1
- New upstream version