- cleanups, missing dirs etc

- temporarily commented out non-existing patch (but needed to build)

Changed files:
    antinat.spec -> 1.9

diff --git a/antinat.spec b/antinat.spec
index e22aca801eebb6e3c06c507ed0735b8080eb9428..cbb85b13721fbaef778c72d0f5b006b940686444 100644 (file)
--- a/antinat.spec
+++ b/antinat.spec
@@ -7,11 +7,19 @@ License:      GPL
 Group:         Daemons
 Source0:       http://yallara.cs.rmit.edu.au/%7Emalsmith/C0A00201/%{name}/%{name}-%{version}.tar.bz2
 # Source0-md5: 08250f314de6203fb1ee1b542fcbb02f
-Patch0:                %{name}-makefile.patch
+# doesn't exist in SOURCES but probably needed to do s/%{name}-%{version}/%{name}/ and add DESTDIR
+#Patch0:               %{name}-makefile.patch
 URL:           http://yallara.cs.rmit.edu.au/~malsmith/products/antinat/
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: libds-devel >= 1.2.0
+BuildRequires: libtool
 Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# *.so are installed there
+%define                _datadir        %{_libdir}
+%define                _localstatedir  /var/lib
+
 %description
 A SOCKS server for SOCKS4 and SOCKS5.
 
@@ -22,7 +30,7 @@ Serwer SOCKS dla SOCKS4 i SOCKS5.
 Summary:       Support for SOCKS4 in antinat
 Summary(pl):   Wsparcie w antinacie dla SOCKS4
 Group:         Daemons
-Requires:      antinat = %{version}
+Requires:      %{name} = %{version}
 
 %description socks4
 Support for older style SOCKS4 connections in antinat. SOCKS4 is
@@ -38,7 +46,7 @@ autoryzacja, nie nale
 Summary:       Support for logging in antinat
 Summary(pl):   Wsparcie dla logowania przez antinata
 Group:         Daemons
-Requires:      antinat = %{version}
+Requires:      %{name} = %{version}
 
 %description logging
 Support for connection and summary logging in antinat.
@@ -50,7 +58,7 @@ Wsparcie dla logowania po
 Summary:       Support for filtering in antinat
 Summary(pl):   Wsparcie dla filtrowania przez antinata
 Group:         Daemons
-Requires:      antinat = %{version}
+Requires:      %{name} = %{version}
 
 %description filtering
 Support for allowing and disallowing connections on the basis of some
@@ -66,7 +74,7 @@ oparciu o pewne kryteria. Zawiera filtry dzia
 Summary:       Support for anonymous SOCKS5 connections in antinat
 Summary(pl):   Wsparcie w antinacie dla anonimowych po³±czeñ SOCKS5
 Group:         Daemons
-Requires:      antinat = %{version}
+Requires:      %{name} = %{version}
 
 %description anonymous
 Support for anonymous (non-authenticated) connections in antinat. If
@@ -86,7 +94,7 @@ anonimowe.
 Summary:       Support for IPv6 connections in antinat
 Summary(pl):   Wsparcie w antinacie dla po³±czeñ IPv6
 Group:         Daemons
-Requires:      antinat = %{version}
+Requires:      %{name} = %{version}
 
 %description ipv6
 Support for IPv6 connections, to allow the server to connect to v6
@@ -100,8 +108,7 @@ host
 Summary:       Support for UDP association in antinat
 Summary(pl):   Wsparcie w antinacie dla kojarzenia UDP
 Group:         Daemons
-Requires:      antinat = %{version}
-Summary:       Support for UDP Association in antinat
+Requires:      %{name} = %{version}
 
 %description udp
 Support for UDP association over SOCKSv5. This allows hosts to send
@@ -113,69 +120,80 @@ odbi
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
-
 %configure \
-       --datadir=%{_libdir} \
        --with-ipv6
+#      --datadir=%{_libdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       datadir=$RPM_BUILD_ROOT%{_libdir}
+       bindir=$RPM_BUILD_ROOT%{_bindir} \
+       datadir=$RPM_BUILD_ROOT%{_libdir} \
+       localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \
+       mandir=$RPM_BUILD_ROOT%{_mandir} \
+       sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}
+#      DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -fR $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING README TODO
-%config(noreplace) %{_sysconfdir}/antinat.conf
+%doc README TODO
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/antinat.conf
 %attr(755,root,root) %{_bindir}/*
-%{_mandir}/*
-%{_libdir}/%{name}/address/libipv4.so
-%{_libdir}/%{name}/version5/authenticators/libunpw.so
-%{_libdir}/%{name}/version5/authenticators/unpwsources
-%{_libdir}/%{name}/version5/commands/libconn.so
-%{_libdir}/%{name}/version5/commands/libbind.so
-%{_libdir}/%{name}/version5/commands/libident.so
-%{_libdir}/%{name}/resolvers/libipv4.so
-%{_libdir}/%{name}/resolvers/libname.so
-%{_libdir}/%{name}/revres/libipv4.so
-%{_libdir}/%{name}/versions/libv5.so
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/address
+%attr(755,root,root) %{_libdir}/%{name}/address/libipv4.so
+%dir %{_libdir}/%{name}/version5
+%dir %{_libdir}/%{name}/version5/authenticators
+%attr(755,root,root) %{_libdir}/%{name}/version5/authenticators/libunpw.so
+%attr(755,root,root) %{_libdir}/%{name}/version5/authenticators/unpwsources
+%dir %{_libdir}/%{name}/version5/commands
+%attr(755,root,root) %{_libdir}/%{name}/version5/commands/libconn.so
+%attr(755,root,root) %{_libdir}/%{name}/version5/commands/libbind.so
+%attr(755,root,root) %{_libdir}/%{name}/version5/commands/libident.so
+%dir %{_libdir}/%{name}/resolvers
+%attr(755,root,root) %{_libdir}/%{name}/resolvers/libipv4.so
+%attr(755,root,root) %{_libdir}/%{name}/resolvers/libname.so
+%dir %{_libdir}/%{name}/revres
+%attr(755,root,root) %{_libdir}/%{name}/revres/libipv4.so
+%dir %{_libdir}/%{name}/versions
+%attr(755,root,root) %{_libdir}/%{name}/versions/libv5.so
+%{_mandir}/man[15]/*
 
 %files socks4
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/version4/*
-%{_libdir}/%{name}/versions/libv4.so
+%attr(755,root,root) %{_libdir}/%{name}/version4
+%attr(755,root,root) %{_libdir}/%{name}/versions/libv4.so
 
 %files logging
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/loggers/*
-%{_localstatedir}
+%attr(755,root,root) %{_libdir}/%{name}/loggers
+%{_localstatedir}/%{name}
 
 %files filtering
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/filters/*
+%attr(755,root,root) %{_libdir}/%{name}/filters
 
 %files anonymous
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/version5/authenticators/libanon.so
+%attr(755,root,root) %{_libdir}/%{name}/version5/authenticators/libanon.so
 
 %files ipv6
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/address/libipv6.so
-%{_libdir}/%{name}/resolvers/libipv6.so
-%{_libdir}/%{name}/revres/libipv6.so
+%attr(755,root,root) %{_libdir}/%{name}/address/libipv6.so
+%attr(755,root,root) %{_libdir}/%{name}/resolvers/libipv6.so
+%attr(755,root,root) %{_libdir}/%{name}/revres/libipv6.so
 
 %files udp
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/version5/commands/libudp.so
+%attr(755,root,root) %{_libdir}/%{name}/version5/commands/libudp.so