Author: alucard Date: Thu Jul 16 11:28:22 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.0.5 (3. series are marked stable), works for me
- some patches commented out, as I wasn't sure if they're really not needed
anymore
---- Files affected:
packages/libfwbuilder:
libfwbuilder.spec (1.45 -> 1.46) , libfwbuilder-configure.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/libfwbuilder/libfwbuilder.spec
diff -u packages/libfwbuilder/libfwbuilder.spec:1.45
packages/libfwbuilder/libfwbuilder.spec:1.46
--- packages/libfwbuilder/libfwbuilder.spec:1.45 Wed Apr 9 21:15:00 2008
+++ packages/libfwbuilder/libfwbuilder.spec Thu Jul 16 13:28:16 2009
@@ -4,18 +4,18 @@
%bcond_without snmp # disable SNMP
%bcond_without threadsafe_dns # disable thread safe DNS
#
-%define _majver 2
-%define _minver 1
+%define _majver 3
+%define _minver 0
Summary: Firewall Builder API
Summary(pl.UTF-8): Biblioteka Firewall Buildera
Name: libfwbuilder
-Version: %{_majver}.%{_minver}.18
+Version: %{_majver}.%{_minver}.5
Release: 1
License: GPL v2
Group: Libraries
Source0: http://dl.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
-# Source0-md5: 9641028c46a58f0369ad6bf4cc4bbf19
+# Source0-md5: a47d90726807865f7a5442c5516cce53
Patch0: %{name}-configure.patch
Patch1: %{name}-c++.patch
Patch2: %{name}-dont-mess-with-compiler-names-and-ccache.patch
@@ -29,7 +29,7 @@
BuildRequires: libxslt-devel
%{?with_snmp:BuildRequires: net-snmp-devel}
BuildRequires: openssl-devel >= 0.9.7d
-BuildRequires: qmake
+BuildRequires: qt4-qmake
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -61,8 +61,8 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#%patch1 -p1
+#%patch2 -p1
%{__perl} -pi -e 's@/usr/lib/libresolv@/usr/%{_lib}/libresolv@' configure.in
%{__perl} -pi -e 's@/lib$@/%{_lib}@' qmake.inc.in
@@ -75,7 +75,8 @@
%{__aclocal}
%{__autoconf}
%configure \
- --with-templatedir=%{_datadir}/%{name}
+ --with-templatedir=%{_datadir}/%{name} \
+ --with-qmake=qmake-qt4
%{__make}
%install
@@ -98,9 +99,9 @@
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/libfwbuilder-config-%{_majver}.%{_minver}
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/fwb-%{_majver}.%{_minver}
+%attr(755,root,root) %{_bindir}/libfwbuilder-config-%{_majver}
+%attr(755,root,root) %{_libdir}/lib*.so*
+%{_includedir}/fwb-%{_majver}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -108,6 +109,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.46 2009/07/16 11:28:16 alucard
+- up to 3.0.5 (3. series are marked stable), works for me
+- some patches commented out, as I wasn't sure if they're really not needed
+ anymore
+
Revision 1.45 2008/04/09 19:15:00 twittner
- up to 2.1.18
================================================================
Index: packages/libfwbuilder/libfwbuilder-configure.patch
diff -u packages/libfwbuilder/libfwbuilder-configure.patch:1.5
packages/libfwbuilder/libfwbuilder-configure.patch:1.6
--- packages/libfwbuilder/libfwbuilder-configure.patch:1.5 Wed Aug 30
17:44:40 2006
+++ packages/libfwbuilder/libfwbuilder-configure.patch Thu Jul 16 13:28:16 2009
@@ -28,27 +28,14 @@
dnl
-@@ -457,7 +442,6 @@
- fi
-
- AC_SUBST(LIB_RESOLV)
-- AC_CHECK_LIB(bind_r, res_init)
-
- dnl AC_PATH_PROG(ISC_CONFIG, isc-config.sh, )
- dnl
-Wsp�lne podkatalogi: libfwbuilder-2.1.5.orig/doc i libfwbuilder-2.1.5/doc
-Wsp�lne podkatalogi: libfwbuilder-2.1.5.orig/etc i libfwbuilder-2.1.5/etc
-Wsp�lne podkatalogi: libfwbuilder-2.1.5.orig/migration i
libfwbuilder-2.1.5/migration
-diff -uN libfwbuilder-2.1.5.orig/qmake.inc.in libfwbuilder-2.1.5/qmake.inc.in
---- libfwbuilder-2.1.5.orig/qmake.inc.in 2006-06-22 06:50:45.000000000
+0200
-+++ libfwbuilder-2.1.5/qmake.inc.in 2006-08-30 17:34:39.000000000 +0200
-@@ -27,7 +27,7 @@
- migration.path =$(DDIR)@TEMPLATE_DIR@/migration
- doc.path =$(DDIR)@DOCDIR@
+--- libfwbuilder-3.0.5-orig/qmake.inc.in 2009-07-15 14:02:41.514653425
+0200
++++ libfwbuilder-3.0.5/qmake.inc.in 2009-07-15 14:03:22.750469971 +0200
+@@ -29,7 +29,7 @@ unix {
+ migration.path = @TEMPLATE_DIR@/migration
+ doc.path = @DOCDIR@
-- CONFIG += warn_on debug
-+ CONFIG += warn_on
- QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
-Wsp�lne podkatalogi: libfwbuilder-2.1.5.orig/src i libfwbuilder-2.1.5/src
+- CONFIG += warn_on debug
++ CONFIG += warn_on
+ QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+ QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libfwbuilder/libfwbuilder.spec?r1=1.45&r2=1.46&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libfwbuilder/libfwbuilder-configure.patch?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
