SPECS: gkrellm.spec - gnutls bcond - fix compilation with gnutls

draenog draenog at pld-linux.org
Thu Oct 25 23:11:35 CEST 2007


Author: draenog                      Date: Thu Oct 25 21:11:35 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- gnutls bcond
- fix compilation with gnutls

---- Files affected:
SPECS:
   gkrellm.spec (1.115 -> 1.116) 

---- Diffs:

================================================================
Index: SPECS/gkrellm.spec
diff -u SPECS/gkrellm.spec:1.115 SPECS/gkrellm.spec:1.116
--- SPECS/gkrellm.spec:1.115	Sat Sep 15 23:01:23 2007
+++ SPECS/gkrellm.spec	Thu Oct 25 23:11:30 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%bcond_without	gnutls	# gnutls support for mail check (instead of OpenSSL)
 Summary:	Multiple stacked system monitors: 1 process
 Summary(pl.UTF-8):	Zestaw wielu monitorów systemu(ów) w jednym procesie
 Summary(pt_BR.UTF-8):	Monitoração de atividades do sistema
@@ -18,11 +19,13 @@
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-pl.po-update.patch
+Patch3:		%{name}-gnutls.patch
 URL:		http://www.gkrellm.net/
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 2.2.0
-BuildRequires:	gnutls-devel >= 1.2.5
+%{?with_gnutls:BuildRequires:	gnutls-devel >= 1.2.5}
 BuildRequires:	gtk+2-devel >= 2:2.2.0
+%{!?with_gnutls:BuildRequires:	openssl-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -123,13 +126,15 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__make} \
 	CC="%{__cc}" \
 	OPTFLAGS="%{rpmcflags}" \
 	PKGCONFIGDIR=%{_pkgconfigdir} \
-	INSTALLROOT=%{_prefix}
+	INSTALLROOT=%{_prefix} \
+	%{!?with_gnutls:without-gnutls=yes}	
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -196,6 +201,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.116  2007/10/25 21:11:30  draenog
+- gnutls bcond
+- fix compilation with gnutls
+
 Revision 1.115  2007/09/15 21:01:23  qboosh
 - v3+
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gkrellm.spec?r1=1.115&r2=1.116&f=u



More information about the pld-cvs-commit mailing list