[packages/slang] - fixed zlib detection when libdir suffix is not /lib - more sane modules examples packaging - relea

[qboosh]

commit 85b04680b6ebbc414018b9419b0fb89f10f3ab45
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date:   Sun Jun 26 14:20:11 2016 +0200

    - fixed zlib detection when libdir suffix is not /lib
    - more sane modules examples packaging
    - release 2

 slang.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/slang.spec b/slang.spec
index bc80cb5..5702c5c 100644
--- a/slang.spec
+++ b/slang.spec
@@ -15,7 +15,7 @@ Summary(tr.UTF-8):    C benzeri dil için ortak kitaplık
 Summary(uk.UTF-8):     Бібліотека спільного користування C-подібної мови 
розширення S-Lang
 Name:          slang
 Version:       2.3.0
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL v2+
 Group:         Libraries
@@ -258,15 +258,17 @@ Moduł PCRE dla Slanga.
        --with-oniginc=/usr/include \
        --with-oniglib=%{_libdir} \
 %else
-       --without-onig
+       --without-onig \
 %endif
 %if %{with png}
        --with-png \
        --with-pnginc=/usr/include/libpng \
-       --with-pnglib=%{_libdir}
+       --with-pnglib=%{_libdir} \
 %else
-       --without-png
+       --without-png \
 %endif
+       --with-zinc=/usr/include \
+       --with-zlib=%{_libdir}
 
 %{__make} -j1 elf \
        ELF_CFLAGS="%{rpmcflags} -fPIC"
@@ -279,12 +281,13 @@ Moduł PCRE dla Slanga.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_bindir}}
+install -d 
$RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version}/modules,%{_bindir}}
 
 %{__make} install-all -j1 \
        DESTDIR=$RPM_BUILD_ROOT
 
-cp -a modules examples demo src/curses 
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a examples demo src/curses 
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a modules/{cmaps,examples,help,*.sl} 
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/modules
 
 # help rpmdeps
 chmod +x $RPM_BUILD_ROOT%{_libdir}/lib*.so* \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/slang.git/commitdiff/85b04680b6ebbc414018b9419b0fb89f10f3ab45

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit