SPECS: newt.spec - rework patches and bconds

[arekm]

Author: arekm                        Date: Fri Sep 16 08:15:06 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rework patches and bconds

---- Files affected:
SPECS:
   newt.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/newt.spec
diff -u SPECS/newt.spec:1.73 SPECS/newt.spec:1.74
--- SPECS/newt.spec:1.73	Fri Sep 16 09:22:00 2005
+++ SPECS/newt.spec	Fri Sep 16 10:15:01 2005
@@ -1,7 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	c_only	# build only C libraries
+%bcond_without	python
+%bcond_with	tcl
 #
 Summary:	Not Erik's Windowing Toolkit - text mode windowing with slang
 Summary(de):	Nicht Eriks Windowing Toolkit - Textmodus-Windowing mit Slang
@@ -16,23 +17,20 @@
 # http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	76ebfb749d3bbe9a0d55915faef4ac5e
-Patch0:		%{name}-pythondirs.patch
-Patch1:		%{name}-textbox.patch
-Patch2:		%{name}-install_sh.patch
-Patch3:		%{name}-0.51.6-if1close.patch
-Patch4:		%{name}-omg_fix.patch
-Patch5:		%{name}-PIC.patch
-Patch6:		%{name}-norm.patch
-Patch7:		%{name}-c_only.patch
-Patch8:		%{name}-gcc34.patch
+Patch0:		%{name}-textbox.patch
+Patch1:		%{name}-install_sh.patch
+Patch2:		%{name}-0.51.6-if1close.patch
+Patch3:		%{name}-PIC.patch
+Patch4:		%{name}-c_only.patch
+Patch5:		%{name}-gcc34.patch
 URL:		http://www.msg.com.mx/Newt/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	popt-devel
-%{?!with_c_only:BuildRequires:	python-devel >= 2.2}
+%{?with_python:BuildRequires:	python-devel >= 2.2}
 #BuildRequires:	sgml-tools
 BuildRequires:	slang-devel >= 2.0.0
-%{?!with_c_only:BuildRequires:	tcl-devel >= 8.3.2}
+%{?with_tcl:BuildRequires:	tcl-devel >= 8.3.2}
 BuildRequires:	docbook-utils
 BuildRequires:	rpm-pythonprov
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -162,19 +160,17 @@
 
 %prep
 %setup -q
-#%%patch0 -p1
-#%%patch1 -p1
-#%%patch2 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
-#%%patch4 -p0
-#%%patch5 -p1
-#%%patch6 -p1
 %if %{with c_only}
-%patch7 -p1
+%patch4 -p1
 %endif
-#%%patch8 -p1
+%patch5 -p1
 
 %build
+sed -i -e 's#gcc#%{__cc}#g' Makefile*
 %{__aclocal}
 %{__autoconf}
 %configure \
@@ -182,7 +178,7 @@
 
 %{__make} \
 	CC="%{__cc}" \
-	PROGS="whiptail %{?!with_c_only:whiptcl.so} testgrid"
+	PROGS="whiptail %{?with_tcl:whiptcl.so} testgrid"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -210,11 +206,13 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/whiptail
 
-%if ! %{with c_only}
-#%%files tcl
-#%%defattr(644,root,root,755)
-#%%attr(755,root,root) %{_libdir}/*tcl.so
+%if %{with tcl}
+%files tcl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*tcl.so
+%endif
 
+%if %{with python}
 %files python
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/*.so
@@ -238,6 +236,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2005/09/16 08:15:01  arekm
+- rework patches and bconds
+
 Revision 1.73  2005/09/16 07:22:00  arekm
 - br for new slang
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/newt.spec?r1=1.73&r2=1.74&f=u