[packages/openslp] - updated to 2.0.0 - moved library to / (for open-iscsi) - verbose files - no bash for init script
baggins
baggins at pld-linux.org
Mon Mar 31 13:42:06 CEST 2014
commit 077323c76f0a9ba5670bd46b12320badb99857fa
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Mar 31 13:41:17 2014 +0200
- updated to 2.0.0
- moved library to / (for open-iscsi)
- verbose files
- no bash for init script
openslp-build.patch | 11 +++++++++++
openslp-opt.patch | 50 ++++++++++++++++++++++++++------------------------
openslp.init | 6 ++----
openslp.spec | 35 +++++++++++++++++++++--------------
4 files changed, 60 insertions(+), 42 deletions(-)
---
diff --git a/openslp.spec b/openslp.spec
index 228bcfb..b805647 100644
--- a/openslp.spec
+++ b/openslp.spec
@@ -6,15 +6,15 @@ Summary(it.UTF-8): Implementazione open source del Service Location Protocol V2
Summary(pl.UTF-8): Otwarta implementacja Service Location Protocol V2
Summary(pt.UTF-8): Implementação 'open source' do protocolo Service Location Protocol V2
Name: openslp
-# note: 1.3.0 is "development" release _equal_ to 1.2.0
-Version: 1.2.1
-Release: 5
+Version: 2.0.0
+Release: 1
License: LGPL
Group: Libraries
-Source0: http://dl.sourceforge.net/openslp/%{name}-%{version}.tar.gz
-# Source0-md5: ff9999d1b44017281dd00ed2c4d32330
+Source0: http://download.sourceforge.net/openslp/%{name}-%{version}.tar.gz
+# Source0-md5: 18cf7940bcc444e32592cf34e84f833f
Source1: %{name}.init
Patch0: %{name}-opt.patch
+Patch1: %{name}-build.patch
URL: http://www.openslp.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -129,6 +129,7 @@ Biblioteki statyczne OpenSLP.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -138,19 +139,24 @@ Biblioteki statyczne OpenSLP.
%configure \
--enable-slpv1 \
--enable-slpv2-security \
- --disable-predicates
+ --enable-async-api
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},/%{_lib}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/slpd
+mv -f $RPM_BUILD_ROOT%{_libdir}/libslp.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libslp.so
+ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo lib*.so.*.*) \
+ $RPM_BUILD_ROOT%{_libdir}/libslp.so
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -174,8 +180,9 @@ fi
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/slp.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/slp.reg
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/slp.spi
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_bindir}/slptool
+%attr(755,root,root) /%{_lib}/libslp.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libslp.so.1
%files server
%defattr(644,root,root,755)
@@ -184,11 +191,11 @@ fi
%files devel
%defattr(644,root,root,755)
-%doc doc/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*
+%doc doc/doc/html/* doc/doc/rfc/* doc/doc/security
+%attr(755,root,root) %{_libdir}/libslp.so
+%{_libdir}/libslp.la
+%{_includedir}/slp.h
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libslp.a
diff --git a/openslp-build.patch b/openslp-build.patch
new file mode 100644
index 0000000..c8bc647
--- /dev/null
+++ b/openslp-build.patch
@@ -0,0 +1,11 @@
+--- openslp-2.0.0/libslpattr/libslpattr_tiny.c~ 2012-11-28 18:07:04.000000000 +0100
++++ openslp-2.0.0/libslpattr/libslpattr_tiny.c 2014-03-31 13:31:35.415660078 +0200
+@@ -193,7 +193,7 @@
+
+
+ SLPError SLPAttrSet_opaque(SLPAttributes attr_h, const char * tag,
+- const char * val, const unsigned int len, SLPInsertionPolicy policy)
++ const char * val, size_t len, SLPInsertionPolicy policy)
+ {
+ return SLP_NOT_IMPLEMENTED;
+ }
diff --git a/openslp-opt.patch b/openslp-opt.patch
index 12db17c..cfddea8 100644
--- a/openslp-opt.patch
+++ b/openslp-opt.patch
@@ -1,25 +1,27 @@
---- openslp-1.2.1/configure.in.orig 2005-02-15 21:06:02.000000000 +0100
-+++ openslp-1.2.1/configure.in 2005-08-15 11:42:58.633764528 +0200
-@@ -129,9 +129,6 @@
- if test X"$debug" = X"yes"; then
- CFLAGS="$CFLAGS -Werror"
- fi
-- if test X"$debug" = X"no"; then
-- OPTFLAGS="-O3"
-- fi
-
+--- openslp-1.2.1/configure.ac.orig 2005-02-15 21:06:02.000000000 +0100
++++ openslp-1.2.1/configure.ac 2005-08-15 11:42:58.633764528 +0200
+@@ -29,9 +29,9 @@
+ #
+ # Checks for libraries
+ #
+-AC_CHECK_LIB([resolv], [inet_aton])
+-AC_CHECK_LIB([socket], [socket])
+-AC_CHECK_LIB([nsl], [gethostbyname])
++AC_SEARCH_LIBS([inet_aton], [resolv])
++AC_SEARCH_LIBS([socket], [socket])
++AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_CHECK_LIB([m], [log10])
+ AC_CHECK_LIB([pthread], [pthread_create])
+
+@@ -213,11 +213,6 @@
+ # disable optimization for debug builds
+ # enable high-level optimizations for non-debug builds
+ CFLAGS="$CFLAGS -Wall $GCC_OS_FLAGS"
+- if test "x${debug}" = xyes; then
+- OPTFLAGS="-O0"
+- else
+- OPTFLAGS="-O2"
+- fi
elif $CC -V 2>&1 | grep "WorkShop Compilers"; then
- dnl Allow C++ style comments
-@@ -170,9 +167,9 @@
- dnl ***********************************************************************
- dnl Checks for libraries.
- dnl ***********************************************************************
--AC_CHECK_LIB(resolv, inet_aton)
--AC_CHECK_LIB(socket, main)
--AC_CHECK_LIB(nsl, gethostbyname)
-+AC_SEARCH_LIBS(inet_aton, resolv)
-+AC_SEARCH_LIBS(socket, socket)
-+AC_SEARCH_LIBS(gethostbyname, nsl)
- dnl AC_CHECK_LIB(m, main)
- dnl AC_CHECK_FUNCS(ceil log10 strncasecmp strcasecmp )
- AC_CHECK_FUNCS(strncasecmp strcasecmp)
+ # Solaris Workshop: enable optimizations for debug builds
+ if test "x${debug}" = xno; then
diff --git a/openslp.init b/openslp.init
index 9bbde2b..bee3da1 100644
--- a/openslp.init
+++ b/openslp.init
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/bin/sh
#
-#/etc/rc.d/init.d/slpd
-#
-# Starts the at daemon
+# Starts the OpenSLP daemon
#
# chkconfig: 345 40 60
# description: OpenSLP daemon for the Service Location Protocol
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openslp.git/commitdiff/077323c76f0a9ba5670bd46b12320badb99857fa
More information about the pld-cvs-commit
mailing list