- 2.0.8-0.rc2.1 (aka 2.0.8 rc2) update

Changed files:
    ebtables.spec -> 1.10

diff --git a/ebtables.spec b/ebtables.spec
index 34aad806e6f396aedc0e5470ad656b549a731b65..d3e9c9abe1021b5678f58e8e0fa7be859cd3db7b 100644 (file)
--- a/ebtables.spec
+++ b/ebtables.spec
@@ -1,12 +1,17 @@
+#
+# TODO:
+#      - initscripts stuff - move save/restore dumps to /etc/sysconfig & more
+#      - review llh patch
+#
 Summary:       Ethernet Bridge Tables
 Summary(pl):   Ethernet Bridge Tables - filtrowanie i translacja adresów dla Ethernetu
 Name:          ebtables
-Version:       2.0.6
-Release:       1
+Version:       2.0.8
+Release:       0.rc2.1
 License:       GPL
 Group:         Networking/Daemons
-Source0:       http://dl.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
-# Source0-md5: c4559af2366c764c6c42a3fdd40d60d3
+Source0:       http://dl.sourceforge.net/%{name}/%{name}-v%{version}-rc2.tar.gz
+# Source0-md5: f07111fcc1966be669278433c35dcc28
 Patch0:                %{name}-llh.patch
 URL:           http://ebtables.sourceforge.net/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -28,7 +33,7 @@ dopasowywanie ramek. Infrastruktura ebtables jest cz
 standardowych j±der Linuksa w wersjach 2.5.x i nowszych.
 
 %prep
-%setup -q -n %{name}-v%{version}
+%setup -q -n %{name}-v%{version}-rc2
 %patch0 -p1
 
 %build
@@ -36,14 +41,51 @@ standardowych j
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D ebtables    $RPM_BUILD_ROOT%{_sbindir}/ebtables
-install -D ebtables.8  $RPM_BUILD_ROOT%{_mandir}/man8/ebtables.8
+
+install -d $RPM_BUILD_ROOT%{_sbindir}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -d $RPM_BUILD_ROOT%{_mandir}
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+install -d $RPM_BUILD_ROOT%{_libdir}/ebtables
+install -d $RPM_BUILD_ROOT%{_initrddir}
+
+install ebtables               $RPM_BUILD_ROOT%{_sbindir}
+install ebtables-restore       $RPM_BUILD_ROOT%{_sbindir}
+install ethertypes             $RPM_BUILD_ROOT%{_sysconfdir}
+install ebtables.8             $RPM_BUILD_ROOT%{_mandir}/man8
+install extensions/*.so                $RPM_BUILD_ROOT%{_libdir}/ebtables
+install *.so                   $RPM_BUILD_ROOT%{_libdir}/ebtables
+
+export __iets=`printf %{_sbindir} | sed 's/\\//\\\\\\//g'`
+export __iets2=`printf %{_mysysconfdir} | sed 's/\\//\\\\\\//g'`
+sed -i "s/__EXEC_PATH__/$__iets/g" ebtables-save
+install ebtables-save          $RPM_BUILD_ROOT%{_sbindir}
+sed -i "s/__EXEC_PATH__/$__iets/g" ebtables.sysv; sed -i "s/__SYSCONFIG__/$__iets2/g" ebtables.sysv
+install ebtables.sysv          $RPM_BUILD_ROOT%{_initrddir}/ebtables
+sed -i "s/__SYSCONFIG__/$__iets2/g" ebtables-config
+install ebtables-config                $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+unset __iets
+unset __iets2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add ebtables
+
+%preun
+if [ $1 -eq 0 ]; then
+       /sbin/service ebtables stop &>/dev/null || :
+       /sbin/chkconfig --del ebtables
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog
+%doc ChangeLog COPYING INSTALL THANKS
+%doc %{_mandir}/man8/ebtables.8*
+%config %{_sysconfdir}/ethertypes
+%config %{_sysconfdir}/sysconfig/ebtables-config
+%attr(755,root,root) %{_initrddir}/ebtables
 %attr(755,root,root) %{_sbindir}/*
-%{_mandir}/man8/*
+%{_libdir}/ebtables/