packages: lshw/lshw.spec - build with sqlite support; release 2

[adamg]

Author: adamg                        Date: Sat Dec 31 14:04:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build with sqlite support; release 2

---- Files affected:
packages/lshw:
   lshw.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: packages/lshw/lshw.spec
diff -u packages/lshw/lshw.spec:1.48 packages/lshw/lshw.spec:1.49
--- packages/lshw/lshw.spec:1.48	Sun Oct 31 17:55:14 2010
+++ packages/lshw/lshw.spec	Sat Dec 31 15:04:02 2011
@@ -2,12 +2,13 @@
 #
 # Conditional build:
 %bcond_without	gui	# build without GTK gui
+%bcond_without	sqlite	# build without sqlite support (saving hardware tree to sqlite db)
 #
 Summary:	Hardware Lister
 Summary(pl.UTF-8):	Narzędzie wypisujące sprzęt
 Name:		lshw
 Version:	B.02.15
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://ezix.org/software/files/%{name}-%{version}.tar.gz
@@ -17,6 +18,7 @@
 %{?with_gui:BuildRequires:	gtk+2-devel >= 1:2.0}
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
+%{?with_sqlite:BuildRequires:	sqlite3-devel}
 Requires:	pciutils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -65,14 +67,19 @@
 %patch0 -p0
 
 %build
-%{__make} \
+%if %{with sqlite}
+export SQLITE=1
+%endif
+%{__make} -C src \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcflags} -I./core"
+	CXXFLAGS="%{rpmcflags} -I./core" \
+	%{?with_sqlite:SQLITE=1}
 
 %if %{with gui}
-%{__make} gui \
+%{__make} -C src gui \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcflags} -I../core `pkg-config --cflags gtk+-2.0`"
+	CXXFLAGS="%{rpmcflags} -I../core `pkg-config --cflags gtk+-2.0`" \
+	%{?with_sqlite:SQLITE=1}
 %endif
 
 %install
@@ -80,7 +87,8 @@
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man1}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	%{?with_sqlite:SQLITE=1}
 
 %if %{with gui}
 %{__make} install-gui \
@@ -111,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2011/12/31 14:04:02  adamg
+- build with sqlite support; release 2
+
 Revision 1.48  2010/10/31 16:55:14  qboosh
 - strict internal deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lshw/lshw.spec?r1=1.48&r2=1.49&f=u