From ad5d7b6135087cbd44cea0367552855b232ede0c Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Jan 25 2019 03:46:16 +0000 Subject: New upstream release 0.9.0 --- diff --git a/.gitignore b/.gitignore index ce1d677..773684b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ wxGlade-0.6.3tip20100625.tar.gz /wxGlade-0.7.0.tar.gz /wxGlade-0.7.2.tar.gz /wxGlade-0.8.3.zip +/wxGlade-0.9.0.zip diff --git a/fix_script.patch b/fix_script.patch deleted file mode 100644 index 35051cf..0000000 --- a/fix_script.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up wxGlade-0.8.3/wxglade.fix_script wxGlade-0.8.3/wxglade ---- wxGlade-0.8.3/wxglade.fix_script 2018-06-01 19:31:02.000000000 -0400 -+++ wxGlade-0.8.3/wxglade 2018-06-08 21:10:48.270696512 -0400 -@@ -14,7 +14,7 @@ - # 3. in a parallel Python module directory - - # search order for Python interpreter --INTERPRETER_LIST="python2 \ -+INTERPRETER_LIST="python3 \ - python2.7 python27 \ - python2.6 python26 \ - python2.5 python25 \ -@@ -32,12 +32,6 @@ for INTERPRETER in $INTERPRETER_LIST; do - continue - fi - -- # check if interpreter is for Python 2 -- ${INTERPRETER} -V 2>&1 | grep -q "Python 2" -- if [ $? -ne 0 ]; then -- continue -- fi -- - # Python 2 interpreter found - PYTHON_BIN=$INTERPRETER - -@@ -51,7 +45,7 @@ if [ ! "$PYTHON_BIN" ]; then - fi - - # determined current python version --PY_VERSION=$(${PYTHON_BIN} -c 'import sys; print sys.version[:3]') -+PY_VERSION=$(${PYTHON_BIN} -c 'import sys; print(sys.version[:3])') - - # determined prefix of the Python module directory structure - if [ -d "/usr/lib/pymodules/python${PY_VERSION}/wxglade" ]; then diff --git a/fix_setup.patch b/fix_setup.patch deleted file mode 100644 index d48afe6..0000000 --- a/fix_setup.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up wxGlade-0.8.3/setup.py.fix_setup wxGlade-0.8.3/setup.py ---- wxGlade-0.8.3/setup.py.fix_setup 2018-06-01 19:31:02.000000000 -0400 -+++ wxGlade-0.8.3/setup.py 2018-06-08 21:04:33.276474542 -0400 -@@ -86,7 +86,7 @@ the moment it can generate Python, C++, - XML resources) code.""" - - text_files = ['CHANGES.txt', 'CONTRIBUTING.txt', 'CREDITS.txt', -- 'LICENSE.txt', 'NEWS.txt', 'README.txt', 'TODO.txt', ] -+ 'LICENSE.txt', 'NEWS.txt', 'README.txt', 'docs/Todo.txt',] - - data_files = [ - ['share/wxglade/icons', glob('icons/*.*')], -@@ -98,7 +98,7 @@ data_files = [ - ['share/doc/wxglade/tutorial/img', glob('docs/img/*.*')], - ['share/doc/wxglade/manual_html', glob('docs/html/*.*')], - ['share/doc/wxglade/manual_pdf', glob('docs/pdf/*.pdf')], -- ['share/man/man1', ['docs/man/wxglade.1']], -+ ['share/man/man1', ['docs_old/man/wxglade.1']], - ] - - packages = ['wxglade.%s' % pkg for pkg in find_packages(exclude=['tests'])] diff --git a/sources b/sources index 0730c2e..88ff9f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxGlade-0.8.3.zip) = 4281e449b4c634dde73b722b150e68c8cbf2c63df346ad9683c26cc77ed40674117a51ed43b181cda1127c3fd7dbb721536b7eb64653b2df49968c2f00486461 +SHA512 (wxGlade-0.9.0.zip) = f7a1846475546276439d028a5850e089fd1c8c20abaf0998aacc01cd63ecc0e2f9fd7a013240a905c14cc49104e80e90d652563222fea9839c4f3626e6228444 diff --git a/wxGlade.spec b/wxGlade.spec index 608ce41..3d290a1 100644 --- a/wxGlade.spec +++ b/wxGlade.spec @@ -1,6 +1,6 @@ Name: wxGlade -Version: 0.8.3 -Release: 3%{?dist} +Version: 0.9.0 +Release: 1%{?dist} Summary: A wxWidgets/wxPython/wxPerl GUI designer License: MIT URL: http://wxglade.sourceforge.net @@ -13,9 +13,6 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools Requires: python3-wxpython4 -Patch0: fix_setup.patch -Patch1: fix_script.patch - %description wxGlade is a GUI designer written in Python with the popular GUI toolkit wxPython, that helps you create wxWidgets/wxPython user @@ -42,6 +39,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1} install -pm 755 -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps install -pm 644 %{S:2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps +# Install man page manually (no longer done by setup.py) +install -pDm 644 docs_old/man/wxglade.1 %{buildroot}%{_mandir}/man1/wxglade.1 + %files %{_docdir}/wxglade/ %license LICENSE.txt @@ -54,6 +54,9 @@ install -pm 644 %{S:2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jan 25 2019 Scott Talbert - 0.9.0-1 +- New upstream release 0.9.0 + * Sat Jul 14 2018 Fedora Release Engineering - 0.8.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild