- updated to 2.0.8

[packages/fwbuilder.git] / fwbuilder.spec

diff --git a/fwbuilder.spec b/fwbuilder.spec
index b4bf6ae9ea6658cab46fbb8786ac0b9e970467a5..8d22db3485ba25bd4b9fef9018575299dfa45349 100644 (file)
--- a/fwbuilder.spec
+++ b/fwbuilder.spec
@@ -1,20 +1,27 @@
+#
+# Conditional build:
+%bcond_with    ccache  # enable ccache
+#
 Summary:       Firewall Builder
 Summary(pl):   Narzêdzie do tworzenia firewalli
 Name:          fwbuilder
-Version:       2.0.1
+Version:       2.0.8
 Release:       1
-License:       GPL
+License:       GPL v2
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
-# Source0-md5: 7e63c4c8c29a5fdd5cb7ed36dcb8bd38
+# Source0-md5: 37d4266b95967c3d4295ec5efdfa0c23
+Source1:       %{name}.desktop
+Source2:       %{name}.png
 Patch0:                %{name}-configure.patch
 URL:           http://www.fwbuilder.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libfwbuilder-devel >= 2.0.0
+BuildRequires: libfwbuilder-devel = %{version}
 BuildRequires: qmake
-BuildRequires: qt-devel >= 3.0
-Requires:      libfwbuilder >= 2.0.0
+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)
@@ -173,24 +180,38 @@ Pliki specyficzne dla MacOS X.
 %setup -q
 %patch0 -p1
 
+# 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
+export QTDIR="%{_usr}"
+export QMAKESPEC="%{_datadir}/qt/mkspecs/linux-g++"
+
 cp -f /usr/share/automake/config.* .
 %{__aclocal}
 %{__autoconf}
 %configure \
-       QMAKE_CXXFLAGS_RELEASE="%{rpmcflags}" \
        --with-templatedir=%{_datadir}/fwbuilder
-
-%{__make} \
-       QTDIR=/usr
+%{__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 \
-       QTDIR=/usr \
        DDIR=$RPM_BUILD_ROOT
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -206,16 +227,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/locale
 %lang(fr) %{_datadir}/%{name}/locale/fwbuilder_fr.qm
 %lang(ru) %{_datadir}/%{name}/locale/fwbuilder_ru.qm
-%lang(vi) %{_datadir}/%{name}/locale/fwbuilder_vi.qm
+%lang(ja) %{_datadir}/%{name}/locale/fwbuilder_ja.qm
 %dir %{_datadir}/%{name}/os
 %{_datadir}/%{name}/os/linksys.xml
 %{_datadir}/%{name}/os/unknown_os.xml
 %dir %{_datadir}/%{name}/platform
 %{_datadir}/%{name}/platform/unknown.xml
+%{_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)