- upgraded to v2.0.9-1; release 1,

- moved libebtc.so to %_libdir, use CFLAGS, shorter directory preparation,
  verbose file listing

Changed files:
    ebtables.spec -> 1.20

diff --git a/ebtables.spec b/ebtables.spec
index 1abfae9b82d46866918e8b085ba6b85c386ebce3..f409f9e9c579184960eee8cecd68d4a9e3e1bbc7 100644 (file)
--- a/ebtables.spec
+++ b/ebtables.spec
@@ -3,17 +3,17 @@
 #      - initscripts stuff - move save/restore dumps to /etc/sysconfig & more
 #      - review llh patch
 #
-%define                _rel    2
-%define                _pre    2
+%define                _rel    1
+%define                _pre    1
 Summary:       Ethernet Bridge Tables
 Summary(pl.UTF-8):     Ethernet Bridge Tables - filtrowanie i translacja adresów dla Ethernetu
 Name:          ebtables
-Version:       2.0.8
-Release:       0.%{_pre}.%{_rel}
+Version:       2.0.9
+Release:       %{_pre}.%{_rel}
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/ebtables/%{name}-v%{version}-%{_pre}.tar.gz
-# Source0-md5: 66bcbcb2dcf3b981ad4e86e1720e796e
+# Source0-md5: 0e0c20adf2bba6d91dbd0b74a1a38c33
 URL:           http://ebtables.sourceforge.net/
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
@@ -41,24 +41,19 @@ standardowych jąder Linuksa w wersjach 2.5.x i nowszych.
 
 %build
 %{__make} \
+       CFLAGS="%{rpmcflags}" \
        CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_sbindir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
-install -d $RPM_BUILD_ROOT/etc/sysconfig
-install -d $RPM_BUILD_ROOT%{_mandir}/man8
-install -d $RPM_BUILD_ROOT%{_libdir}/ebtables
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -d $RPM_BUILD_ROOT{/etc/sysconfig,/etc/rc.d/init.d,%{_sysconfdir},%{_sbindir},%{_libdir}/ebtables,%{_mandir}/man8}
 
-install ebtables               $RPM_BUILD_ROOT%{_sbindir}
-install ebtables-restore       $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
+install *.so                   $RPM_BUILD_ROOT%{_libdir}
 
 export __iets=`printf %{_sbindir} | sed 's/\\//\\\\\\//g'`
 export __iets2=`printf %{_mysysconfdir} | sed 's/\\//\\\\\\//g'`
@@ -87,7 +82,8 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ethertypes
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ebtables-config
 %attr(754,root,root) /etc/rc.d/init.d/ebtables
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/ebtables*
+%attr(755,root,root) %{_libdir}/libebtc.so
 %dir %{_libdir}/ebtables
-%attr(755,root,root) %{_libdir}/ebtables/*.so
+%attr(755,root,root) %{_libdir}/ebtables/libebt*.so
 %{_mandir}/man8/ebtables.8*