+#
+%define _majver 4
+%define _minver 2
Summary: Firewall Builder
-Summary(pl): Narzêdzie do tworzenia firewalli
+Summary(pl.UTF-8): Narzędzie do tworzenia firewalli
Name: fwbuilder
-Version: 1.1.2
-Release: 1
-License: GPL
+Version: %{_majver}.%{_minver}.2.3541
+Release: 3
+License: GPL v2
Group: Applications/System
-Source0: http://dl.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
-# Source0-md5: 54a57c9e82da151b59afe0a1c0e66586
-Patch0: %{name}-modulesdir.patch
+Source0: http://downloads.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
+# Source0-md5: 56ddc67c79adaf5d5730945ad1a26666
+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: QtCore-devel >= 4.3
+BuildRequires: QtDBus-devel >= 4.3
+BuildRequires: QtGui-devel >= 4.3
+BuildRequires: QtNetwork-devel >= 4.3
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: gdk-pixbuf-devel
-BuildRequires: gtkmm1-devel >= 1.2.3
-BuildRequires: imlib-devel
-BuildRequires: libfwbuilder-devel >= 1.0.1
-BuildRequires: libtool
-BuildRequires: libxml2-devel
-BuildRequires: libxslt-devel
-Requires: libfwbuilder >= 1.0.1
-Obsoletes: fwbuilder-doc
+BuildRequires: gettext-devel
+BuildRequires: qt4-build
+BuildRequires: qt4-qmake
Obsoletes: fwbuilder-devel
+Obsoletes: fwbuilder-doc
+Obsoletes: libfwbuilder
+Obsoletes: libfwbuilder-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Firewall administration toolkit.
-%description -l pl
-Narzêdzie do tworzenia i administracji firewallami.
-
-%package install
-Summary: Install script for Firewall Builder rules
-Summary(pl): Skrypt instaluj±cy regu³ki tworzone przez Firewall Buildera
-Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-
-%description install
-Install script for Firewall Builder rules.
-
-%description install -l pl
-Skrypt instaluj±cy regu³ki tworzone przez Firewall Buildera.
+%description -l pl.UTF-8
+Narzędzie do tworzenia i administracji firewallami.
%package compiler-ipfilter
Summary: ipfilter compiler for Firewall Builder
-Summary(pl): Kompilator ipfilter dla Firewall Buildera
+Summary(pl.UTF-8): Kompilator ipfilter dla Firewall Buildera
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description compiler-ipfilter
ipfilter compiler for Firewall Builder.
-%description compiler-ipfilter -l pl
+%description compiler-ipfilter -l pl.UTF-8
Kompilator ipfilter dla Firewall Buildera.
%package compiler-iptables
Summary: iptables compiler for Firewall Builder
-Summary(pl): Kompilator iptables dla Firewall Buildera
+Summary(pl.UTF-8): Kompilator iptables dla Firewall Buildera
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description compiler-iptables
iptables compiler for Firewall Builder.
-%description compiler-iptables -l pl
+%description compiler-iptables -l pl.UTF-8
Kompilator iptables dla Firewall Buildera.
%package compiler-openbsd-pf
Summary: OpenBSD pf compiler for Firewall Builder
-Summary(pl): Kompilator OpenBSD pf dla Firewall Buildera
+Summary(pl.UTF-8): Kompilator OpenBSD pf dla Firewall Buildera
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description compiler-openbsd-pf
OpenBSD pf compiler for Firewall Builder.
-%description compiler-openbsd-pf -l pl
+%description compiler-openbsd-pf -l pl.UTF-8
Kompilator OpenBSD pf dla Firewall Buildera.
+%package compiler-cisco-fwsm
+Summary: Cisco FWSM compiler for Firewall Builder
+Summary(pl.UTF-8): Kompilator Cisco FWSM dla Firewall Buildera
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description compiler-cisco-fwsm
+Cisco FWSM compiler for Firewall Builder.
+
+%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): Kompilator Cisco PIX dla Firewall Buildera
+Summary(pl.UTF-8): Kompilator Cisco PIX dla Firewall Buildera
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description compiler-cisco-pix
Cisco PIX compiler for Firewall Builder.
-%description compiler-cisco-pix -l pl
+%description compiler-cisco-pix -l pl.UTF-8
Kompilator Cisco PIX dla Firewall Buildera.
%package compiler-freebsd-ipfw
Summary: FreeBSD ipfw compiler for Firewall Builder
-Summary(pl): Kompilator FreeBSD ipfw dla Firewall Buildera
+Summary(pl.UTF-8): Kompilator FreeBSD ipfw dla Firewall Buildera
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description compiler-freebsd-ipfw
FreeBSD ipfw compiler for Firewall Builder.
-%description compiler-freebsd-ipfw -l pl
+%description compiler-freebsd-ipfw -l pl.UTF-8
Kompilator FreeBSD ipfw dla Firewall Buildera.
+%package compiler-procurve
+Summary: HP Procurve compiler for Firewall Builder
+Summary(pl.UTF-8): Kompilator HP Procurve dla Firewall Buildera
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description compiler-procurve
+HP Procurve compiler for Firewall Builder.
+
+%description compiler-procurve -l pl.UTF-8
+Kompilator HP Procurve dla Firewall Buildera.
+
%package platform-linux24
Summary: Linux 2.4 specific files
-Summary(pl): Pliki specyficzne dla Linuksa 2.4
+Summary(pl.UTF-8): Pliki specyficzne dla Linuksa 2.4
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description platform-linux24
Linux 2.4 specific files.
-%description platform-linux24 -l pl
+%description platform-linux24 -l pl.UTF-8
Pliki specyficzne dla Linuksa 2.4.
-%package platform-freebsd
-Summary: FreeBSD specific files
-Summary(pl): Pliki specyficzne dla FreeBSD
+%package platform-bsd
+Summary: Variuos BSD specific files
+Summary(pl.UTF-8): Pliki specyficzne dla różnych BSD
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-%description platform-freebsd
-FreeBSD specific files.
+%description platform-bsd
+Variuos BSD specific files.
-%description platform-freebsd -l pl
-Pliki specyficzne dla FreeBSD.
+%description platform-bsd -l pl.UTF-8
+Pliki specyficzne dla róznych BSD.
-%package platform-openbsd
-Summary: OpenBSD specific files
-Summary(pl): Pliki specyficzne dla OpenBSD
+%package platform-cisco
+Summary: Cisco specific files
+Summary(pl.UTF-8): Pliki specyficzne dla Cisco
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-%description platform-openbsd
-OpenBSD specific files.
+%description platform-cisco
+Cisco specific files.
-%description platform-openbsd -l pl
-Pliki specyficzne dla OpenBSD.
+%description platform-cisco -l pl.UTF-8
+Pliki specyficzne dla Cisco.
-%package platform-cisco-pix
-Summary: Cisco PIX specific files
-Summary(pl): Pliki specyficzne dla Cisco PIX
+%package platform-procurve
+Summary: HP Procurve specific files
+Summary(pl.UTF-8): Pliki specyficzne dla HP Procurve
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-%description platform-cisco-pix
-Cisco PIX specific files.
+%description platform-procurve
+HP Procurve specific files.
-%description platform-cisco-pix -l pl
-Pliki specyficzne dla Cisci PIX.
+%description platform-procurve -l pl.UTF-8
+Pliki specyficzne dla HP Procurve.
%package platform-solaris
Summary: Solaris specific files
-Summary(pl): Pliki specyficzne dla Solarisa
+Summary(pl.UTF-8): Pliki specyficzne dla Solarisa
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description platform-solaris
Solaris specific files.
-%description platform-solaris -l pl
+%description platform-solaris -l pl.UTF-8
Pliki specyficzne dla Solarisa.
%package platform-macosx
Summary: MacOS X specific files
-Summary(pl): Pliki specyficzne dla MacOS X
+Summary(pl.UTF-8): Pliki specyficzne dla MacOS X
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description platform-macosx
MacOS X specific files.
-%description platform-macosx -l pl
+%description platform-macosx -l pl.UTF-8
Pliki specyficzne dla MacOS X.
%prep
%setup -q
-%patch -p1
-
-# don't call autoheader, it would destroy important parts of config.h
-echo '#undef MODULES_DIR' >> config.h.in
+#%patch0 -p1
+%patch1 -p1
+#%patch2 -p1
%build
-%{__libtoolize}
+export QTDIR="%{_usr}"
+export QMAKESPEC="%{_datadir}/qt4/mkspecs/linux-g++"
+
+cp -f /usr/share/automake/config.* .
%{__aclocal}
%{__autoconf}
%configure \
- --enable-auto-docdir \
- --disable-static \
--with-templatedir=%{_datadir}/fwbuilder \
- --with-iconsdir=%{_pixmapsdir}/fwbuilder
-
+ --with-qmake=qmake-qt4
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+
+export QTDIR="%{_usr}"
+export QMAKESPEC="%{_datadir}/qt/mkspecs/linux-g++"
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+ INSTALL_ROOT=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}/fwbuilder
-install src/icons/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/fwbuilder
-install src/icons/host*.png $RPM_BUILD_ROOT%{_pixmapsdir}/fwbuilder
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-%find_lang %{name}
+# drop 512x512 icon
+rm -rf $RPM_BUILD_ROOT%{_iconsdir}/hicolor/512x512
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}.lang
+%files
%defattr(644,root,root,755)
-%doc doc/AUTHORS doc/ChangeLog doc/Credits doc/NEWS doc/README* doc/TODO
-%doc doc/examples doc/testing_new_compiler
-%doc doc/*.html
-%attr(755,root,root) %{_bindir}/fwbuilder
-%attr(755,root,root) %{_bindir}/fwblookup
-%attr(755,root,root) %{_bindir}/fwb_compile_all
+%doc doc/{AUTHORS,ChangeLog,Credits,README*,*.html}
%attr(755,root,root) %{_bindir}/fwbedit
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/modules
-%dir %{_libdir}/%{name}/modules/gui
+%attr(755,root,root) %{_bindir}/fwbuilder
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/platform
-%dir %{_datadir}/%{name}/os
-%{_datadir}/%{name}/*.*
-%{_datadir}/%{name}/gtkrc
+%{_datadir}/%{name}/fwbuilder.dtd
+%{_datadir}/%{name}/*.xml
+%dir %{_datadir}/%{name}/configlets
+%dir %{_datadir}/%{name}/locale
%{_datadir}/%{name}/migration
-%{_datadir}/%{name}/filters
+%dir %{_datadir}/%{name}/os
%{_datadir}/%{name}/os/unknown_os.xml
+%{_datadir}/%{name}/os/endian.xml
+%{_datadir}/%{name}/os/oneshield.xml
+%dir %{_datadir}/%{name}/platform
%{_datadir}/%{name}/platform/unknown.xml
-%{_datadir}/bug-buddy/bugzilla/*
-%{_datadir}/bug-buddy/xml/*
-%{_datadir}/bug-buddy/fwbuilder*
-%{_pixmapsdir}/%{name}
+%{_desktopdir}/fwbuilder.desktop
%{_mandir}/man1/fwbuilder*
-%{_mandir}/man1/fwblookup*
-%{_mandir}/man1/fwb_compile_all*
%{_mandir}/man1/fwbedit*
-
-%files install
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/fwb_install
-%{_mandir}/man1/fwb_install*
+%{_pixmapsdir}/fwbuilder.png
+%{_iconsdir}/hicolor/*/apps/fwbuilder.png
%files compiler-iptables
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/fwb_ipt
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_iptables_dlg.so
%{_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
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_ipf_dlg.so
%{_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
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_pf_dlg.so
%{_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) %{_libdir}/%{name}/modules/gui/lib_pix_dlg.so
+%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
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_ipfw_dlg.so
%{_datadir}/%{name}/platform/ipfw.xml
+%{_mandir}/man1/fwb_ipfw.1*
+
+%files compiler-procurve
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fwb_procurve_acl
+%{_datadir}/%{name}/platform/procurve_acl.xml
%files platform-linux24
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_linux24_dlg.so
+%attr(755,root,root) %{_bindir}/transfer_secuwall
+%{_datadir}/%{name}/configlets/dd-wrt-jffs
+%{_datadir}/%{name}/configlets/dd-wrt-nvram
+%{_datadir}/%{name}/configlets/ipcop
+%{_datadir}/%{name}/configlets/openwrt
+%{_datadir}/%{name}/configlets/ipf
+%{_datadir}/%{name}/configlets/linux24
+%{_datadir}/%{name}/configlets/secuwall
+%{_datadir}/%{name}/configlets/sveasoft
%{_datadir}/%{name}/os/linux24.xml
-
-%files platform-freebsd
+%{_datadir}/%{name}/os/dd-wrt-jffs.xml
+%{_datadir}/%{name}/os/dd-wrt-nvram.xml
+%{_datadir}/%{name}/os/ipcop.xml
+%{_datadir}/%{name}/os/openwrt.xml
+%{_datadir}/%{name}/os/secuwall.xml
+%{_datadir}/%{name}/os/sveasoft.xml
+
+%files platform-bsd
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_freebsd_dlg.so
+%{_datadir}/%{name}/configlets/bsd
+%{_datadir}/%{name}/configlets/freebsd
+%{_datadir}/%{name}/configlets/ipfw
+%{_datadir}/%{name}/configlets/openbsd
+%{_datadir}/%{name}/configlets/pf
%{_datadir}/%{name}/os/freebsd.xml
-
-%files platform-openbsd
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_openbsd_dlg.so
%{_datadir}/%{name}/os/openbsd.xml
-%files platform-cisco-pix
+%files platform-cisco
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_pix_os_dlg.so
+%{_datadir}/%{name}/configlets/fwsm_os
+%{_datadir}/%{name}/configlets/ios
+%{_datadir}/%{name}/configlets/pix_os
+%{_datadir}/%{name}/os/ios.xml
%{_datadir}/%{name}/os/pix_os.xml
+%{_datadir}/%{name}/os/fwsm_os.xml
+
+%files platform-procurve
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/configlets/procurve
+%{_datadir}/%{name}/os/procurve.xml
%files platform-solaris
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_solaris_dlg.so
+%{_datadir}/%{name}/configlets/solaris
%{_datadir}/%{name}/os/solaris.xml
%files platform-macosx
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_macosx_dlg.so
+%{_datadir}/%{name}/configlets/macosx
%{_datadir}/%{name}/os/macosx.xml