X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fwbuilder.spec;h=04d05101e55f559aa9dcee77e9bb6cb7281328fa;hb=9b3206abcd71815911738aee24dc2805c6a01cc1;hp=be4257c705039af15aa1de33871a94c4dd051d2e;hpb=a6d2647266ac3d1746caa6fa8af0e00dbd480cb0;p=packages%2Ffwbuilder.git

diff --git a/fwbuilder.spec b/fwbuilder.spec
index be4257c..04d0510 100644
--- a/fwbuilder.spec
+++ b/fwbuilder.spec
@@ -1,27 +1,30 @@
+#
+# Conditional build:
+%bcond_with	ccache	# enable ccache
+#
 Summary:	Firewall Builder
 Summary(pl):	Narzêdzie do tworzenia firewalli
 Name:		fwbuilder
-Version:	1.0.10
+Version:	2.0.6
 Release:	1
-License:	GPL
+License:	GPL v2
 Group:		Applications/System
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5:	a2fbe778af33d0227af013d69c69411b
-Patch0:		%{name}-modulesdir.patch
+Source0:	http://dl.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
+# Source0-md5:	41554801c43e14a48b19ade91e5a14cd
+Source1:	%{name}.desktop
+Source2:	%{name}.png
+Patch0:		%{name}-configure.patch
 URL:		http://www.fwbuilder.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	gdk-pixbuf-devel
-BuildRequires:	gtkmm1-devel >= 1.2.3
-BuildRequires:	imlib-devel
-BuildRequires:	libfwbuilder-devel >= 1.0.0
-BuildRequires:	libtool
-BuildRequires:	libxml2-devel
-BuildRequires:	libxslt-devel
-Requires:	libfwbuilder >= 1.0.0
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires:	libfwbuilder-devel = %{version}
+BuildRequires:	qmake
+BuildRequires:	qt-devel >= 3.2
+%{?with_ccache:BuildRequires:	ccache}
+Requires:	libfwbuilder = %{version}
 Obsoletes:	fwbuilder-doc
 Obsoletes:	fwbuilder-devel
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Firewall administration toolkit.
@@ -31,21 +34,21 @@ Narz
 
 %package install
 Summary:	Install script for Firewall Builder rules
-Summary(pl):	Skrypt instalujacy regulki tworzone przez Firewall Buildera
+Summary(pl):	Skrypt instaluj±cy regu³ki tworzone przez Firewall Buildera
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description install
 Install script for Firewall Builder rules.
 
 %description install -l pl
-Skrypt instalujacy regulki tworzone przez Firewall Buildera.
+Skrypt instaluj±cy regu³ki tworzone przez Firewall Buildera.
 
 %package compiler-ipfilter
 Summary:	ipfilter compiler for Firewall Builder
 Summary(pl):	Kompilator ipfilter dla Firewall Buildera
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description compiler-ipfilter
 ipfilter compiler for Firewall Builder.
@@ -57,7 +60,7 @@ Kompilator ipfilter dla Firewall Buildera.
 Summary:	iptables compiler for Firewall Builder
 Summary(pl):	Kompilator iptables dla Firewall Buildera
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description compiler-iptables
 iptables compiler for Firewall Builder.
@@ -69,7 +72,7 @@ Kompilator iptables dla Firewall Buildera.
 Summary:	OpenBSD pf compiler for Firewall Builder
 Summary(pl):	Kompilator OpenBSD pf dla Firewall Buildera
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description compiler-openbsd-pf
 OpenBSD pf compiler for Firewall Builder.
@@ -81,7 +84,7 @@ Kompilator OpenBSD pf dla Firewall Buildera.
 Summary:	Cisco PIX compiler for Firewall Builder
 Summary(pl):	Kompilator Cisco PIX dla Firewall Buildera
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description compiler-cisco-pix
 Cisco PIX compiler for Firewall Builder.
@@ -93,7 +96,7 @@ Kompilator Cisco PIX dla Firewall Buildera.
 Summary:	FreeBSD ipfw compiler for Firewall Builder
 Summary(pl):	Kompilator FreeBSD ipfw dla Firewall Buildera
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description compiler-freebsd-ipfw
 FreeBSD ipfw compiler for Firewall Builder.
