- updated to 5.1.0.3599

diff --git a/fwbuilder-c++.patch b/fwbuilder-c++.patch
index 78009c997dc114431418ea60ecc5aa79eee9c6d2..398d499ad4acc13273e6752bb82524aa4004c53e 100644 (file)
--- a/fwbuilder-c++.patch
+++ b/fwbuilder-c++.patch
@@ -27,3 +27,13 @@
      { return (str == _d.second); }
  };
  
+--- fwbuilder-5.1.0.3599/src/libfwbuilder/src/fwbuilder/ThreadTools.h~ 2012-03-23 07:10:54.000000000 +0100
++++ fwbuilder-5.1.0.3599/src/libfwbuilder/src/fwbuilder/ThreadTools.h  2013-08-03 11:55:39.224043574 +0200
+@@ -31,6 +31,7 @@
+ 
+ #include <time.h> //for time_t definition
+ #include <pthread.h>
++#include <sys/types.h>
+ 
+ #include <string>
+ #include <queue>

diff --git a/fwbuilder.spec b/fwbuilder.spec
index 4c99ac1b298a4a6cbeebdd51b7b8e0e017a7dde7..28ef09b1b3134807ca61ec99e3cf6f3d84bdda55 100644 (file)
--- a/fwbuilder.spec
+++ b/fwbuilder.spec
@@ -1,15 +1,15 @@
 #
-%define                _majver         4
-%define                _minver         2
+%define                _majver         5
+%define                _minver         1
 Summary:       Firewall Builder
 Summary(pl.UTF-8):     Narzędzie do tworzenia firewalli
 Name:          fwbuilder
-Version:       %{_majver}.%{_minver}.2.3541
-Release:       3
+Version:       %{_majver}.%{_minver}.0.3599
+Release:       0.1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
-# Source0-md5: 56ddc67c79adaf5d5730945ad1a26666
+# Source0-md5: 331ce22eb8fb770a70395c3744f5092f
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-configure.patch
@@ -237,7 +237,9 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 # drop 512x512 icon
-rm -rf $RPM_BUILD_ROOT%{_iconsdir}/hicolor/512x512
+%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/hicolor/512x512
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -251,7 +253,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/fwbuilder.dtd
 %{_datadir}/%{name}/*.xml
 %dir %{_datadir}/%{name}/configlets
-%dir %{_datadir}/%{name}/locale
+%{_datadir}/%{name}/help
 %{_datadir}/%{name}/migration
 %dir %{_datadir}/%{name}/os
 %{_datadir}/%{name}/os/unknown_os.xml
@@ -312,7 +314,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files platform-linux24
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/transfer_secuwall
 %{_datadir}/%{name}/configlets/dd-wrt-jffs
 %{_datadir}/%{name}/configlets/dd-wrt-nvram
 %{_datadir}/%{name}/configlets/ipcop