rpms/slang
5
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 2.2.3

Browse Source
This commit is contained in:
Miroslav Lichvar 2010-12-13 16:51:47 +01:00
parent 14d4c89d8e
commit 5f3874eb9f
4 changed files with 57 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
slang-2.2.2-makefile.patch
View File

@ -1,102 +0,0 @@
diff -up slang-2.2.2/autoconf/Makefile.in.makefile slang-2.2.2/autoconf/Makefile.in
--- slang-2.2.2/autoconf/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/autoconf/Makefile.in 2009-12-07 10:02:56.000000000 +0100
@@ -47,8 +47,7 @@ help:
@echo "make check : Build the library and run the regression tests"
static: makefiles
cd src; $(MAKE) static
- cd slsh; $(MAKE) all
-elf: makefiles
+elf: makefiles static
cd src; $(MAKE) elf
cd slsh; $(MAKE) all
cd modules; $(MAKE) all
diff -up slang-2.2.2/modules/Makefile.in.makefile slang-2.2.2/modules/Makefile.in
--- slang-2.2.2/modules/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/modules/Makefile.in 2009-12-07 10:02:56.000000000 +0100
@@ -59,7 +59,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-INSTALL_MODULE = @INSTALL_MODULE@
+INSTALL_MODULE = @INSTALL@
MKINSDIR = ../autoconf/mkinsdir.sh
SLSH_DIR = $(prefix)/share/slsh
CMAPS_DIR = $(SLSH_DIR)/cmaps
@@ -73,7 +73,7 @@ DEST_SLSH_DIR = $(DESTDIR)$(SLSH_DIR)
DEST_CMAPSDIR = $(DESTDIR)$(CMAPS_DIR)
DEST_HELPDIR = $(DESTDIR)$(HELP_DIR)
#---------------------------------------------------------------------------
-RPATH = @RPATH@
+RPATH =
LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@
#LIBS = $(RPATH) $(DL_LIB) @M_LIB@
diff -up slang-2.2.2/slsh/Makefile.in.makefile slang-2.2.2/slsh/Makefile.in
--- slang-2.2.2/slsh/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/slsh/Makefile.in 2009-12-07 10:02:56.000000000 +0100
@@ -15,7 +15,7 @@ SLANG_SRCINC = -I@SRCDIR@
SLANG_SRCLIB = -L@ELFDIR@
#---------------------------------------------------------------------------
OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
-RPATH = @RPATH@
+RPATH =
#----------------------------------------------------------------------------
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -up slang-2.2.2/src/Makefile.in.makefile slang-2.2.2/src/Makefile.in
--- slang-2.2.2/src/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/src/Makefile.in 2009-12-07 10:02:56.000000000 +0100
@@ -139,17 +139,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
# Rules
#---------------------------------------------------------------------------
all: static elf
-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
+static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB)
-$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
+$(OBJS): $(OBJDIR)/stamp
+
+$(ELFOBJS): $(ELFDIR)/stamp
+
+$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS)
-$(RM) $(OBJDIR_NORMAL_LIB)
cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
$(RANLIB) $(OBJDIR_NORMAL_LIB)
@echo ""
@echo $(NORMAL_LIB) created in $(OBJDIR)
-$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
+$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
-$(RM) $(ELFDIR_ELF_LIB)
cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
@@ -160,10 +164,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H)
@echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR).
@echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created.
@echo ""
-$(OBJDIR) :
+$(OBJDIR)/stamp :
-$(MKDIR) $(OBJDIR)
-$(ELFDIR) :
+ touch $(OBJDIR)/stamp
+$(ELFDIR)/stamp :
-$(MKDIR) $(ELFDIR)
+ touch $(ELFDIR)/stamp
$(CONFIG_H) : sysconf.h
-$(CP) sysconf.h $(CONFIG_H)
@@ -194,9 +200,9 @@ install-elf-and-links:
-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
@echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
- $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
+ $(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR)
- -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB)
+ -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
@echo ""
@echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR).
@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created.

48
slang-2.2.3-makefile.patch Normal file
View File

