diff --git a/slang-2.0.7-eol.patch b/slang-2.0.7-eol.patch new file mode 100644 index 0000000..160ae87 --- /dev/null +++ b/slang-2.0.7-eol.patch @@ -0,0 +1,14 @@ +Index: slang/src/sldisply.c +=================================================================== +--- slang/src/sldisply.c (revision 78) ++++ slang/src/sldisply.c (revision 79) +@@ -1808,7 +1808,8 @@ + #endif + /* Find where the last non-blank character on old/new screen is */ + +- if (CHAR_EQS_SPACE(pmax-1)) ++ /* if (CHAR_EQS_SPACE(pmax-1)) */ ++ if (((pmax-1)->wchars[0]==' ') && ((pmax-1)->nchars==1)) + { + /* If we get here, then we can erase to the end of the line to create + * the final space. However, this will only work _if_ erasing will diff --git a/slang.spec b/slang.spec index 840580d..e98f762 100644 --- a/slang.spec +++ b/slang.spec @@ -1,13 +1,14 @@ -Summary: The shared library for the S-Lang extension language. +Summary: The shared library for the S-Lang extension language Name: slang Version: 2.0.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries Source: ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.0/slang-%{version}.tar.bz2 Patch1: slang-makefile.patch Patch2: slang-nointerlibc2.patch Patch3: slang-LANG.patch +Patch4: slang-2.0.7-eol.patch Url: http://www.s-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,29 +21,37 @@ extension language. S-Lang's syntax resembles C, which makes it easy to recode S-Lang procedures in C if you need to. %package devel -Summary: The static library and header files for development using S-Lang. +Summary: Development files for the S-Lang extension language Group: Development/Libraries -Requires: slang = %{version} +Requires: %{name} = %{version}-%{release} %description devel -This package contains the S-Lang extension language static libraries -and header files which you'll need if you want to develop S-Lang based -applications. Documentation which may help you write S-Lang based -applications is also included. +This package contains files which you'll need if you want to +develop S-Lang based applications. Documentation which may help +you write S-Lang based applications is also included. Install the slang-devel package if you want to develop applications based on the S-Lang extension language. +%package static +Summary: The static library for the S-Lang extension language +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +This package includes static library for the S-Lang extension +language. + %prep -%setup -n slang-%{version} -q +%setup -q %patch1 -p1 -b .makefile %patch2 -p1 -b .nointerlibc2 %patch3 -p1 -b .LANG - +%patch4 -p1 -b .eol %build %configure --includedir=%{_includedir}/slang -make -C src elf +make %{?_smp_mflags} -C src elf %install rm -rf ${RPM_BUILD_ROOT} @@ -64,11 +73,19 @@ rm -rf ${RPM_BUILD_ROOT} %files devel %defattr(-,root,root) %doc doc/README doc/*/*.txt doc/*.txt -%{_libdir}/libslang*.a %{_libdir}/libslang*.so %{_includedir}/slang +%files static +%defattr(-,root,root) +%{_libdir}/libslang*.a + %changelog +* Mon Feb 19 2007 Miroslav Lichvar - 2.0.7-2 +- ignore background color of trailing spaces if terminal has bce (#217276) +- move static library to -static subpackage +- spec cleanup + * Mon Nov 06 2006 Miroslav Lichvar - 2.0.7-1 - update to 2.0.7