From 907259176d064e99150f862f7c614edd8b912183 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 22 May 2006 11:29:47 +0000 Subject: [PATCH] - update to slang-2.0.6 - move .so.2 link to main package - don't package static library and utf8 link - remove requires for libtool and libtermcap - rearrange doc files (#191583) --- slang-makefile.patch | 64 +++++++++++++--------------------------- slang-nointerlibc2.patch | 39 ++++-------------------- slang.spec | 38 ++++++++---------------- 3 files changed, 40 insertions(+), 101 deletions(-) diff --git a/slang-makefile.patch b/slang-makefile.patch index f5e55b9..c38ae17 100644 --- a/slang-makefile.patch +++ b/slang-makefile.patch @@ -1,44 +1,22 @@ ---- slang-2.0.5/autoconf/Makefile.in.orig 2005-10-17 08:00:18.000000000 +0200 -+++ slang-2.0.5/autoconf/Makefile.in 2005-11-21 14:16:51.000000000 +0100 -@@ -8,12 +8,9 @@ - - all: - cd src; $(MAKE) all -- cd slsh; $(MAKE) all -- cd modules; $(MAKE) all -+ cd src; $(MAKE) elf - elf: - cd src; $(MAKE) elf -- cd slsh; $(MAKE) all -- cd modules; $(MAKE) all - @echo Use make install-elf to install it. - runtests: - cd src; $(MAKE) all -@@ -23,17 +20,12 @@ - clean: - /bin/rm -f *~ - cd src; $(MAKE) clean -- cd modules; $(MAKE) clean -- cd slsh; $(MAKE) clean - cd demo; $(MAKE) clean - install: - cd src; $(MAKE) install -+ cd src; $(MAKE) install-elf - install-elf: - cd src; $(MAKE) install-elf -- @echo Now installing slsh -- cd slsh; $(MAKE) install -- @echo Now installing the modules -- cd modules; $(MAKE) install +--- slang-2.0.6/src/Makefile.in.makefile 2006-02-05 21:47:31.000000000 +0100 ++++ slang-2.0.6/src/Makefile.in 2006-05-22 13:04:19.000000000 +0200 +@@ -166,14 +166,16 @@ + $(MKINSDIR) $(DEST_INCDIR) + $(DEST_LIBDIR): + $(MKINSDIR) $(DEST_LIBDIR) +-install-elf: elf install ++install-elf: elf $(DEST_LIBDIR) $(DEST_INCDIR) ++ $(INSTALL_DATA) $(SRCDIR)/slang.h $(DEST_INCDIR) ++ $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DEST_INCDIR) + -$(RM) $(DEST_LIBDIR)/$(ELFLIB) + -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR) + @echo installing $(ELFLIB_MAJOR_MINOR) in $(DEST_LIBDIR) +- $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR) ++ $(INSTALL_DATA) -m 0755 $(ELFDIR_ELF_LIB) $(DEST_LIBDIR) + @echo creating symbolic links to $(ELFLIB_MAJOR_MINOR) + -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR) +- -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB) ++ -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB) @echo "" - @echo "On some systems, e.g., linux, you may also have to run ldconfig." - @echo "" -@@ -44,8 +36,6 @@ - /bin/rm -f *~ Makefile config.status config.log config.cache files.pck - cd src; $(MAKE) distclean - cd demo; $(MAKE) distclean -- cd modules; $(MAKE) distclean -- cd slsh; $(MAKE) distclean - # - configure: autoconf/aclocal.m4 autoconf/configure.ac - cd autoconf && autoconf && mv ./configure .. + @echo $(ELFLIB_MAJOR_MINOR) created in $(DEST_LIBDIR). + @echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR_MINOR) were also created. diff --git a/slang-nointerlibc2.patch b/slang-nointerlibc2.patch index 030dfa0..33496f9 100644 --- a/slang-nointerlibc2.patch +++ b/slang-nointerlibc2.patch @@ -1,38 +1,11 @@ ---- slang-2.0.5/src/slcommon.c.nointerlibc 2005-10-17 08:00:18.000000000 +0200 -+++ slang-2.0.5/src/slcommon.c 2005-11-21 14:26:28.000000000 +0100 -@@ -191,19 +191,19 @@ +--- 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) --extern int __libc_enable_secure; --# define HAVE___LIBC_ENABLE_SECURE 1 --#endif -+/* #if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) */ -+/* extern int __libc_enable_secure; */ -+/* # define HAVE___LIBC_ENABLE_SECURE 1 */ -+/* #endif */ - - int _pSLsecure_issetugid (void) - { - #ifdef HAVE_ISSETUGID - return (1 == issetugid ()); - #else --# ifdef HAVE___LIBC_ENABLE_SECURE -- return __libc_enable_secure; --# else -+/* # ifdef HAVE___LIBC_ENABLE_SECURE */ -+/* return __libc_enable_secure; */ -+/* # else */ - # if defined(HAVE_GETUID) && defined(HAVE_GETEUID) && defined(HAVE_GETGID) && defined(HAVE_GETEUID) - static int enable_secure; - if (enable_secure == 0) -@@ -218,7 +218,7 @@ - # else - return 0; - # endif --# endif -+/* # endif */ ++#if 0 && !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) + extern int __libc_enable_secure; + # define HAVE___LIBC_ENABLE_SECURE 1 #endif - } - diff --git a/slang.spec b/slang.spec index 5d7d26b..21b2edc 100644 --- a/slang.spec +++ b/slang.spec @@ -1,9 +1,7 @@ -%define _filter_GLIBC_PRIVATE 1 - Summary: The shared library for the S-Lang extension language. Name: slang -Version: 2.0.5 -Release: 5.2.1 +Version: 2.0.6 +Release: 1 License: GPL Group: System Environment/Libraries Source: ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.0/slang-%{version}.tar.bz2 @@ -12,8 +10,6 @@ Patch2: slang-nointerlibc2.patch Patch3: slang-LANG.patch Url: http://www.s-lang.org/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: libtool, libtermcap-devel -Requires: libtermcap %description S-Lang is an interpreted language and a programming library. The @@ -27,7 +23,6 @@ to recode S-Lang procedures in C if you need to. Summary: The static library and header files for development using S-Lang. Group: Development/Libraries Requires: slang = %{version} -Requires: libtermcap-devel %description devel This package contains the S-Lang extension language static libraries @@ -46,25 +41,13 @@ based on the S-Lang extension language. %build -perl -p -i -e 's/(ELF_CFLAGS=\"[^\"]*)-O2([^\"]*\".*)/$1'"$RPM_OPT_FLAGS"' $2/gs' configure %configure --includedir=%{_includedir}/slang -make all +make -C src elf %install rm -rf ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/slang -%makeinstall \ - install_lib_dir=${RPM_BUILD_ROOT}%{_libdir} \ - install_include_dir=${RPM_BUILD_ROOT}%{_includedir}/slang install -chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/libslang*.so.*.* -ln -sf libslang.so.%{version} ${RPM_BUILD_ROOT}%{_libdir}/libslang.so.2 -ln -sf libslang.so.%{version} ${RPM_BUILD_ROOT}%{_libdir}/libslang-utf8.so -ln -sf libslang.a ${RPM_BUILD_ROOT}%{_libdir}/libslang-utf8.a - - -# remove unpackaged files from the buildroot -rm -rf ${RPM_BUILD_ROOT}%{_prefix}/doc +make -C src DESTDIR=${RPM_BUILD_ROOT} install-elf %clean rm -rf ${RPM_BUILD_ROOT} @@ -75,18 +58,23 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) -%{_libdir}/libslang.so.%{version} +%doc COPYING changes.txt +%{_libdir}/libslang*.so.* %files devel %defattr(-,root,root) %doc doc README -%{_libdir}/libslang*.a %{_libdir}/libslang*.so -%{_libdir}/libslang*.so.2 -%{_datadir}/doc/slang/v2/* %{_includedir}/slang %changelog +* Mon May 22 2006 Miroslav Lichvar - 2.0.6-1 +- update to slang-2.0.6 +- move .so.2 link to main package +- don't package static library and utf8 link +- remove requires for libtool and libtermcap +- rearrange doc files (#191583) + * Fri Feb 10 2006 Jesse Keating - 2.0.5-5.2.1 - bump again for double-long bug on ppc(64)