@ -0,0 +1,48 @@
diff -up slang-2.2.3/modules/Makefile.in.makefile slang-2.2.3/modules/Makefile.in
--- slang-2.2.3/modules/Makefile.in.makefile 2010-12-13 08:18:53.000000000 +0100
+++ slang-2.2.3/modules/Makefile.in 2010-12-13 15:35:24.794109086 +0100
@@ -60,7 +60,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-INSTALL_MODULE = @INSTALL_MODULE@
+INSTALL_MODULE = @INSTALL@
MKINSDIR = $(CONFIG_DIR)/autoconf/mkinsdir.sh
SLSH_DIR = $(prefix)/share/slsh
CMAPS_DIR = $(SLSH_DIR)/cmaps
@@ -74,7 +74,7 @@ DEST_SLSH_DIR = $(DESTDIR)$(SLSH_DIR)
DEST_CMAPSDIR = $(DESTDIR)$(CMAPS_DIR)
DEST_HELPDIR = $(DESTDIR)$(HELP_DIR)
#---------------------------------------------------------------------------
-RPATH = @RPATH@
+RPATH =
LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@
INCS = $(SLANG_SRCINC)
diff -up slang-2.2.3/slsh/Makefile.in.makefile slang-2.2.3/slsh/Makefile.in
--- slang-2.2.3/slsh/Makefile.in.makefile 2010-12-13 08:18:53.000000000 +0100
+++ slang-2.2.3/slsh/Makefile.in 2010-12-13 15:35:24.794109086 +0100
@@ -19,7 +19,7 @@ SLANG_SRCINC = -I@SRCDIR@
SLANG_SRCLIB = -L@ELFDIR@
#---------------------------------------------------------------------------
OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
-RPATH = @RPATH@
+RPATH =
#----------------------------------------------------------------------------
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -up slang-2.2.3/src/Makefile.in.makefile slang-2.2.3/src/Makefile.in
--- slang-2.2.3/src/Makefile.in.makefile 2010-12-13 08:18:53.000000000 +0100
+++ slang-2.2.3/src/Makefile.in 2010-12-13 15:35:24.801109332 +0100
@@ -195,9 +195,9 @@ install-elf-and-links:
-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
@echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
- $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
+ $(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
-cd $(DEST_LIBDIR) && $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR)
- -cd $(DEST_LIBDIR) && $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB)
+ -cd $(DEST_LIBDIR) && $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
@echo ""
@echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR).
@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created.

11
slang-nointerlibc2.patch
View File

@ -1,11 +0,0 @@
--- slang-2.0.6/src/slcommon.c.nointerlibc 2006-02-05 21:47:31.000000000 +0100
+++ slang-2.0.6/src/slcommon.c 2006-05-22 13:20:01.000000000 +0200
@@ -191,7 +191,7 @@
return p;
}
-#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2)
+#if 0 && !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2)
extern int __libc_enable_secure;
# define HAVE___LIBC_ENABLE_SECURE 1
#endif

23
slang.spec
View File

@ -1,14 +1,12 @@
Summary: The shared library for the S-Lang extension language
Name: slang
Version: 2.2.2
Release: 3%{?dist}
Version: 2.2.3
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Source: ftp://space.mit.edu/pub/davis/slang/v2.2/%{name}-%{version}.tar.bz2
# fix file permissions, library symlink, parallel build, remove RPATH
Patch1: slang-2.2.2-makefile.patch
# don't use internal glibc symbol
Patch2: slang-nointerlibc2.patch
# fix file permissions, library symlink, remove RPATH
Patch1: slang-2.2.3-makefile.patch
URL: http://www.jedsoft.org/slang/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpng-devel oniguruma-devel pcre-devel zlib-devel
@ -60,7 +58,6 @@ language.
%prep
%setup -q
%patch1 -p1 -b .makefile
%patch2 -p1 -b .nointerlibc2
head -n -1800 < changes.txt > changes.txt_ && tail -n 1800 < changes.txt | \
iconv -f iso8859-1 -t utf8 >> changes.txt_ && \
@ -72,13 +69,8 @@ head -n -1800 < changes.txt > changes.txt_ && tail -n 1800 < changes.txt | \
--with-{pcre,onig,png,z}inc=%{_includedir} \
;
sed -i -e 's|^prefix=.*|prefix=%{_prefix}|' \
-e 's|^exec_prefix=.*|exec_prefix=%{_exec_prefix}|' \
-e 's|^libdir=.*|libdir=%{_libdir}|' \
-e 's|^includedir=.*|includedir=%{_includedir}|' \
slang.pc
make %{?_smp_mflags} install_doc_dir=%{_docdir}/%{name}-%{version}
# fails with %{?_smp_mflags}
make install_doc_dir=%{_docdir}/%{name}-%{version}
%install
rm -rf ${RPM_BUILD_ROOT}
@ -125,6 +117,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libslang*.a
%changelog
* Mon Dec 13 2010 Miroslav Lichvar <mlichvar@redhat.com> - 2.2.3-1
- update to 2.2.3
* Mon Nov 08 2010 Miroslav Lichvar <mlichvar@redhat.com> - 2.2.2-3
- fix libdir in pkgconfig file (#650373)