rpms/fwbuilder/devel .cvsignore, 1.7, 1.8 fwbuilder.spec, 1.14, 1.15 sources, 1.7, 1.8

[Ralf Ertzinger (ertzing)]

Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21039

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:

- Update to beta release 2.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 May 2006 16:52:05 -0000	1.7
+++ .cvsignore	24 Oct 2006 12:58:12 -0000	1.8
@@ -1 +1 @@
-fwbuilder-2.0.12.tar.gz
+fwbuilder-2.1.6.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fwbuilder.spec	11 Sep 2006 08:49:49 -0000	1.14
+++ fwbuilder.spec	24 Oct 2006 12:58:12 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.0.12
-Release:        2%dist
+Version:        2.1.6
+Release:        0.0.beta%{?dist}
 
 License:        GPL
 Group:          Applications/System
@@ -13,6 +13,7 @@
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  libfwbuilder-devel = %{version}
+BuildRequires:  /usr/bin/rename
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for
@@ -30,12 +31,22 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+
 #
-# configure does not pass our CXXFLAGS to the build process,
-# which kind of sucks.
-# There has to be a less ugly way to do this.
+# The beta releases are meant to be installed in parallel, we do
+# not want that. So we have to mangle some filenames
 #
-perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in
+perl -pi -e 's,(fwb(?:edit|lookup|uilder|_ipf|_ipfw|_ipt|_pf))21,$1,' \
+    doc/doc.pro \
+    src/ipf/ipf.pro \
+    src/fwbedit/fwbedit.pro \
+    src/gui/gui.pro \
+    src/pf/pf.pro \
+    src/fwblookup/fwblookup.pro \
+    src/ipt/ipt.pro \
+    src/ipfw/ipfw.pro
+
+/usr/bin/rename 21.1 .1 doc/*21.1
 
 %configure \
     --with-templatedir=%{_datadir}/fwbuilder \
@@ -49,7 +60,7 @@
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 
 # Add an icon for the menu system
-install -Dpm 644 src/gui/icons/firewall_48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/fwbuilder.png
+install -Dpm 644 src/gui/icons/firewall_64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/fwbuilder.png
 
 # Add menu entry
 desktop-file-install --vendor fedora               \
@@ -75,45 +86,17 @@
 %{_bindir}/fwbuilder
 %{_bindir}/fwblookup
 %{_bindir}/fwbedit
-%{_bindir}/fwb_install
-%{_bindir}/fwb_compile_all
 %doc doc/AUTHORS
 %doc doc/COPYING
 %doc doc/Credits
 %doc doc/ChangeLog
 %doc doc/PatchAcceptancePolicy.txt
 %doc doc/README.floppyfw
-%doc doc/ReleaseNotes_2_0.html
-%doc doc/ReleaseNotes_2_0.txt
-%doc doc/ReleaseNotes_2.0.1.html
-%doc doc/ReleaseNotes_2.0.1.txt
-%doc doc/ReleaseNotes_2.0.2.html
-%doc doc/ReleaseNotes_2.0.2.txt
-%doc doc/ReleaseNotes_2.0.3.html
-%doc doc/ReleaseNotes_2.0.3.txt
-%doc doc/ReleaseNotes_2.0.4.html
-%doc doc/ReleaseNotes_2.0.4.txt
-%doc doc/ReleaseNotes_2.0.5.html
-%doc doc/ReleaseNotes_2.0.5.txt
-%doc doc/ReleaseNotes_2.0.6.html
-%doc doc/ReleaseNotes_2.0.6.txt
-%doc doc/ReleaseNotes_2.0.7.html
-%doc doc/ReleaseNotes_2.0.7.txt
-%doc doc/ReleaseNotes_2.0.8.html
-%doc doc/ReleaseNotes_2.0.8.txt
-%doc doc/ReleaseNotes_2.0.9.html
-%doc doc/ReleaseNotes_2.0.9.txt
-%doc doc/ReleaseNotes_2.0.10.html
-%doc doc/ReleaseNotes_2.0.10.txt
-%doc doc/ReleaseNotes_2.0.11.html
-%doc doc/ReleaseNotes_2.0.11.txt
-%doc doc/ReleaseNotes_2.0.12.html
-%doc doc/ReleaseNotes_2.0.12.txt
+%doc doc/ReleaseNotes_*.txt
+%doc doc/ReleaseNotes_*.html
 %{_mandir}/man1/fwbuilder.1*
 %{_mandir}/man1/fwblookup.1*
 %{_mandir}/man1/fwbedit.1*
-%{_mandir}/man1/fwb_install.1*
-%{_mandir}/man1/fwb_compile_all.1*
 
 
 %package pf
@@ -176,6 +159,9 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Tue Oct 24 2006 Ralf Ertzinger <ralf at skytale.net> 2.1.6-0.0.beta.fc7
+- Update to beta release 2.1.6
+
 * Mon Sep 11 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-2.fc6
 - Bumped and rebuilt for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 May 2006 16:52:05 -0000	1.7
+++ sources	24 Oct 2006 12:58:12 -0000	1.8
@@ -1 +1 @@
-43149297f4a64b19ad3fa519cfff2326  fwbuilder-2.0.12.tar.gz
+12638ce0987c87dd81cc54a8c5b906bb  fwbuilder-2.1.6.tar.gz