@@ -105,7 +108,7 @@ Kompilator FreeBSD ipfw dla Firewall Buildera.
 Summary:	Linux 2.4 specific files
 Summary(pl):	Pliki specyficzne dla Linuksa 2.4
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description platform-linux24
 Linux 2.4 specific files.
@@ -117,7 +120,7 @@ Pliki specyficzne dla Linuksa 2.4.
 Summary:	FreeBSD specific files
 Summary(pl):	Pliki specyficzne dla FreeBSD
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description platform-freebsd
 FreeBSD specific files.
@@ -129,7 +132,7 @@ Pliki specyficzne dla FreeBSD.
 Summary:	OpenBSD specific files
 Summary(pl):	Pliki specyficzne dla OpenBSD
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description platform-openbsd
 OpenBSD specific files.
@@ -141,7 +144,7 @@ Pliki specyficzne dla OpenBSD.
 Summary:	Cisco PIX specific files
 Summary(pl):	Pliki specyficzne dla Cisco PIX
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description platform-cisco-pix
 Cisco PIX specific files.
@@ -153,7 +156,7 @@ Pliki specyficzne dla Cisci PIX.
 Summary:	Solaris specific files
 Summary(pl):	Pliki specyficzne dla Solarisa
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description platform-solaris
 Solaris specific files.
@@ -165,7 +168,7 @@ Pliki specyficzne dla Solarisa.
 Summary:	MacOS X specific files
 Summary(pl):	Pliki specyficzne dla MacOS X
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description platform-macosx
 MacOS X specific files.
@@ -175,61 +178,67 @@ Pliki specyficzne dla MacOS X.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
-# don't call autoheader, it would destroy important parts of config.h
-echo '#undef MODULES_DIR' >> config.h.in
+# Without it this app uses ccache if it's found in system even if we don't
+# want it
+
+%if %{without ccache}
+grep -vi ccache configure.in > configure.in.x
+mv configure.in.x configure.in
+%endif
 
 %build
-%{__libtoolize}
+export QTDIR="%{_usr}"
+export QMAKESPEC="%{_datadir}/qt/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
-
-%{__make}
+	--with-templatedir=%{_datadir}/fwbuilder
+%{__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
+	DDIR=$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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %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
+%doc doc/{AUTHORS,ChangeLog,Credits,README*,*.html}
 %attr(755,root,root) %{_bindir}/fwbuilder
 %attr(755,root,root) %{_bindir}/fwblookup
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/modules
-%dir %{_libdir}/%{name}/modules/gui
+%attr(755,root,root) %{_bindir}/fwb_compile_all
+%attr(755,root,root) %{_bindir}/fwbedit
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/platform
+%{_datadir}/%{name}/*.xml
+%dir %{_datadir}/%{name}/locale
+%lang(fr) %{_datadir}/%{name}/locale/fwbuilder_fr.qm
+%lang(ru) %{_datadir}/%{name}/locale/fwbuilder_ru.qm
+%lang(ja) %{_datadir}/%{name}/locale/fwbuilder_ja.qm
 %dir %{_datadir}/%{name}/os
-%{_datadir}/%{name}/*.*
-%{_datadir}/%{name}/gtkrc
-%{_datadir}/%{name}/migration
-%{_datadir}/%{name}/filters
+%{_datadir}/%{name}/os/linksys.xml
 %{_datadir}/%{name}/os/unknown_os.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*
+%{_pixmapsdir}/fwbuilder.png
 
 %files install
 %defattr(644,root,root,755)
@@ -239,63 +248,52 @@ rm -rf $RPM_BUILD_ROOT
 %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*
 
 %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*
 
 %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*
 
 %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
 %{_datadir}/%{name}/platform/pix.xml
 #%%{_mandir}/man1/fwb_pix*
 
 %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
 
 %files platform-linux24
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_linux24_dlg.so
 %{_datadir}/%{name}/os/linux24.xml
 
 %files platform-freebsd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_freebsd_dlg.so
 %{_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
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_pix_os_dlg.so
 %{_datadir}/%{name}/os/pix_os.xml
 
 %files platform-solaris
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/modules/gui/lib_solaris_dlg.so
 %{_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}/os/macosx.xml