- up to 0.9.6, noarch

- documentation is gone from the package

diff --git a/python-eyeD3-pyc.patch b/python-eyeD3-pyc.patch
deleted file mode 100644 (file)
index d5a00eb..0000000
--- a/python-eyeD3-pyc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- eyeD3-0.8/src/eyed3/plugins/__init__.py.orig       2017-03-12 23:18:52.000000000 +0100
-+++ eyeD3-0.8/src/eyed3/plugins/__init__.py    2019-02-24 18:04:20.190456261 +0100
-@@ -50,11 +50,10 @@
- 
-     def _isValidModule(f, d):
-         '''Determine if file ``f`` is a valid module file name.'''
--        # 1) tis a file
-+        # 1) is a file
-         # 2) does not start with '_', or '.'
--        # 3) avoid the .pyc dup
-         return bool(os.path.isfile(os.path.join(d, f)) and
--                    f[0] not in ('_', '.') and f.endswith(".py"))
-+                    f[0] not in ('_', '.') and (f.endswith(".py") or f.endswith(".pyc")))
- 
-     log.debug("Extra plugin paths: %s" % paths)
-     for d in [os.path.dirname(__file__)] + (paths if paths else []):
-@@ -65,11 +64,16 @@
-         if d not in sys.path:
-             sys.path.append(d)
-         try:
-+            loaded = set()
-             for f in os.listdir(d):
-                 if not _isValidModule(f, d):
-                     continue
- 
-                 mod_name = os.path.splitext(f)[0]
-+                if mod_name in loaded:
-+                    continue
-+                loaded.add(mod_name)
-+
-                 try:
-                     mod = __import__(mod_name, globals=globals(),
-                                      locals=locals())

diff --git a/python-eyeD3.spec b/python-eyeD3.spec
index d067e4da87d2507bfc7687c31fbdd2b48e0bc235..4a04c4cf499ce1a0f9343bb92c2ec44660045eac 100644 (file)
--- a/python-eyeD3.spec
+++ b/python-eyeD3.spec
@@ -2,7 +2,6 @@
 # -    python2 requires pathlib
 #
 # Conditional build:
-%bcond_without doc     # Sphinx HTML documentation
 %bcond_with    tests   # unit tests
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
@@ -11,13 +10,12 @@
 Summary:       Python 2 module for manipulating ID3 informational tags on MP3 audio files
 Summary(pl.UTF-8):     Moduł Pythona 2 służący do operacji na znacznikach ID3 plików MP3
 Name:          python-%{module}
-Version:       0.8
-Release:       4
+Version:       0.9.6
+Release:       1
 License:       GPL v3
 Group:         Development/Languages/Python
 Source0:       http://eyed3.nicfit.net/releases/%{module}-%{version}.tar.gz
-# Source0-md5: 840626686e6b1bc6afca9eab99a0873a
-Patch0:                %{name}-pyc.patch
+# Source0-md5: 4e5ee817d59ad94a39301ee981171990
 URL:           http://eyed3.nicfit.net/
 %if %{with tests} && %(locale -a | grep -q '^C\.UTF-8$'; echo $?)
 BuildRequires: glibc-localedb-all
@@ -48,13 +46,10 @@ BuildRequires:      python3-six >= 1.10.0
 %endif
 %endif
 BuildRequires: rpm-pythonprov
-%if %{with doc}
-BuildRequires: python3-sphinx_issues
-BuildRequires: python3-sphinxcontrib-bitbucket
-BuildRequires: sphinx-pdg
-%endif
 Requires:      python-modules >= 1:2.7
 Requires:      python-six >= 1.10.0
+Obsoletes:     python-eyeD3-apidocs < 0.9.6
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -89,20 +84,8 @@ przetwarzający znaczniki ID3. Dostarczana jest także informacja o
 samych plikach MP3 (długość, częstotliwość próbkowania itp.).
 Obsługiwane są znaczniki ID3 w wersjach v1.0/v1.1 i v2.3/v2.4.
 
-%package apidocs
-Summary:       API documentation for Python eyeD3 module
-Summary(pl.UTF-8):     Dokumentacja API modułu Pythona eyeD3
-Group:         Documentation
-
-%description apidocs
-API documentation for Python eyeD3 module.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API modułu Pythona eyeD3.
-
 %prep
 %setup -q -n %{module}-%{version}
-%patch0 -p1
 
 %build
 export LC_ALL=C.UTF-8
@@ -115,16 +98,9 @@ export LC_ALL=C.UTF-8
 %py3_build %{?with_tests:test}
 %endif
 
-%if %{with doc}
-%{__make} -C docs html \
-       PYTHONPATH=$(pwd)/src
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export LC_ALL=C.UTF-8
-
 %if %{with python3}
 %py3_install
 
@@ -141,10 +117,6 @@ export LC_ALL=C.UTF-8
 ln -sf eyeD3-py2 $RPM_BUILD_ROOT%{_bindir}/eyeD3
 %endif
 
-# missing from py install
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p docs/eyeD3.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -155,8 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/eyeD3-py2
 %attr(755,root,root) %{_bindir}/eyeD3
 %{py_sitescriptdir}/eyed3
-%{py_sitescriptdir}/eyeD3-%{version}-py*.egg-info
-%{_mandir}/man1/eyeD3.1*
+%{py_sitescriptdir}/eyed3-%{version}-py*.egg-info
 %endif
 
 %if %{with python3}
@@ -165,15 +136,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS.rst HISTORY.rst README.rst
 %attr(755,root,root) %{_bindir}/eyeD3-py3
 %{py3_sitescriptdir}/eyed3
-%{py3_sitescriptdir}/eyeD3-%{version}-py*.egg-info
+%{py3_sitescriptdir}/eyed3-%{version}-py*.egg-info
 %if %{without python2}
 %attr(755,root,root) %{_bindir}/eyeD3
-%{_mandir}/man1/eyeD3.1*
 %endif
 %endif
-
-%if %{with doc}
-%files apidocs
-%defattr(644,root,root,755)
-%doc docs/_build/html/{_modules,_static,plugins,*.html,*.js}
-%endif