packages: newt/newt-make.patch, newt/newt-nopython.patch, newt/newt.spec, n...
qboosh
qboosh at pld-linux.org
Fri Jul 1 18:11:44 CEST 2011
Author: qboosh Date: Fri Jul 1 16:11:44 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 0.52.13
- updated nopython,make patches
- added multipython patch (fixes configure/make when multiple python versions found; but snack module is not ready for python3)
---- Files affected:
packages/newt:
newt-make.patch (1.3 -> 1.4) , newt-nopython.patch (1.4 -> 1.5) , newt.spec (1.98 -> 1.99) , newt-multipython.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/newt/newt-make.patch
diff -u packages/newt/newt-make.patch:1.3 packages/newt/newt-make.patch:1.4
--- packages/newt/newt-make.patch:1.3 Fri Nov 5 16:53:15 2010
+++ packages/newt/newt-make.patch Fri Jul 1 18:11:38 2011
@@ -1,53 +1,53 @@
---- newt-0.52.12/Makefile.in.orig 2010-11-05 17:25:34.729541330 +0200
-+++ newt-0.52.12/Makefile.in 2010-11-05 17:29:33.376208002 +0200
-@@ -54,19 +54,19 @@
+--- newt-0.52.13/Makefile.in.orig 2011-06-30 21:15:08.000000000 +0200
++++ newt-0.52.13/Makefile.in 2011-07-01 16:19:26.323188560 +0200
+@@ -63,19 +63,19 @@
all: $(TARGET) $(SNACKSO)
test: test.o $(LIBNEWT)
-- $(CC) -g -o test test.o $(LIBNEWT) $(LIBS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -o test test.o $(LIBNEWT) $(LIBS)
+- $(CC) -g -o test test.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
++ $(CC) $(CFLAGS) -o test test.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
testgrid: testgrid.o $(LIBNEWT)
-- $(CC) -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
+- $(CC) -g -o testgrid testgrid.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
++ $(CC) $(CFLAGS) -o testgrid testgrid.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
testtree: testtree.o $(LIBNEWT)
-- $(CC) -g -o testtree testtree.o $(LIBNEWT) $(LIBS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -o testtree testtree.o $(LIBNEWT) $(LIBS)
+- $(CC) -g -o testtree testtree.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
++ $(CC) $(CFLAGS) -o testtree testtree.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
showchars: showchars.o $(LIBNEWT)
-- $(CC) -g -o showchars showchars.o $(LIBNEWT) $(LIBS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -o showchars showchars.o $(LIBNEWT) $(LIBS)
+- $(CC) -g -o showchars showchars.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
++ $(CC) $(CFLAGS) -o showchars showchars.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
showkey: showkey.o $(LIBNEWT)
-- $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LIBS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -o showkey showkey.o $(LIBNEWT) $(LIBS)
+- $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
++ $(CC) $(CFLAGS) -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
_snackmodule.so: snackmodule.c $(LIBNEWTSH)
- for ver in $(PYTHONVERS) ; do \
-@@ -77,16 +77,16 @@
+ [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
+@@ -90,16 +90,16 @@
touch $@
whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
-- $(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt
+- $(CC) -g -o whiptail $(NDIALOGOBJS) -L. $(LDFLAGS) -lnewt $(LIBS) -lpopt
++ $(CC) $(CFLAGS) -o whiptail $(NDIALOGOBJS) -L. $(LDFLAGS) -lnewt $(LIBS) -lpopt
whiptcl.o: whiptcl.c
- gcc -fPIC $(CFLAGS) -c whiptcl.c
-+ $(CC) -fPIC $(CFLAGS) $(CPPFLAGS) -c whiptcl.c
++ $(CC) -fPIC $(CFLAGS) -c whiptcl.c
dialogboxes.o: dialogboxes.c
- gcc -fPIC $(CFLAGS) -c dialogboxes.c
+ $(CC) -fPIC $(CFLAGS) -c dialogboxes.c
whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
-- $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt $(LIBTCL) -lpopt
-+ $(CC) -shared $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt $(LIBTCL) -lpopt
+- $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
++ $(CC) -shared $(SHCFLAGS) $(CFLAGS) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
$(LIBNEWT): $(LIBOBJS)
ar rv $@ $^
-@@ -101,14 +101,15 @@
- $(SHAREDDIR)/*.o *.so* *.pc
+@@ -114,15 +114,16 @@
+ $(SHAREDDIR)/*.o *.so*
depend:
- $(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend
@@ -61,7 +61,9 @@
sharedlib: $(LIBNEWTSH)
-$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
+- $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
+$(LIBNEWTSH): .shared.dir $(SHAREDOBJS)
- $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(LIBS)
++ $(CC) -shared -o $(LIBNEWTSH) $(CFLAGS) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
ln -fs $(LIBNEWTSONAME) libnewt.so
ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
+
================================================================
Index: packages/newt/newt-nopython.patch
diff -u packages/newt/newt-nopython.patch:1.4 packages/newt/newt-nopython.patch:1.5
--- packages/newt/newt-nopython.patch:1.4 Tue Aug 19 21:25:38 2008
+++ packages/newt/newt-nopython.patch Fri Jul 1 18:11:38 2011
@@ -1,6 +1,6 @@
---- newt-0.52.10/Makefile.in.orig 2008-08-19 20:45:13.753250367 +0200
-+++ newt-0.52.10/Makefile.in 2008-08-19 20:45:13.817251205 +0200
-@@ -13,6 +13,7 @@
+--- newt-0.52.13/Makefile.in.orig 2011-06-30 20:14:00.860766835 +0200
++++ newt-0.52.13/Makefile.in 2011-06-30 21:14:35.674221877 +0200
+@@ -14,6 +14,7 @@
PYTHONVERS = @PYTHONVERS@
WHIPTCLSO = @WHIPTCLSO@
@@ -8,7 +8,7 @@
PROGS = test whiptail $(WHIPTCLSO) testgrid testtree showchars showkey
TESTOBJS = test.o testgrid.o testtree.o showchars.o showkey.o
-@@ -49,7 +50,7 @@
+@@ -59,7 +60,7 @@
TARGET=depend $(PROGS)
endif
@@ -16,20 +16,13 @@
+all: $(TARGET) $(SNACKSO)
test: test.o $(LIBNEWT)
- $(CC) -g -o test test.o $(LIBNEWT) $(LIBS)
-@@ -125,13 +126,13 @@
- install -m 644 whiptail.1 $(instroot)/$(man1dir)
+ $(CC) -g -o test test.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
+@@ -141,7 +142,7 @@
make -C po datadir=$(instroot)/$(datadir) install
+ install -m 644 libnewt.pc $(instroot)/$(pkgconfigdir)
-install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so
+install-sh: sharedlib $(WHIPTCLSO) $(SNACKSO)
[ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so
- ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
- [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || :
-- for ver in $(PYTHONVERS) ; do \
-+ [ -z "$(SNACKSO)" ] || for ver in $(PYTHONVERS) ; do \
- [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
- install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\
- install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
================================================================
Index: packages/newt/newt.spec
diff -u packages/newt/newt.spec:1.98 packages/newt/newt.spec:1.99
--- packages/newt/newt.spec:1.98 Sat Jan 29 01:07:04 2011
+++ packages/newt/newt.spec Fri Jul 1 18:11:38 2011
@@ -1,7 +1,7 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_without python # don't build Python module
+%bcond_without python # don't build Python 2 module
%bcond_without tcl # build Tcl module
#
Summary: Not Erik's Windowing Toolkit - text mode windowing with slang
@@ -10,16 +10,17 @@
Summary(pl.UTF-8): Not Erik's Windowing Toolkit - okna w trybie tekstowym ze slangiem
Summary(tr.UTF-8): Not Erik's Windowing Toolkit - metin kipi pencereleme sistemi
Name: newt
-Version: 0.52.12
+Version: 0.52.13
Release: 1
License: LGPL
Group: Libraries
Source0: https://fedorahosted.org/releases/n/e/newt/%{name}-%{version}.tar.gz
-# Source0-md5: 51b04128d9e1bf000fa769c417b74486
-Patch1: %{name}-0.51.6-if1close.patch
-Patch2: %{name}-PIC.patch
-Patch4: %{name}-nopython.patch
-Patch5: %{name}-make.patch
+# Source0-md5: 77de05b3f58540152a4ae32a1a64e5d0
+Patch0: %{name}-0.51.6-if1close.patch
+Patch1: %{name}-PIC.patch
+Patch2: %{name}-nopython.patch
+Patch3: %{name}-make.patch
+Patch4: %{name}-multipython.patch
URL: https://fedorahosted.org/newt/
BuildRequires: autoconf >= 2.50
BuildRequires: docbook-utils
@@ -159,10 +160,11 @@
%prep
%setup -q
+%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch4 -p1
-%patch5 -p1 -b .orig
%{__sed} -i -e 's,^#include <slang.h>$,#include <slang/slang.h>,g' dialogboxes.c
@@ -173,7 +175,7 @@
%{!?with_tcl:--without-tcl}
%{__make} \
- PYTHONVERS=python%{py_ver} \
+ PYTHONVERS="python%{py_ver}" \
LIBTCL=-ltcl \
%{!?with_python:SNACKSO=}
@@ -181,7 +183,7 @@
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- PYTHONVERS=python%{py_ver} \
+ PYTHONVERS="python%{py_ver}" \
%{!?with_tcl:WHIPTCLSO=} \
%{!?with_python:SNACKSO=} \
instroot=$RPM_BUILD_ROOT \
@@ -193,8 +195,8 @@
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_postclean
-# error: newt-0.52.10-1: req /usr/share/locale/bal/LC_MESSAGES not found
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/bal
+# not supported
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/bal
#it just plain doesn't work... fix it if you can
#sgml2txt tutorial.sgml
@@ -246,6 +248,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.99 2011/07/01 16:11:38 qboosh
+- updated to 0.52.13
+- updated nopython,make patches
+- added multipython patch (fixes configure/make when multiple python versions found; but snack module is not ready for python3)
+
Revision 1.98 2011/01/29 00:07:04 sparky
- dropped pre-cvs changelog
================================================================
Index: packages/newt/newt-multipython.patch
diff -u /dev/null packages/newt/newt-multipython.patch:1.1
--- /dev/null Fri Jul 1 18:11:44 2011
+++ packages/newt/newt-multipython.patch Fri Jul 1 18:11:38 2011
@@ -0,0 +1,11 @@
+--- newt-0.52.13/configure.ac.orig 2011-06-27 14:24:04.000000000 +0200
++++ newt-0.52.13/configure.ac 2011-07-01 16:50:00.686583314 +0200
+@@ -59,7 +59,7 @@
+ AC_MSG_RESULT([skipped])
+ PYTHONVERS=
+ else
+- PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
++ PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" | tr '\n' ' ')
+ AC_MSG_RESULT([$PYTHONVERS])
+ fi
+ AC_SUBST([PYTHONVERS])
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/newt/newt-make.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/newt/newt-nopython.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/newt/newt.spec?r1=1.98&r2=1.99&f=u
More information about the pld-cvs-commit
mailing list