rpms/fwbuilder/devel .cvsignore, 1.14, 1.15 fwbuilder.spec, 1.26, 1.27 sources, 1.14, 1.15

Ralf Ertzinger ertzing at fedoraproject.org
Sat Sep 6 14:46:44 UTC 2008


Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26708

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:
* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.net> 3.0.0-1
- Update to 3.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	3 Jan 2008 15:52:50 -0000	1.14
+++ .cvsignore	6 Sep 2008 14:46:13 -0000	1.15
@@ -1 +1 @@
-fwbuilder-2.1.16.tar.gz
+fwbuilder-3.0.0.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fwbuilder.spec	25 Mar 2008 15:04:35 -0000	1.26
+++ fwbuilder.spec	6 Sep 2008 14:46:13 -0000	1.27
@@ -1,19 +1,19 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.1.16
-Release:        2%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 
 License:        GPLv2+
 Group:          Applications/System
 URL:            http://www.fwbuilder.org/
-Source:         %{name}-%{version}.tar.gz
+Source:         http://downloads.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
 Source1:        fwbuilder.desktop
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Requires:       libfwbuilder = %{version}
 
 Patch0:         fwbuilder-2.1.14-gcc43.patch
 
-BuildRequires:  qt3-devel
+BuildRequires:  qt4-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libfwbuilder-devel = %{version}
 BuildRequires:  gawk
@@ -33,12 +33,10 @@
 %setup -q
 
 # Fix regressions due to stricter GCC 4.3 checking
-%patch0 -p1 -b .gcc43
+# %patch0 -p1 -b .gcc43
 
 
 %build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-
 %configure \
     --with-templatedir=%{_datadir}/fwbuilder \
     --disable-dependency-tracking
@@ -46,12 +44,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-make DDIR=$RPM_BUILD_ROOT STRIPPROG=/bin/true install
+make install INSTALL_ROOT=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 
 # Add an icon for the menu system
-install -Dpm 644 src/gui/icons/firewall_64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/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,7 +72,6 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/fwbuilder.png
 %{_bindir}/fwbuilder
-%{_bindir}/fwblookup
 %{_bindir}/fwbedit
 %doc doc/AUTHORS
 %doc doc/COPYING
@@ -83,10 +79,8 @@
 %doc doc/ChangeLog
 %doc doc/PatchAcceptancePolicy.txt
 %doc doc/README.floppyfw
-%doc doc/ReleaseNotes_*.txt
 %doc doc/ReleaseNotes_*.html
 %{_mandir}/man1/fwbuilder.1*
-%{_mandir}/man1/fwblookup.1*
 %{_mandir}/man1/fwbedit.1*
 
 
@@ -149,7 +143,28 @@
 %doc doc/README.ipt
 %{_mandir}/man1/fwb_ipt.1*
 
+
+%package cisco
+Summary:  Policy Compiler for Cisco routers/firewalls
+Group:    Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description cisco
+Policy compiler for Cisco routers/firewalls
+
+%files cisco
+%defattr(-,root,root)
+%{_bindir}/fwb_iosacl
+%{_bindir}/fwb_pix
+%doc doc/README.iosacl
+%doc doc/README.pix
+%{_mandir}/man1/fwb_iosacl.1*
+%{_mandir}/man1/fwb_pix.1*
+
 %changelog
+* Sat Sep 06 2008 Ralf Ertzinger <ralf at skytale.net> 3.0.0-1
+- Update to 3.0.0
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.1.16-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Jan 2008 15:52:50 -0000	1.14
+++ sources	6 Sep 2008 14:46:13 -0000	1.15
@@ -1 +1 @@
-bb8b0c12f213dbfadb9fc43b53ed6785  fwbuilder-2.1.16.tar.gz
+f1032f4ebc8263224d7e829a204e8d5e  fwbuilder-3.0.0.tar.gz




More information about the fedora-extras-commits mailing list