Author: czarny                       Date: Wed Aug 30 16:13:20 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to 2.1.5
- branch for devel version

---- Files affected:
SPECS:
   libfwbuilder.spec (1.22.2.1 -> 1.22.2.2) 

---- Diffs:

================================================================
Index: SPECS/libfwbuilder.spec
diff -u SPECS/libfwbuilder.spec:1.22.2.1 SPECS/libfwbuilder.spec:1.22.2.2
--- SPECS/libfwbuilder.spec:1.22.2.1    Fri Jul  2 12:55:43 2004
+++ SPECS/libfwbuilder.spec     Wed Aug 30 18:13:15 2006
@@ -1,27 +1,33 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without snmp            # disable SNMP
+%bcond_without threadsafe_dns  # disable thread safe DNS
+#
+%define                _majver         2
+%define                _minver         1
+
 Summary:       Firewall Builder API
 Summary(pl):   Biblioteka Firewall Buildera
 Name:          libfwbuilder
-Version:       2.0.0
+Version:       %{_majver}.%{_minver}.5
 Release:       0.1
-License:       GPL
+License:       GPL v2
 Group:         Libraries
-#Source0:      http://dl.sourceforge.net/fwbuilder/%{name}-%{version}.tar.gz
-Source0:       
ftp://downloads.fwbuilder.org/pub/fwbuilder/nightly_builds/040701/libfwbuilder-2.0.0.tar.gz
-Patch0:                %{name}-static.patch
+Source0:       
http://www.fwbuilder.org/nightly_builds/build-109/%{name}-%{version}.tar.gz
+# Source0-md5: 63a038b624900262074e7efc6e0f3894
+Patch0:                %{name}-configure.patch
 URL:           http://www.fwbuilder.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: glib-devel >= 1.2.8
 # it uses internal symbols from libresolv.a :/
-BuildRequires: glibc-static
+%{?with_threadsafe_dns:BuildRequires:  glibc-static}
 BuildRequires: libstdc++-devel
-BuildRequires: libtool
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
-BuildRequires: net-snmp-devel
-BuildRequires: qmake
+%{?with_snmp:BuildRequires:    net-snmp-devel}
 BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: qmake
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -35,51 +41,44 @@
 Summary(pl):   Pliki nagłówkowe i dokumetacja do libfwbuilder
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib-devel >= 1.2.8
 # it uses internal symbols from libresolv.a :/
-Requires:      glibc-static
+%{?with_threadsafe_dns:Requires:       glibc-static}
 Requires:      libstdc++-devel
 Requires:      libxml2-devel
 Requires:      libxslt-devel
-Requires:      net-snmp-devel
+%{?with_snmp:Requires: net-snmp-devel}
 Requires:      openssl-devel
+Obsoletes:     libfwbuilder-static
 
 %description devel
 Header files and develpment documentation for libfwbuilder.
 
 %description devel -l pl
-Pliki nagłówkowe i dokumetacja do libfwbuilder.
-
-%package static
-Summary:       Static libfwbuilder library
-Summary(pl):   Biblioteka statyczna libfwbuilder
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static libfwbuilder library.
-
-%description static -l pl
-Biblioteka statyczna libfwbuilder.
+Pliki nagłówkowe i dokumentacja do libfwbuilder.
 
 %prep
 %setup -q
 %patch0 -p1
 
 %{__perl} -pi -e 's@/usr/lib/libresolv@/usr/%{_lib}/libresolv@' configure.in
+%{__perl} -pi -e 's@/lib$@/%{_lib}@' qmake.inc.in
 
 %build
-%{__libtoolize}
+export QTDIR="%{_usr}"
+export QMAKESPEC="%{_datadir}/qt/mkspecs/linux-g++"
+
+cp -f /usr/share/automake/config.* .
 %{__aclocal}
 %{__autoconf}
-%configure
+%configure \
+       --with-templatedir=%{_datadir}/%{name}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       INSTALL_ROOT=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,14 +94,9 @@
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/%{name}-config
+%attr(755,root,root) %{_bindir}/libfwbuilder-config-%{_majver}.%{_minver}
 %attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/fwbuilder
-%{_includedir}/fwcompiler
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_includedir}/fwb-%{_majver}.%{_minver}
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -110,8 +104,58 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.22.2.1  2004/07/02 10:55:43  serek
-- testing.
+Revision 1.22.2.2  2006/08/30 16:13:15  czarny
+- up to 2.1.5
+- branch for devel version
+
+Revision 1.37  2006/07/28 21:51:31  charles
+- updated to 2.0.12 (bugfix release)
+- STBR
+
+Revision 1.36  2005/12/13 13:31:29  charles
+- updated to 2.0.10
+
+Revision 1.35  2005/07/10 11:35:23  paszczus
+- updated to 2.0.8
+
+Revision 1.34  2005/06/05 22:12:38  paszczus
+- updated to 2.0.7 ; STBR
+
+Revision 1.33  2005/02/21 09:59:45  charles
+- updated to 2.0.6
+
+Revision 1.32  2005/01/11 23:43:53  adamg
+- updated to 2.0.5
+
+Revision 1.31  2004/12/06 11:23:01  kolodko
+- up to 2.0.4 by Charles <charles (at) os.pl>
+
+Revision 1.30  2004/10/28 03:01:46  misi3k
+- updated to 2.0.3 [STBR]
+
+Revision 1.29  2004/10/06 11:44:08  qboosh
+- bconds header
+
+Revision 1.28  2004/09/19 20:54:20  djurban
+- add bconds to avoid stupid glibc-static and net-snmp reqs + use qmakespec to 
pass all required paltform dependend info to qmake
+
+Revision 1.27  2004/09/01 17:12:03  paszczus
+- updated to 2.0.2
+- updated libfwbuilder-configure.patch
+
+Revision 1.26  2004/09/01 11:49:23  snurf
+- typos / formatting / etc.
+
+Revision 1.25  2004/08/16 20:02:37  misi3k
+- updated to 2.0.1
+
+Revision 1.24  2004/08/07 09:12:56  qboosh
+- fixed build on amd64, release 2
+
+Revision 1.23  2004/08/01 19:01:24  qboosh
+- updated to 2.0.0
+- removed useless static patch, dropped static package (qmake doesn't build it)
+- added configure patch
 
 Revision 1.22  2004/06/05 22:51:27  qboosh
 - glib version in devel R
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libfwbuilder.spec?r1=1.22.2.1&r2=1.22.2.2&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to