From e31d9a0a74792206a687cc936442895d598bbfad Mon Sep 17 00:00:00 2001
From: praszyk <praszyk@fedoraproject.org>
Date: Tue, 22 Nov 2005 11:54:48 +0000
Subject: [PATCH] Upgrade to slang 20005

---
 slang-makefile.patch | 44 +++++++++++++++++++++++++++++++++++++++
 slang.spec           | 49 ++++++++++++++++++++------------------------
 2 files changed, 66 insertions(+), 27 deletions(-)
 create mode 100644 slang-makefile.patch

diff --git a/slang-makefile.patch b/slang-makefile.patch
new file mode 100644
index 0000000..f5e55b9
--- /dev/null
+++ b/slang-makefile.patch
@@ -0,0 +1,44 @@
+--- 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
+ 	@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 ..
diff --git a/slang.spec b/slang.spec
index ccb523a..a3d21a6 100644
--- a/slang.spec
+++ b/slang.spec
@@ -2,19 +2,13 @@
 
 Summary: The shared library for the S-Lang extension language.
 Name: slang
-Version: 1.4.9
-Release: 23
+Version: 2.0.5
+Release: 1
 License: GPL
 Group: System Environment/Libraries
-Source: ftp://space.mit.edu/pub/davis/slang/v1.4/slang-%{version}.tar.bz2
-Source2: README.UTF-8
-Patch: slang-debian-utf8.patch
-Patch2: slang-utf8-acs.patch
-Patch3: slang-1.4.5-utf8-segv.patch
-Patch4: slang-utf8-fix.patch
-Patch5: slang-1.4.9-gcc4.patch
-Patch6: slang-refresh.patch
-Patch7: slang-nointerlibc.patch
+Source: ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.0/slang-%{version}.tar.bz2
+Patch1: slang-makefile.patch
+Patch2: slang-nointerlibc2.patch
 Url: http://www.s-lang.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libtool, libtermcap-devel
@@ -45,21 +39,14 @@ based on the S-Lang extension language.
 
 %prep
 %setup -n slang-%{version} -q
-%patch -p1 -b .utf8
-%patch2 -p1 -b .acs
-%patch3 -p1 -b .segv
-%patch4 -p1 -b .utf8-fix
-%patch5 -p1 -b .gcc4
-%patch6 -p1 -b .refresh
-%patch7 -p1 -b .nointerlibc
+%patch1 -p1 -b .makefile
+%patch2 -p1 -b .nointerlibc2
 
-cp %{SOURCE2} .
 
 %build
 perl -p -i -e 's/(ELF_CFLAGS=\"[^\"]*)-O2([^\"]*\".*)/$1'"$RPM_OPT_FLAGS"' $2/gs' configure
-cp /usr/share/libtool/config.{sub,guess} autoconf
 %configure --includedir=%{_includedir}/slang
-make elf all
+make all
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -67,11 +54,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/slang
 
 %makeinstall \
   install_lib_dir=${RPM_BUILD_ROOT}%{_libdir} \
-  install_include_dir=${RPM_BUILD_ROOT}%{_includedir}/slang install-elf
+  install_include_dir=${RPM_BUILD_ROOT}%{_includedir}/slang install
 chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/libslang*.so.*.*
-ln -sf libslang-utf8.so.%{version} ${RPM_BUILD_ROOT}%{_libdir}/libslang-utf8.so.1
-ln -sf libslang-utf8.so ${RPM_BUILD_ROOT}%{_libdir}/libslang.so
-ln -sf libslang-utf8.a ${RPM_BUILD_ROOT}%{_libdir}/libslang.a
+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
@@ -85,16 +73,23 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
-%{_libdir}/libslang*.so.*
+%{_libdir}/libslang.so.%{version}
 
 %files devel
 %defattr(-,root,root)
-%doc doc README.UTF-8
+%doc doc README
 %{_libdir}/libslang*.a
 %{_libdir}/libslang*.so
+%{_libdir}/libslang*.so.2
+%{_datadir}/doc/slang/v2/*
 %{_includedir}/slang
 
 %changelog
+* Mon Nov 21 2005 Petr Raszyk <praszyk@redhat.com> - 2.0.5-1
+- Upgrade to slang 20005.
+- (#161536). slang-nointerlibc.patch
+- slang-makefile.patch
+
 * Mon Oct 24 2005 Petr Raszyk <praszyk@redhat.com> - 1.4.9-23
 - rebuild