rpms/libfwbuilder/devel libfwbuilder-2.0.10-gcc4.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 libfwbuilder.spec, 1.8, 1.9 sources, 1.4, 1.5

[Ralf Ertzinger (ertzing)]

Author: ertzing

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

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Added Files:
	libfwbuilder-2.0.10-gcc4.patch 
Log Message:
- Update to 2.0.10
- Fixes for GCC 4.1
- Fixes for changed libresolv behaviour in FC5


libfwbuilder-2.0.10-gcc4.patch:

--- NEW FILE libfwbuilder-2.0.10-gcc4.patch ---
diff -uNr libfwbuilder-2.0.10-orig/src/fwbuilder/BackgroundOp.cpp libfwbuilder-2.0.10/src/fwbuilder/BackgroundOp.cpp
--- libfwbuilder-2.0.10-orig/src/fwbuilder/BackgroundOp.cpp	2004-09-08 07:34:50.000000000 +0200
+++ libfwbuilder-2.0.10/src/fwbuilder/BackgroundOp.cpp	2006-01-13 17:31:51.000000000 +0100
@@ -44,6 +44,9 @@
 using namespace libfwbuilder;
 
 
+void *libfwbuilder::background_thread(void *args);
+
+
 BackgroundOp::BackgroundOp():running(false),connected(true)
 {
     error        = NULL;
diff -uNr libfwbuilder-2.0.10-orig/src/fwbuilder/dns.h libfwbuilder-2.0.10/src/fwbuilder/dns.h
--- libfwbuilder-2.0.10-orig/src/fwbuilder/dns.h	2005-03-30 09:50:13.000000000 +0200
+++ libfwbuilder-2.0.10/src/fwbuilder/dns.h	2006-01-13 17:37:20.000000000 +0100
@@ -92,7 +92,7 @@
      */
     static void init();
     
-    DNS::DNS();
+    DNS();
 
     /**
      * Finds IP adddresses of the host with given host name.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jul 2005 16:12:12 -0000	1.4
+++ .cvsignore	5 Feb 2006 17:16:36 -0000	1.5
@@ -1 +1 @@
-libfwbuilder-2.0.8.tar.gz
+libfwbuilder-2.0.10.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libfwbuilder.spec	13 Jul 2005 16:12:12 -0000	1.8
+++ libfwbuilder.spec	5 Feb 2006 17:16:36 -0000	1.9
@@ -1,11 +1,12 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
-Version:        2.0.8
-Release: 	1
+Version:        2.0.10
+Release:        1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
 Source:         %{name}-%{version}.tar.gz
+Patch0:         libfwbuilder-2.0.10-gcc4.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:  libxslt-devel
@@ -45,11 +46,29 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc4
 
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-./configure --enable-auto-docdir --libdir=%{_libdir} --prefix=%{_prefix} --with-templatedir=%{_datadir}/libfwbuilder --disable-static  --enable-shared
+#
+# 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.
+#
+perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in
+
+CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection"  %configure \
+    --enable-auto-docdir \
+    --with-templatedir=%{_datadir}/libfwbuilder \
+    --disable-static  \
+    --enable-shared \
+    --disable-dependency-tracking
+#
+# configure thinks we have a usable libresolv, when in fact we do
+# not (according to the definiton used by libfwbuilder, that is)
+#
+perl -pi -e 's,#define HAVE_GOODLIBRESOLV 1,/* #undef HAVE_GOODLIBRESOLV */,' src/fwbuilder/libfwbuilder-config.h
 make all
 
 
@@ -71,8 +90,10 @@
 
 
 %changelog
-* Wed Jul 13 2005 Steve Grubb <sgrubb at redhat.com> 2.0.8-1
-- New upstream version
+* Sun Feb 05 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.10-1
+- Update to 2.0.10
+- Fixes for GCC 4.1
+- Fixes for changed libresolv behaviour in FC5
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.0.6-3
 - build on all arches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jul 2005 16:12:12 -0000	1.4
+++ sources	5 Feb 2006 17:16:36 -0000	1.5
@@ -1 +1 @@
-a554710b26bc42c895187f6a2b78b27f  libfwbuilder-2.0.8.tar.gz
+7f171715bd398137e832a53628642fe6  libfwbuilder-2.0.10.tar.gz