rpms/newt/devel newt-0.51.6-versioned-syms.patch, NONE, 1.1 newt-0.51.6-wstrlen-private.patch, NONE, 1.1 newt.spec, 1.22, 1.23
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Sep 8 07:58:19 UTC 2005
Author: prockai
Update of /cvs/dist/rpms/newt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4975
Modified Files:
newt.spec
Added Files:
newt-0.51.6-versioned-syms.patch
newt-0.51.6-wstrlen-private.patch
Log Message:
* Fri Sep 02 2005 Petr Rockai <prockai at redhat.com>
- use versioned symbols, patch by Alastair McKinstry, mckinstry at
debian dot org, thanks
- need private wstrlen due to versioned syms, patch from debian
package of newt
- both of the above needed to be forward-ported
newt-0.51.6-versioned-syms.patch:
Makefile.in | 4 +++-
newt.0.51.ver | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
--- NEW FILE newt-0.51.6-versioned-syms.patch ---
--- /dev/null 2005-04-01 15:34:23.054668480 +0200
+++ newt-0.51.6/newt.0.51.ver 2005-09-02 10:33:53.927066344 +0200
@@ -0,0 +1,5 @@
+NEWT_0.51 {
+ global: newt*;
+ local: *;
+};
+
--- newt-0.51.6/Makefile.in.versioned-syms 2003-11-06 07:56:47.000000000 +0100
+++ newt-0.51.6/Makefile.in 2005-09-02 10:34:12.418255256 +0200
@@ -8,6 +8,7 @@
CFLAGS += -g
endif
+SHLIBFLAGS= -Wl,--version-script,newt.0.51.ver
VERSION = @VERSION@
CVSTAG = r$(subst .,-,$(VERSION))
SONAME = @SONAME@
@@ -103,7 +104,8 @@
sharedlib: $(LIBNEWTSH)
$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
- gcc -shared -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
+ #gcc -shared -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
+ $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
$(SHAREDDIR)/%.o : %.c
$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
newt-0.51.6-wstrlen-private.patch:
Makefile.in | 7 ++++---
newt.0.51.ver | 1 +
newt.c | 2 +-
newt_pr.h | 3 ++-
4 files changed, 8 insertions(+), 5 deletions(-)
--- NEW FILE newt-0.51.6-wstrlen-private.patch ---
--- newt-0.51.6/newt.c.wstrlen-private 2003-02-05 08:11:35.000000000 +0100
+++ newt-0.51.6/newt.c 2005-09-06 14:40:04.298442632 +0200
@@ -145,7 +145,7 @@
return -1;
}
-int wstrlen(const char *str, int len) {
+int _newt_wstrlen(const char *str, int len) {
mbstate_t ps;
wchar_t tmp;
int nchars = 0;
--- newt-0.51.6/newt_pr.h.wstrlen-private 2002-08-15 22:13:40.000000000 +0200
+++ newt-0.51.6/newt_pr.h 2005-09-06 14:40:04.298442632 +0200
@@ -80,6 +80,7 @@
struct eventResult newtDefaultEventHandler(newtComponent c,
struct event ev);
-int wstrlen(const char *str, int len);
+int _newt_wstrlen(const char *str, int len);
+#define wstrlen(str,len) _newt_wstrlen((str),(len))
#endif /* H_NEWT_PR */
--- newt-0.51.6/Makefile.in.wstrlen-private 2005-09-06 14:40:04.292443544 +0200
+++ newt-0.51.6/Makefile.in 2005-09-06 14:41:16.358487840 +0200
@@ -72,15 +72,15 @@
if [ ! -f "$$ver/_snackmodule.so" -o $(LIBNEWTSH) -nt "$$ver/_snackmodule.so" ]; then \
mkdir -p $$ver ;\
gcc $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
- gcc --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
+ gcc --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . -lnewt $(LIBNEWTSH) ;\
fi ; \
done
whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
- gcc -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt
+ gcc -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBNEWTSH) $(LIBS) -lpopt
whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
- gcc -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . $(LIBNEWTSH) -ltcl -lslang -lpopt -lm
+ gcc -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt $(LIBNEWTSH) -ltcl -lslang -lpopt -lm
$(LIBNEWT): $(LIBOBJS)
ar rv $@ $^
@@ -106,6 +106,7 @@
$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
#gcc -shared -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
+ ln -s $(LIBNEWTSH) libnewt.so
$(SHAREDDIR)/%.o : %.c
$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
--- newt-0.51.6/newt.0.51.ver.wstrlen-private 2005-09-06 14:40:04.291443696 +0200
+++ newt-0.51.6/newt.0.51.ver 2005-09-06 14:40:04.297442784 +0200
@@ -1,5 +1,6 @@
NEWT_0.51 {
global: newt*;
+ _newt_wstrlen;
local: *;
};
Index: newt.spec
===================================================================
RCS file: /cvs/dist/rpms/newt/devel/newt.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- newt.spec 6 Mar 2005 18:13:24 -0000 1.22
+++ newt.spec 8 Sep 2005 07:58:15 -0000 1.23
@@ -4,11 +4,13 @@
Name: newt
%define version 0.51.6
Version: %{version}
-Release: 7
+Release: 8
License: LGPL
Group: System Environment/Libraries
Source: newt-%{version}.tar.gz
Patch1: newt-0.51.6-if1close.patch
+Patch2: newt-0.51.6-versioned-syms.patch
+Patch3: newt-0.51.6-wstrlen-private.patch
BuildRequires: python,python-devel,perl, slang-devel
Requires: slang
Provides: snack
@@ -41,6 +43,8 @@
%prep
%setup -q
%patch1 -p1 -b .if1close
+%patch2 -p1 -b .versioned-syms
+%patch3 -p1 -b .wstrlen-private
%build
# gpm support seems to smash the stack w/ we use help in anaconda??
@@ -85,6 +89,13 @@
%{_libdir}/libnewt.so
%changelog
+* Fri Sep 02 2005 Petr Rockai <prockai at redhat.com>
+- use versioned symbols, patch by Alastair McKinstry, mckinstry at
+ debian dot org, thanks
+- need private wstrlen due to versioned syms, patch from debian
+ package of newt
+- both of the above needed to be forward-ported
+
* Sun Mar 06 2005 Petr Rockai <prockai at redhat.com>
- rebuild
More information about the fedora-cvs-commits
mailing list