Compare commits

...

No commits in common. 'c9' and 'i8c' have entirely different histories.
c9 ... i8c

2
.gitignore vendored

@ -1 +1 @@
SOURCES/newt-0.52.21.tar.gz
SOURCES/newt-0.52.20.tar.gz

@ -1 +1 @@
b21152ad289bb0e363357ba3325a0b9c493d5ed1 SOURCES/newt-0.52.21.tar.gz
aec1a633abe595eadb55e568b759e7188d2a6766 SOURCES/newt-0.52.20.tar.gz

@ -0,0 +1,25 @@
commit ddc56f06b629aad44d0cf7e9d15a5cc1114b72c9
Author: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon May 27 13:34:54 2019 +0200
fix radio button selection check in snack
https://pagure.io/newt/issue/1
diff --git a/snack.c b/snack.c
index 880a431..c253f0c 100644
--- a/snack.c
+++ b/snack.c
@@ -1096,7 +1096,11 @@ static PyObject * widget_get_radioValue(PyObject *self, void *closure)
{
snackWidget *w = (snackWidget *)self;
- return Py_BuildValue("i", newtRadioGetCurrent(w->co));
+#if SIZEOF_VOID_P <= SIZEOF_LONG
+ return Py_BuildValue("l", (long)newtRadioGetCurrent(w->co));
+#else
+ return Py_BuildValue("L", (long long)newtRadioGetCurrent(w->co));
+#endif
}
static void widgetDestructor(PyObject * o) {

@ -0,0 +1,24 @@
commit 1321e6f91a45e1c06ad648b348503a7754be5b83
Author: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue Oct 1 16:37:55 2019 +0200
don't ignore CFLAGS when building snack
In addition to the flags returned by python-config --cflags, use the
user-specified CFLAGS when building the snack object.
diff --git a/Makefile.in b/Makefile.in
index f6df602..f991184 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,8 +95,8 @@ _snack.$(SOEXT): snack.c $(LIBNEWTSH)
PIFLAGS=`$$pyconfig --includes`; \
PLDFLAGS=`$$pyconfig --ldflags`; \
PLFLAGS=`$$pyconfig --libs`; \
- echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
- $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+ echo $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+ $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
$(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
done || :

@ -1,24 +1,33 @@
%if !(0%{?fedora} >= 32 || 0%{?rhel} >= 8)
%if ! 0%{?rhel} >= 8
%global with_python2 1
%endif
Summary: A library for text mode user interfaces
Name: newt
Version: 0.52.21
Version: 0.52.20
Release: 11%{?dist}
License: LGPLv2
Group: System Environment/Libraries
URL: https://pagure.io/newt
Source: https://pagure.io/releases/newt/newt-%{version}.tar.gz
BuildRequires: make
# Fix radio button selection check in snack
Patch1: newt-radio.patch
# Don't ignore CFLAGS when building snack
Patch2: newt-snackflags.patch
BuildRequires: gcc popt-devel python3-devel slang-devel
%{?with_python2:BuildRequires: python2-devel}
BuildRequires: docbook-utils
# Prefer lynx over other packages providing text-www-browser
BuildRequires: lynx
# static subpackage was dropped in 0.52.20-8
Obsoletes: %{name}-static < 0.52.20-8
%package devel
Summary: Newt windowing toolkit development files
Requires: slang-devel %{name}%{?_isa} = %{version}-%{release}
Group: Development/Libraries
%Description
Newt is a programming library for color text mode, widget based user
@ -44,7 +53,9 @@ newt.
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
Summary: Python 2 bindings for newt
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python2-newt
@ -57,8 +68,10 @@ providing a python API for creating text mode interfaces.
# Remove before F30
Provides: %{name}-python3 = %{version}-%{release}
Provides: %{name}-python3%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python3 < %{version}-%{release}
Provides: snack = %{version}-%{release}
Summary: Python 3 bindings for newt
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python3-newt
@ -67,17 +80,19 @@ providing a python API for creating text mode interfaces.
%prep
%setup -q
%patch1 -p1 -b .radio
%patch2 -p1 -b .snackflags
%build
# gpm support seems to smash the stack w/ we use help in anaconda??
# --with-gpm-support
%configure --without-tcl
%make_build all
make %{?_smp_mflags} all
chmod 0644 peanuts.py popcorn.py
docbook2txt tutorial.sgml
%install
%make_install
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_libdir}/libnewt.a
%find_lang %{name}
@ -110,55 +125,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libnewt.a
%{python3_sitearch}/__pycache__/*.py*
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.52.21-11
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.52.21-10
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.52.21-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.52.21-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.52.21-7
- Rebuilt for Python 3.9
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.52.21-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Oct 21 2019 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.21-5
- disable python2 subpackage on fedora >= 32 (#1763073)
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.52.21-4
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.52.21-3
- Rebuilt for Python 3.8
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.52.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon May 27 2019 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.21-1
- update to 0.52.21
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.52.20-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Oct 17 2018 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.20-13
- move snack provides to python3-newt subpackage
- drop obsoletes for migrating from Fedora 27 and earlier
* Mon Jul 16 2018 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.20-12
- fix conditional enabling python2 subpackage (#1600446)
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 0.52.20-11
- Rebuilt for MSVSphere 8.8
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.52.20-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Oct 02 2019 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.20-11
- don't ignore CFLAGS when building snack (#1757093)
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.52.20-10
- Rebuilt for Python 3.7
* Mon Sep 30 2019 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.20-10
- move snack provides to python3-newt subpackage (#1640153)
- fix radio button selection check in snack (#1714517)
* Mon Mar 26 2018 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.20-9
- don't build python2 subpackage on rhel >= 8

Loading…
Cancel
Save