[packages/newt] - updated to 0.52.16 - updated nopython,make patches - removed obsolete PIC patch
qboosh
qboosh at pld-linux.org
Sun Sep 1 20:34:46 CEST 2013
commit 99bd1e44e17eae1cb75da5cb66b2453d2aff6259
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 1 20:34:26 2013 +0200
- updated to 0.52.16
- updated nopython,make patches
- removed obsolete PIC patch
newt-PIC.patch | 15 ---------------
newt-make.patch | 41 +++++++++++++++--------------------------
newt-nopython.patch | 24 ++++++++++++------------
newt.spec | 12 +++++-------
4 files changed, 32 insertions(+), 60 deletions(-)
---
diff --git a/newt.spec b/newt.spec
index d14e4b9..931f403 100644
--- a/newt.spec
+++ b/newt.spec
@@ -9,17 +9,16 @@ Summary(fr.UTF-8): Not Erik's Windowing Toolkit - fenêtrage en mode texte avec
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.14
+Version: 0.52.16
Release: 1
License: LGPL
Group: Libraries
Source0: https://fedorahosted.org/releases/n/e/newt/%{name}-%{version}.tar.gz
-# Source0-md5: eb78c6bb658b92ec7198908b5b8d0e37
+# Source0-md5: 6ce923015cf87ef2c17779d24692f573
Patch0: %{name}-0.51.6-if1close.patch
-Patch1: %{name}-PIC.patch
-Patch2: %{name}-nopython.patch
-Patch3: %{name}-make.patch
-Patch4: gold.patch
+Patch1: %{name}-nopython.patch
+Patch2: %{name}-make.patch
+Patch3: gold.patch
URL: https://fedorahosted.org/newt/
BuildRequires: autoconf >= 2.50
BuildRequires: docbook-utils
@@ -163,7 +162,6 @@ przyjazny.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%{__sed} -i -e 's,^#include <slang.h>$,#include <slang/slang.h>,g' dialogboxes.c
diff --git a/newt-PIC.patch b/newt-PIC.patch
deleted file mode 100644
index a6400bf..0000000
--- a/newt-PIC.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- newt-0.50.34.orig/Makefile.in 2004-12-21 08:45:53.000000000 +0100
-+++ newt-0.50.34/Makefile.in 2004-12-21 08:55:15.992429456 +0100
-@@ -67,6 +67,12 @@
- whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
- gcc -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt
-
-+whiptcl.o: whiptcl.c
-+ gcc -fPIC $(CFLAGS) -c whiptcl.c
-+
-+dialogboxes.o: dialogboxes.c
-+ gcc -fPIC $(CFLAGS) -c dialogboxes.c
-+
- whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
- gcc -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . $(LIBNEWTSH) -ltcl -lslang -lpopt -lm
-
diff --git a/newt-make.patch b/newt-make.patch
index 598af23..2709805 100644
--- a/newt-make.patch
+++ b/newt-make.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- newt-0.52.16/Makefile.in.orig 2013-09-01 20:22:06.877393120 +0200
++++ newt-0.52.16/Makefile.in 2013-09-01 20:29:26.177374684 +0200
+@@ -69,19 +69,19 @@
all: $(TARGET) $(SNACKSO)
test: test.o $(LIBNEWT)
@@ -23,47 +23,36 @@
- $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
+ $(CC) $(CFLAGS) -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
- _snackmodule.so: snackmodule.c $(LIBNEWTSH)
- [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
-@@ -90,16 +90,16 @@
+ _snackmodule.$(SOEXT): snackmodule.c $(LIBNEWTSH)
+ @[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS); do \
+@@ -104,10 +104,10 @@
touch $@
whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
- $(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) -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) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
-+ $(CC) -shared $(SHCFLAGS) $(CFLAGS) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
+ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
+- $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
++ $(CC) -shared $(SHCFLAGS) $(CFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
$(LIBNEWT): $(LIBOBJS)
ar rv $@ $^
-@@ -114,15 +114,16 @@
- $(SHAREDDIR)/*.o *.so*
+@@ -122,7 +122,7 @@
+ $(SHAREDDIR)/*.o *.$(SOEXT)*
depend:
- $(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend
+ $(CPP) $(CPPFLAGS) -M $(SOURCES) > .depend
--$(SHAREDDIR):
-+.shared.dir:
+ $(SHAREDDIR):
mkdir -p $(SHAREDDIR)
-+ touch .shared.dir
-
+@@ -130,7 +130,7 @@
sharedlib: $(LIBNEWTSH)
--$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
+ $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
- $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
-+$(LIBNEWTSH): .shared.dir $(SHAREDOBJS)
+ $(CC) -shared -o $(LIBNEWTSH) $(CFLAGS) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
- ln -fs $(LIBNEWTSONAME) libnewt.so
+ ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
diff --git a/newt-nopython.patch b/newt-nopython.patch
index fd35cf1..20120c4 100644
--- a/newt-nopython.patch
+++ b/newt-nopython.patch
@@ -1,28 +1,28 @@
---- 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@
-+SNACKSO = _snackmodule.so
+--- newt-0.52.16/Makefile.in.orig 2013-09-01 20:20:06.584064835 +0200
++++ newt-0.52.16/Makefile.in 2013-09-01 20:21:46.550727306 +0200
+@@ -20,6 +20,7 @@
+ else
+ WHIPTCLSO =
+ endif
++SNACKSO = _snackmodule.$(SOEXT)
PROGS = test whiptail $(WHIPTCLSO) testgrid testtree showchars showkey
TESTOBJS = test.o testgrid.o testtree.o showchars.o showkey.o
-@@ -59,7 +60,7 @@
+@@ -65,7 +66,7 @@
TARGET=depend $(PROGS)
endif
--all: $(TARGET) _snackmodule.so
+-all: $(TARGET) _snackmodule.$(SOEXT)
+all: $(TARGET) $(SNACKSO)
test: test.o $(LIBNEWT)
$(CC) -g -o test test.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
-@@ -141,7 +142,7 @@
+@@ -149,7 +150,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) _snackmodule.$(SOEXT)
+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 $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.$(SOEXT)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/newt.git/commitdiff/99bd1e44e17eae1cb75da5cb66b2453d2aff6259
More information about the pld-cvs-commit
mailing list