update to 2.3.2-pre20

This commit is contained in:
Miroslav Lichvar 2018-02-01 13:11:55 +01:00
parent 7c51b2473c
commit 22ad9a2d43
4 changed files with 9 additions and 56 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/slang-2.3.1a.tar.bz2
/slang-pre2.3.2-20.tar.gz

View File

@ -1,45 +0,0 @@
commit 02ae6621f28d90b717c679b61cd1d1800d5c69e7
Author: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon Dec 13 16:44:16 2010 +0100
Install shared objects with executable permissions
diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
index d5eb3f2..b5525cf 100644
--- a/autoconf/aclocal.m4
+++ b/autoconf/aclocal.m4
@@ -578,7 +578,7 @@ ELFLIB_MAJOR_MINOR_MICRO="\$(ELFLIB_MAJOR_MINOR).\$(ELF_MICRO_VERSION)"
dnl# This specifies the target to use in the makefile to install the shared library
INSTALL_ELFLIB_TARGET="install-elf-and-links"
ELFLIB_BUILD_NAME="\$(ELFLIB_MAJOR_MINOR_MICRO)"
-INSTALL_MODULE="\$(INSTALL_DATA)"
+INSTALL_MODULE="\$(INSTALL)"
SLANG_DLL_CFLAGS=""
M_LIB="-lm"
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 0384359..06b71ec 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -61,7 +61,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
diff --git a/src/Makefile.in b/src/Makefile.in
index 03fa056..d2b9f1b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -195,7 +195,7 @@ 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_MAJOR) $(ELFLIB)
@echo ""

View File

@ -1,3 +1,4 @@
%global prerelease pre2.3.2-20
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%if 0%{?fedora:1}
%bcond_without oniguruma
@ -7,13 +8,12 @@
Summary: The shared library for the S-Lang extension language
Name: slang
Version: 2.3.1a
Version: 2.3.2
Release: 5%{?dist}
License: GPLv2+
URL: http://www.jedsoft.org/slang/
Source: http://www.jedsoft.org/releases/%{name}/%{name}-%{version}.tar.bz2
# fix file permissions
Patch1: slang-2.2.4-perms.patch
#Source: http://www.jedsoft.org/releases/%{name}/%{name}-%{version}.tar.bz2
Source: https://www.jedsoft.org/snapshots/%{name}-%{prerelease}.tar.gz
# disable test that fails with SIGHUP ignored (e.g. in koji)
Patch2: slang-sighuptest.patch
BuildRequires: libpng-devel pcre-devel zlib-devel
@ -54,13 +54,11 @@ Install the slang-devel package if you want to develop applications
based on the S-Lang extension language.
%prep
%setup -q
%patch1 -p1 -b .perms
%setup -q -n %{name}-%{prerelease}
%patch2 -p1 -b .sighuptest
head -n -1800 < changes.txt > changes.txt_ && tail -n 1800 < changes.txt | \
iconv -f iso8859-1 -t utf8 >> changes.txt_ && \
touch -r changes.txt{,_} && mv changes.txt{_,}
# fix permissions of installed modules
sed -i '/^INSTALL_MODULE=/s/_DATA//' configure
%build
%configure \

View File

@ -1 +1 @@
SHA512 (slang-2.3.1a.tar.bz2) = e7236a189081ebcbaf4e7f0506671226a4d46aede8826e1a558f1a2f57bcbe3ad58eadeabe2df99cd3d8bacb4c93749996bcbce4f51d338fc9396e0f945933e7
SHA512 (slang-pre2.3.2-20.tar.gz) = 22551763b82b69105228d140e97d84b3dbfa35f81d49351bac660fc2a6e41dc398fb95b8cb927fdf48a92e1a245ee6f89ba5dae650d9c79cde661f2df90d7170