[fwbuilder] Update to new release

Till Maas till at fedoraproject.org
Mon Jul 23 17:27:39 UTC 2012


commit 537c9689fc889357bca600d423b2c0cabd9eaf54
Author: Till Maas <opensource at till.name>
Date:   Mon Jul 23 19:25:52 2012 +0200

    Update to new release
    
    - Adjust Provides/Obsoletes/Requires: libfwbuilder does not exist anymore
    - Remove unused patch

 .gitignore                   |    3 +--
 fwbuilder-2.1.14-gcc43.patch |   33 ---------------------------------
 fwbuilder.spec               |   25 ++++++++++++++-----------
 sources                      |    2 +-
 4 files changed, 16 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d7a13ae..79468da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-fwbuilder-3.0.7.tar.gz
-/fwbuilder-4.1.2.tar.gz
+/fwbuilder-5.1.0.3599.tar.gz
diff --git a/fwbuilder.spec b/fwbuilder.spec
index 83f8fae..5d57396 100644
--- a/fwbuilder.spec
+++ b/fwbuilder.spec
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        4.1.2
-Release:        4%{?dist}
+Version:        5.1.0.3599
+Release:        1%{?dist}
 
 License:        GPLv2+
 Group:          Applications/System
@@ -9,16 +9,15 @@ URL:            http://www.fwbuilder.org/
 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:  qt4-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  glib2-devel
-BuildRequires:  libfwbuilder-devel = %{version}
 BuildRequires:  gawk
 BuildRequires:  autoconf automake libtool
+BuildRequires:  libxslt-devel
+Obsoletes:      libfwbuilder < %{version}-%{release}
+Provides:       libfwbuilder = %{version}-%{release}
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for
@@ -34,9 +33,6 @@ and the same GUI for different firewall platforms.
 %prep
 %setup -q
 
-# Fix regressions due to stricter GCC 4.3 checking
-# %patch0 -p1 -b .gcc43
-
 
 %build
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-var-tracking-assignments"
@@ -52,7 +48,10 @@ 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
+for width in 16 24 32 48 72 128 256 512
+do
+install -Dpm 644 src/res/Icons/${width}x${width}/fwbuilder.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${width}x${width}/apps/fwbuilder.png
+done
 
 # Add menu entry
 desktop-file-install --vendor fedora               \
@@ -79,7 +78,6 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 %{_datadir}/icons/hicolor/*/apps/fwbuilder.png
 %{_bindir}/fwbuilder
 %{_bindir}/fwbedit
-%{_bindir}/transfer_secuwall
 %doc doc/AUTHORS
 %doc doc/COPYING
 %doc doc/Credits
@@ -181,6 +179,11 @@ Policy compiler for Procurve devices
 %{_bindir}/fwb_procurve_acl
 
 %changelog
+* Mon Jul 23 2012 Till Maas <opensource at till.name> - 5.1.0.3599-1
+- Update to new release
+- Adjust Provides/Obsoletes/Requires: libfwbuilder does not exist anymore
+- Remove unused patch
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index a5ff74e..7961855 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ba75a515745304247df5be1885b5e0f  fwbuilder-4.1.2.tar.gz
+331ce22eb8fb770a70395c3744f5092f  fwbuilder-5.1.0.3599.tar.gz


More information about the scm-commits mailing list