SPECS: fwbuilder.spec - up to 2.1.18 - ccache bcond dropped - upda...
twittner
twittner at pld-linux.org
Wed Apr 9 21:21:36 CEST 2008
Author: twittner Date: Wed Apr 9 19:21:36 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 2.1.18
- ccache bcond dropped
- updated packages and manpages set (but spec in sources suggests
not to split fwbuilder in subpackages at all)
---- Files affected:
SPECS:
fwbuilder.spec (1.48 -> 1.49)
---- Diffs:
================================================================
Index: SPECS/fwbuilder.spec
diff -u SPECS/fwbuilder.spec:1.48 SPECS/fwbuilder.spec:1.49
--- SPECS/fwbuilder.spec:1.48 Sat Jan 12 20:34:08 2008
+++ SPECS/fwbuilder.spec Wed Apr 9 21:21:31 2008
@@ -1,23 +1,21 @@
# $Revision$, $Date$
#
-# Conditional build:
-%bcond_with ccache # enable ccache
-#
%define _majver 2
%define _minver 1
Summary: Firewall Builder
Summary(pl.UTF-8): Narzędzie do tworzenia firewalli
Name: fwbuilder
-Version: %{_majver}.%{_minver}.16
-Release: 3
+Version: %{_majver}.%{_minver}.18
+Release: 1
License: GPL v2
Group: Applications/System
Source0: http://dl.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
-# Source0-md5: bb8b0c12f213dbfadb9fc43b53ed6785
+# Source0-md5: dade153059782164b0d326f964eca63a
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-configure.patch
Patch1: %{name}-c++.patch
+Patch2: %{name}-dont-mess-with-compiler-names-and-ccache.patch
URL: http://www.fwbuilder.org/
BuildRequires: antlr = 2.7.7
BuildRequires: autoconf
@@ -26,7 +24,6 @@
BuildRequires: libfwbuilder-devel = %{version}
BuildRequires: qmake
BuildRequires: qt-devel >= 3.2
-%{?with_ccache:BuildRequires: ccache}
Requires: libfwbuilder = %{version}
Obsoletes: fwbuilder-doc
Obsoletes: fwbuilder-devel
@@ -98,6 +95,18 @@
%description compiler-cisco-fwsm -l pl.UTF-8
Kompilator Cisco FWSM dla Firewall Buildera.
+%package compiler-cisco-iosacl
+Summary: Cisco IOSACL compiler for Firewall Builder
+Summary(pl.UTF-8): Kompilator Cisco IOSACL dla Firewall Buildera
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description compiler-cisco-iosacl
+Cisco FWSM compiler for Firewall Builder.
+
+%description compiler-cisco-iosacl -l pl.UTF-8
+Kompilator Cisco IOSACL dla Firewall Buildera.
+
%package compiler-cisco-pix
Summary: Cisco PIX compiler for Firewall Builder
Summary(pl.UTF-8): Kompilator Cisco PIX dla Firewall Buildera
@@ -210,11 +219,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
-
-%if %{without ccache}
-grep -vi ccache configure.in > configure.in.x
-mv configure.in.x configure.in
-%endif
+%patch2 -p1
%build
export QTDIR="%{_usr}"
@@ -257,6 +262,7 @@
%lang(es) %{_datadir}/%{name}/locale/fwbuilder_es.qm
%lang(fr) %{_datadir}/%{name}/locale/fwbuilder_fr.qm
%lang(ja) %{_datadir}/%{name}/locale/fwbuilder_ja.qm
+%lang(pt_BR) %{_datadir}/%{name}/locale/fwbuilder_pt_BR.qm
%lang(ru) %{_datadir}/%{name}/locale/fwbuilder_ru.qm
%lang(sv) %{_datadir}/%{name}/locale/fwbuilder_sv.qm
%dir %{_datadir}/%{name}/os
@@ -282,34 +288,41 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/fwb_ipt
%{_datadir}/%{name}/platform/iptables.xml
-%{_mandir}/man1/fwb_ipt*
+%{_mandir}/man1/fwb_ipt.1*
%files compiler-ipfilter
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/fwb_ipf
%{_datadir}/%{name}/platform/ipf.xml
-%{_mandir}/man1/fwb_ipf*
+%{_mandir}/man1/fwb_ipf.1*
%files compiler-openbsd-pf
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/fwb_pf
%{_datadir}/%{name}/platform/pf.xml
-%{_mandir}/man1/fwb_pf*
+%{_mandir}/man1/fwb_pf.1*
%files compiler-cisco-fwsm
%defattr(644,root,root,755)
%{_datadir}/%{name}/platform/fwsm.xml
+%files compiler-cisco-iosacl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fwb_iosacl
+%{_datadir}/%{name}/platform/iosacl.xml
+%{_mandir}/man1/fwb_iosacl.1*
+
%files compiler-cisco-pix
%defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/fwb_pix
+%attr(755,root,root) %{_bindir}/fwb_pix
%{_datadir}/%{name}/platform/pix.xml
-#%%{_mandir}/man1/fwb_pix*
+%{_mandir}/man1/fwb_pix.1*
%files compiler-freebsd-ipfw
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/fwb_ipfw
%{_datadir}/%{name}/platform/ipfw.xml
+%{_mandir}/man1/fwb_ipfw.1*
%files platform-linux24
%defattr(644,root,root,755)
@@ -345,6 +358,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.49 2008-04-09 19:21:31 twittner
+- up to 2.1.18
+- ccache bcond dropped
+- updated packages and manpages set (but spec in sources suggests
+ not to split fwbuilder in subpackages at all)
+
Revision 1.48 2008-01-12 19:34:08 qboosh
- use system antlr (BR exactly 2.7.7 - as checked by configure);
it just needs rebuild with current g++
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fwbuilder.spec?r1=1.48&r2=1.49&f=u
More information about the pld-cvs-commit
mailing list