diff --git a/slang.spec b/slang.spec index 274af65..1bb03e0 100644 --- a/slang.spec +++ b/slang.spec @@ -19,6 +19,8 @@ Patch2: slang-sighuptest.patch URL: http://www.jedsoft.org/slang/ BuildRequires: libpng-devel pcre-devel zlib-devel %{?with_oniguruma:BuildRequires: oniguruma-devel} +# static removed in 2.3.1a-3 +Obsoletes: slang-static < 2.3.1a-3 %description S-Lang is an interpreted language and a programming library. The @@ -55,15 +57,6 @@ 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%{?_isa} = %{version}-%{release} - -%description static -This package includes static library for the S-Lang extension -language. - %prep %setup -q %patch1 -p1 -b .perms @@ -85,11 +78,12 @@ head -n -1800 < changes.txt > changes.txt_ && tail -n 1800 < changes.txt | \ # fails with %{?_smp_mflags} # install_doc_dir sets SLANG_DOC_DIR macro -make RPATH="" install_doc_dir=%{_pkgdocdir} all static +make RPATH="" install_doc_dir=%{_pkgdocdir} all %install make install-all INSTALL="install -p" RPATH="" DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_docdir}/{slang,slsh} +rm -f $RPM_BUILD_ROOT%{_libdir}/libslang.a mkdir $RPM_BUILD_ROOT%{_includedir}/slang for h in slang.h slcurses.h; do @@ -124,9 +118,6 @@ make check %{_includedir}/sl*.h %{_includedir}/slang -%files static -%{_libdir}/libslang*.a - %changelog * Sat Feb 11 2017 Fedora Release Engineering - 2.3.1a-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild