Make all plugins work

[packages/echoping.git] / echoping.spec

diff --git a/echoping.spec b/echoping.spec
index 9585c74176ea4de232067329c4660af24198e111..0cf8dea0821f0f9597d745a62a438a58fd994bee 100644 (file)
--- a/echoping.spec
+++ b/echoping.spec
@@ -2,23 +2,25 @@ Summary:      Non-suid ping
 Summary(pl.UTF-8):     ping bez suida
 Name:          echoping
 Version:       6.0.2
-Release:       6
+Release:       7
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       http://dl.sourceforge.net/echoping/%{name}-%{version}.tar.gz
 # Source0-md5: 991478532b56ab3b6f46ea9fa332626f
+Patch0:                echoping-no-versioned-modules.patch
+Patch1:                echoping-so.patch
 URL:           http://echoping.sourceforge.net/
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: libidn-devel
+BuildRequires: libtool
 BuildRequires: openldap-devel >= 2.4.6
 BuildRequires: openssl-devel
 BuildRequires: popt-devel
 BuildRequires: postgresql-devel
-Requires:      %{name}-libs = %{version}-%{release}
+Obsoletes:     echoping-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%undefine      __cxx
-%define                skip_post_check_so      dns.so.0.0.0 ldap.so.0.0.0 postgresql.so.0.0.0 whois.so.0.0.0
-
 %description
 "echoping" is a small program to test (approximatively) performances
 of a remote host by sending it TCP "echo" (or other protocol, such as
@@ -33,7 +35,7 @@ protokołu, jak np. HTTP).
 Summary:       Header files for echoping library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki echoping
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 Header files for echoping library.
@@ -41,25 +43,37 @@ Header files for echoping library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe echoping library.
 
-%package libs
-Summary:       echoping libraries
-Summary(pl.UTF-8):     Biblioteki echoping
-Group:         Libraries
-
-%description libs
-echoping libraries.
-
-%description libs -l pl.UTF-8
-Biblioteki echoping.
-
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd plugins
+%{__libtoolize}
+%{__aclocal} -I .
+%{__autoconf}
+%{__automake}
+cd -
+for d in dns ldap postgresql random whois ; do
+       cd plugins/$d
+       %{__libtoolize}
+       %{__aclocal}
+       %{__autoconf}
+       %{__autoheader}
+       %{__automake}
+       cd -
+done
 %configure \
        --with-ssl \
        --without-gnutls \
        --disable-static
+
 %{__make}
 
 %install
@@ -68,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/echoping/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/echoping/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,28 +91,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog DETAILS PLUGINS README TODO
 %attr(755,root,root) %{_bindir}/echoping
+%dir %{_libdir}/echoping
+%attr(755,root,root) %{_libdir}/echoping/dns.so
+%attr(755,root,root) %{_libdir}/echoping/ldap.so
+%attr(755,root,root) %{_libdir}/echoping/postgresql.so
+%attr(755,root,root) %{_libdir}/echoping/random.so
+%attr(755,root,root) %{_libdir}/echoping/whois.so
 %{_mandir}/man1/echoping*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/echoping/dns.so
-%{_libdir}/echoping/ldap.so
-%{_libdir}/echoping/postgresql.so
-%{_libdir}/echoping/random.so
-%{_libdir}/echoping/whois.so
 %dir %{_includedir}/echoping
 %{_includedir}/echoping/*.h
-
-%files libs
-%defattr(644,root,root,755)
-%dir %{_libdir}/echoping
-%attr(755,root,root) %{_libdir}/echoping/dns.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/echoping/dns.so.0
-%attr(755,root,root) %{_libdir}/echoping/ldap.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/echoping/ldap.so.0
-%attr(755,root,root) %{_libdir}/echoping/postgresql.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/echoping/postgresql.so.0
-%attr(755,root,root) %{_libdir}/echoping/random.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/echoping/random.so.0
-%attr(755,root,root) %{_libdir}/echoping/whois.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/echoping/whois.so.0