Author: alucard Date: Thu Jul 16 11:31:48 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.0.5 (3. series are marked stable), works for me
- some patches commented out, as I wasn't sure if they're really not needed
anymore
- fwblookup, fwb_install are no longer separate binaries (needs check)
---- Files affected:
packages/fwbuilder:
fwbuilder.spec (1.49 -> 1.50) , fwbuilder-configure.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/fwbuilder/fwbuilder.spec
diff -u packages/fwbuilder/fwbuilder.spec:1.49
packages/fwbuilder/fwbuilder.spec:1.50
--- packages/fwbuilder/fwbuilder.spec:1.49 Wed Apr 9 21:21:31 2008
+++ packages/fwbuilder/fwbuilder.spec Thu Jul 16 13:31:43 2009
@@ -1,16 +1,16 @@
# $Revision$, $Date$
#
-%define _majver 2
-%define _minver 1
+%define _majver 3
+%define _minver 0
Summary: Firewall Builder
Summary(pl.UTF-8): Narzędzie do tworzenia firewalli
Name: fwbuilder
-Version: %{_majver}.%{_minver}.18
+Version: %{_majver}.%{_minver}.5
Release: 1
License: GPL v2
Group: Applications/System
Source0: http://dl.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
-# Source0-md5: dade153059782164b0d326f964eca63a
+# Source0-md5: d4d914882a215e6d651dc7094ea88a36
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-configure.patch
@@ -22,8 +22,11 @@
BuildRequires: automake
BuildRequires: gettext-devel
BuildRequires: libfwbuilder-devel = %{version}
-BuildRequires: qmake
-BuildRequires: qt-devel >= 3.2
+BuildRequires: qt4-build
+BuildRequires: qt4-qmake
+BuildRequires: QtCore-devel >= 4.3
+BuildRequires: QtGui-devel >= 4.3
+BuildRequires: QtNetwork-devel >= 4.3
Requires: libfwbuilder = %{version}
Obsoletes: fwbuilder-doc
Obsoletes: fwbuilder-devel
@@ -35,17 +38,17 @@
%description -l pl.UTF-8
Narzędzie do tworzenia i administracji firewallami.
-%package install
-Summary: Install script for Firewall Builder rules
-Summary(pl.UTF-8): Skrypt instalujący regułki tworzone przez Firewall
Buildera
-Group: Applications/System
-Requires: %{name} = %{version}-%{release}
+#%package install
+#Summary: Install script for Firewall Builder rules
+#Summary(pl.UTF-8): 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
+#Install script for Firewall Builder rules.
-%description install -l pl.UTF-8
-Skrypt instalujący regułki tworzone przez Firewall Buildera.
+#%description install -l pl.UTF-8
+#Skrypt instalujący regułki tworzone przez Firewall Buildera.
%package compiler-ipfilter
Summary: ipfilter compiler for Firewall Builder
@@ -219,17 +222,18 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
%build
export QTDIR="%{_usr}"
-export QMAKESPEC="%{_datadir}/qt/mkspecs/linux-g++"
+export QMAKESPEC="%{_datadir}/qt4/mkspecs/linux-g++"
cp -f /usr/share/automake/config.* .
%{__aclocal}
%{__autoconf}
%configure \
- --with-templatedir=%{_datadir}/fwbuilder
+ --with-templatedir=%{_datadir}/fwbuilder \
+ --with-qmake=qmake-qt4
%{__make}
%install
@@ -240,7 +244,7 @@
export QMAKESPEC="%{_datadir}/qt/mkspecs/linux-g++"
%{__make} install \
- DDIR=$RPM_BUILD_ROOT
+ INSTALL_ROOT=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -253,18 +257,18 @@
%doc doc/{AUTHORS,ChangeLog,Credits,README*,*.html}
%attr(755,root,root) %{_bindir}/fwb_compile_all
%attr(755,root,root) %{_bindir}/fwbedit
-%attr(755,root,root) %{_bindir}/fwblookup
+#%attr(755,root,root) %{_bindir}/fwblookup
%attr(755,root,root) %{_bindir}/fwbuilder
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*.xml
%dir %{_datadir}/%{name}/locale
-%lang(de) %{_datadir}/%{name}/locale/fwbuilder_de.qm
-%lang(es) %{_datadir}/%{name}/locale/fwbuilder_es.qm
-%lang(fr) %{_datadir}/%{name}/locale/fwbuilder_fr.qm
+#%lang(de) %{_datadir}/%{name}/locale/fwbuilder_de.qm
+#%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(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
+#%lang(sv) %{_datadir}/%{name}/locale/fwbuilder_sv.qm
%dir %{_datadir}/%{name}/os
%{_datadir}/%{name}/os/linksys.xml
%{_datadir}/%{name}/os/unknown_os.xml
@@ -274,15 +278,16 @@
%{_datadir}/%{name}/platform/iosacl.xml
%{_desktopdir}/fwbuilder.desktop
%{_mandir}/man1/fwbuilder*
-%{_mandir}/man1/fwblookup*
+#%{_mandir}/man1/fwblookup*
%{_mandir}/man1/fwb_compile_all*
%{_mandir}/man1/fwbedit*
%{_pixmapsdir}/fwbuilder.png
+%{_iconsdir}/hicolor/*/apps/fwbuilder.png
-%files install
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/fwb_install
-%{_mandir}/man1/fwb_install*
+#%files install
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_bindir}/fwb_install
+#%{_mandir}/man1/fwb_install*
%files compiler-iptables
%defattr(644,root,root,755)
@@ -358,6 +363,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.50 2009/07/16 11:31:43 alucard
+- up to 3.0.5 (3. series are marked stable), works for me
+- some patches commented out, as I wasn't sure if they're really not needed
+ anymore
+- fwblookup, fwb_install are no longer separate binaries (needs check)
+
Revision 1.49 2008/04/09 19:21:31 twittner
- up to 2.1.18
- ccache bcond dropped
================================================================
Index: packages/fwbuilder/fwbuilder-configure.patch
diff -u packages/fwbuilder/fwbuilder-configure.patch:1.4
packages/fwbuilder/fwbuilder-configure.patch:1.5
--- packages/fwbuilder/fwbuilder-configure.patch:1.4 Wed Apr 9 21:16:31 2008
+++ packages/fwbuilder/fwbuilder-configure.patch Thu Jul 16 13:31:43 2009
@@ -1,15 +1,3 @@
-diff -Nur o.fwbuilder-2.1.12/qmake.inc.in n.fwbuilder-2.1.12/qmake.inc.in
---- o.fwbuilder-2.1.12/qmake.inc.in 2007-05-18 05:16:09.000000000 +0200
-+++ n.fwbuilder-2.1.12/qmake.inc.in 2007-06-28 01:06:38.000000000 +0200
-@@ -35,7 +35,7 @@
- res_os.path = $(DDIR)@RES_DIR@/os
- res_platform.path = $(DDIR)@RES_DIR@/platform
-
-- CONFIG += qt thread rtti stl warn_on debug
-+ CONFIG += qt thread rtti stl warn_on
- INCLUDEPATH += @LIBFWBUILDER_INCLUDEPATH@
-
- LIBS += $$LIBS_FWBUILDER @LIBS@
diff -Nur o.fwbuilder-2.1.12/src/src.pro n.fwbuilder-2.1.12/src/src.pro
--- o.fwbuilder-2.1.12/src/src.pro 2007-06-07 04:33:54.000000000 +0200
+++ n.fwbuilder-2.1.12/src/src.pro 2007-06-28 01:10:37.000000000 +0200
@@ -22,14 +10,28 @@
contains( HAVE_ANTLR_RUNTIME, 1 ) {
SUBDIRS += antlr parsers
---- b.fwbuilder-2.1.18/doc/doc.pro 2008-04-06 07:25:16.000000000 +0200
-+++ n.fwbuilder-2.1.18/doc/doc.pro 2008-04-09 19:55:06.000000000 +0200
-@@ -67,6 +67,8 @@
+--- fwbuilder-3.0.5-orig/qmake.inc.in 2009-06-24 18:59:55.000000000 +0200
++++ fwbuilder-3.0.5/qmake.inc.in 2009-07-15 14:34:56.350185928 +0200
+@@ -58,7 +58,7 @@ unix {
+
+ PKGLOCALEDIR = $$res.path/locale
+
+- CONFIG += warn_on debug
++ CONFIG += warn_on
+ QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+ QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
+--- fwbuilder-3.0.5-orig/doc/doc.pro 2009-06-24 18:59:48.000000000 +0200
++++ fwbuilder-3.0.5/doc/doc.pro 2009-07-15 14:36:50.350151695 +0200
+@@ -48,9 +48,8 @@ man.files = fwbedit.1 \
+ fwb_ipt.1 \
fwb_pf.1 \
fwb_pix.1 \
- fwb_iosacl.1 \
-+ fwb_install.1 \
-+ fwb_compile_all.1
+-
+-# fwb_install.1 \
+-# fwb_compile_all.1 \
++ fwb_install.1 \
++ fwb_compile_all.1 \
- man.path = $(DDIR)$$MANDIR/man1
+ man.path = $$MANDIR/man1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fwbuilder/fwbuilder.spec?r1=1.49&r2=1.50&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fwbuilder/fwbuilder-configure.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
