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

- drop lang patch

Browse Source 
- build oniguruma module (#226420)
This commit is contained in:
Miroslav Lichvar 2008-01-24 15:25:24 +00:00
parent 9f44c63db3
commit 58560ed207
3 changed files with 6 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
slang-2.1.2-makefile.patch
View File

@ -1,111 +0,0 @@
diff -up slang-2.1.2/modules/Makefile.in.makefile slang-2.1.2/modules/Makefile.in
--- slang-2.1.2/modules/Makefile.in.makefile 2007-09-08 04:47:29.000000000 +0200
+++ slang-2.1.2/modules/Makefile.in 2007-09-17 17:56:45.000000000 +0200
@@ -53,7 +53,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
@@ -67,7 +67,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) -lm
#LIBS = $(RPATH) $(DL_LIB) -lm
diff -up slang-2.1.2/slsh/Makefile.in.makefile slang-2.1.2/slsh/Makefile.in
--- slang-2.1.2/slsh/Makefile.in.makefile 2007-09-09 03:39:18.000000000 +0200
+++ slang-2.1.2/slsh/Makefile.in 2007-09-17 17:56:45.000000000 +0200
@@ -15,7 +15,7 @@ SLANG_SRCINC = -I@SRCDIR@
SLANG_SRCLIB = -L@ELFDIR@
#---------------------------------------------------------------------------
OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ -lm
-RPATH = @RPATH@
+RPATH =
#----------------------------------------------------------------------------
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -64,7 +64,7 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_
#----------------------------------------------------------------------------
@SET_MAKE@
SHELL = /bin/sh
-INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
+INST_LIBS = $(RPATH) $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-DSLSH_PATH_ENV='$(SLSH_PATH_ENV)'
diff -up slang-2.1.2/src/Makefile.in.makefile slang-2.1.2/src/Makefile.in
--- slang-2.1.2/src/Makefile.in.makefile 2007-09-08 04:47:29.000000000 +0200
+++ slang-2.1.2/src/Makefile.in 2007-09-17 18:07:25.000000000 +0200
@@ -137,17 +137,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 \
@@ -158,10 +162,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)
@@ -192,9 +198,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.
diff -up slang-2.1.2/autoconf/Makefile.in.makefile slang-2.1.2/autoconf/Makefile.in
--- slang-2.1.2/autoconf/Makefile.in.makefile 2007-08-30 05:14:55.000000000 +0200
+++ slang-2.1.2/autoconf/Makefile.in 2007-09-17 17:56:45.000000000 +0200
@@ -18,8 +18,7 @@ help:
@echo "make check : Build the library and run the regression tests"
static: Makefile
cd src; $(MAKE) static
- cd slsh; $(MAKE) all
-elf: Makefile
+elf: Makefile static
cd src; $(MAKE) elf
cd slsh; $(MAKE) all
cd modules; $(MAKE) all

14
slang-LANG.patch
View File

@ -1,14 +0,0 @@
--- slang-2.0.5/src/slsmg.c.rasold 2005-12-02 12:54:03.000000000 +0100
+++ slang-2.0.5/src/slsmg.c 2005-12-02 12:57:49.000000000 +0100
@@ -1500,8 +1500,10 @@
if (Smg_Inited)
SLsmg_reset_smg ();
- if (UTF8_Mode == -1)
+ if (UTF8_Mode == -1){
+ SLutf8_enable (-1);
UTF8_Mode = _pSLutf8_mode;
+ }
if (-1 == (*tt_init_video) ())
{

10
slang.spec
View File

@ -1,16 +1,15 @@
Summary: The shared library for the S-Lang extension language
Name: slang
Version: 2.1.3
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Source: ftp://space.mit.edu/pub/davis/slang/v2.1/%{name}-%{version}.tar.bz2
Patch1: slang-2.1.3-makefile.patch
Patch2: slang-nointerlibc2.patch
Patch3: slang-LANG.patch
URL: http://www.jedsoft.org/slang/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpng-devel pcre-devel gawk
BuildRequires: libpng-devel oniguruma-devel pcre-devel
%description
S-Lang is an interpreted language and a programming library. The
@ -59,7 +58,6 @@ language.
%setup -q
%patch1 -p1 -b .makefile
%patch2 -p1 -b .nointerlibc2
%patch3 -p1 -b .LANG
%build
%configure --includedir=%{_includedir}/slang
@ -103,6 +101,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libslang*.a
%changelog
* Thu Jan 24 2008 Miroslav Lichvar <mlichvar@redhat.com> - 2.1.3-2
- drop lang patch
- build oniguruma module (#226420)
* Mon Nov 05 2007 Miroslav Lichvar <mlichvar@redhat.com> - 2.1.3-1
- update to 2.1.3