diff --git a/allow_setup.py_call.patch b/allow_setup.py_call.patch deleted file mode 100644 index 0ce860e..0000000 --- a/allow_setup.py_call.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- setup.py 2017-09-05 22:16:11.104383219 +0200 -+++ setup.py 2017-09-05 22:45:17.009573847 +0200 -@@ -25,21 +25,18 @@ - Do not use directly. - ''' - --import distutils -+import setuptools - import glob - import sys - - ... # Python 3 is required - --if 'setuptools' not in sys.modules: -- raise RuntimeError(' '.join(__doc__.strip().splitlines())) -- - def get_version(): - with open('doc/changelog', 'rt', encoding='UTF-8') as file: - line = file.readline() - return line.split()[1].strip('()') - --distutils.core.setup( -+setuptools.setup( - name='mwic', - version=get_version(), - license='MIT License', diff --git a/mwic-0.7.3.tar.gz.asc b/mwic-0.7.3.tar.gz.asc new file mode 100644 index 0000000..1a8e2c5 --- /dev/null +++ b/mwic-0.7.3.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEzbWhJDrNtjAJrQchLU6zpgFUdfUFAljTt/kACgkQLU6zpgFU +dfVUyA//VdE2ZufWHMDDLf07FMuZGjOpWVyGNAKhV2nGjjl6wBUya5XPdlyn3DRM +D9sMlfWqJd/GPGMUl6MwBCmqJJgZaV/m5TTPDqg3PnWslkSlYT1iM+ixb/ycgZaK +SAAkrZck5LUhm7xjs8BP6xTXDK8/mxIbU8COSfG8wfXp9A2rnwmJpBP8S+LgwKH2 +1BMRrcLGatr9HTSiygbpOmePG9l6rCQVBp7bOxRUucRd1DrrCnRolkmJ6RANBHvU +c7G6z1BJyc++lnzBs6ki28mRVVZ1L/n6aYnVK3SDuk1VlXfcsW+3zNIN2q3yqaJ+ +oGxABLJdfqAjuR3ood+bXpitcrEAQVxNKHUkoEpSSRTuoA+2pvayhAHU4IsiJLEx +/ttRwCyG3sEp2oQJDani7BvSopbU4G/JrQAW3pLAdOh2hxWnY8ISxYlTMsDmdFsd +3iFytekxGUYUAD2hYlEKrTMa2EfCzJR/ekHP+chE+krv3DaLi2m/ei+xbpuOtd1b +R8+zm0xpGszLM1mD7wl0iYm2ztt0pSLWUBgVCs/ickSN9FmnOKsFMRYHQtf1i42a +Me5EMQKXU6TQFWjv09q/u+t/6Fksap+RXZzATirRuFtbX8kNpy7SjgvmofKdcWQC +0IWqJh6jAARJey/bX961eE1+uQVFq5h4ITFMYaL2SL2/O7VMRvU= +=zPfC +-----END PGP SIGNATURE----- diff --git a/mwic.changes b/mwic.changes index 539ef91..4dc623d 100644 --- a/mwic.changes +++ b/mwic.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 24 12:31:10 UTC 2017 - sebix+novell.com@sebix.at + +- use packaged method to install the package + * remove all patches +- validate source file + ------------------------------------------------------------------- Tue Sep 5 20:06:14 UTC 2017 - sebix+novell.com@sebix.at diff --git a/mwic.keyring b/mwic.keyring new file mode 100644 index 0000000..c722536 --- /dev/null +++ b/mwic.keyring @@ -0,0 +1,84 @@ +pub rsa4096/0x2D4EB3A6015475F5 2009-10-23 [SC] [expires: 2018-01-01] + CDB5A1243ACDB63009AD07212D4EB3A6015475F5 +uid [ unknown] Jakub Wilk +uid [ unknown] Jakub Wilk +uid [ unknown] Jakub Wilk +sub rsa4096/0x49A526BFE5874F63 2009-10-23 [E] + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +i0i3KQXs09FW/+n9DTw= +=R8Zy +-----END PGP PUBLIC KEY BLOCK----- diff --git a/mwic.spec b/mwic.spec index f55dacc..7f0e6dd 100644 --- a/mwic.spec +++ b/mwic.spec @@ -24,13 +24,11 @@ Summary: Misspelled Words In Context License: MIT Group: Productivity/Office/Other Url: http://jwilk.net/software/mwic -Source: https://github.com/jwilk/mwic/releases/download/0.7.3/mwic-0.7.3.tar.gz -# PATCH-FIX-UPSTREAM wip-pip.patch sebix+novell.com@sebix.at -- Allow installation with pip -Patch0: https://github.com/jwilk/mwic/compare/wip/pip.patch#/wip-pip.patch -# PATCH-FIX-OPENSUSE allow_setup.py_call.patch sebix+novell.com@sebix.at -- Allow direct call to setup.py -Patch1: allow_setup.py_call.patch +Source: https://github.com/jwilk/mwic/releases/download/%{version}/mwic-%{version}.tar.gz +Source1: https://github.com/jwilk/mwic/releases/download/%{version}/mwic-%{version}.tar.gz.asc +Source2: %{name}.keyring BuildRequires: python3-devel >= 3.2 -BuildRequires: python3-setuptools +BuildRequires: gpg-offline Requires: python3-pyenchant Requires: python3-regex BuildArch: noarch @@ -40,20 +38,20 @@ mwic is a spell-checker that groups possible misspellings and shows them in thei %prep %setup -q -%patch0 -p1 -%patch1 +%gpg_verify %{SOURCE0} %build -python3 setup.py build +# not needed %install -python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +make DESTDIR=%{buildroot} PREFIX=/usr -C doc +%{make_install} PREFIX=/usr %files %doc doc/changelog %license doc/LICENSE -%{python3_sitelib}/* %{_bindir}/mwic +%{_prefix}/share/mwic %{_mandir}/man1/mwic.1%{?ext_man} %changelog diff --git a/wip-pip.patch b/wip-pip.patch deleted file mode 100644 index 96ffe6e..0000000 --- a/wip-pip.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 560987ccecfdb93a6abb458084abe92baa3b8ea3 Mon Sep 17 00:00:00 2001 -From: Jakub Wilk -Date: Tue, 30 May 2017 01:59:41 +0200 -Subject: [PATCH] setup: add. - ---- - setup.py | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 60 insertions(+) - create mode 100644 setup.py - -diff --git a/setup.py b/setup.py -new file mode 100644 -index 0000000..69b8769 ---- /dev/null -+++ b/setup.py -@@ -0,0 +1,60 @@ -+# encoding=UTF-8 -+ -+# Copyright © 2016-2017 Jakub Wilk -+# -+# Permission is hereby granted, free of charge, to any person obtaining a copy -+# of this software and associated documentation files (the “Software”), to deal -+# in the Software without restriction, including without limitation the rights -+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+# copies of the Software, and to permit persons to whom the Software is -+# furnished to do so, subject to the following conditions: -+# -+# The above copyright notice and this permission notice shall be included in -+# all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+# SOFTWARE. -+ -+''' -+This setup script is only for pip. -+Do not use directly. -+''' -+ -+import distutils -+import glob -+import sys -+ -+... # Python 3 is required -+ -+if 'setuptools' not in sys.modules: -+ raise RuntimeError(' '.join(__doc__.strip().splitlines())) -+ -+def get_version(): -+ with open('doc/changelog', 'rt', encoding='UTF-8') as file: -+ line = file.readline() -+ return line.split()[1].strip('()') -+ -+distutils.core.setup( -+ name='mwic', -+ version=get_version(), -+ license='MIT License', -+ description='Misspelled Words In Context', -+ url='http://jwilk.net/software/mwic', -+ author='Jakub Wilk', -+ author_email='jwilk@jwilk.net', -+ packages=['_mwic', '_mwic.lib'], -+ package_dir={'_mwic': ''}, -+ package_data={'_mwic': ['dict/*']}, -+ data_files=[('share/man/man1', glob.glob('doc/*.1'))], -+ entry_points=dict( -+ console_scripts=['mwic = _mwic.lib.cli:main'] -+ ), -+ install_requires=['pyenchant', 'regex'], -+) -+ -+# vim:ts=4 sts=4 sw=4 et