Author: agaran Date: Mon Mar 24 17:50:15 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- perl/tcl/python packages are build only when support for perl/tcl/python is
enabled
---- Files affected:
SPECS:
owfs.spec (1.15 -> 1.16)
---- Diffs:
================================================================
Index: SPECS/owfs.spec
diff -u SPECS/owfs.spec:1.15 SPECS/owfs.spec:1.16
--- SPECS/owfs.spec:1.15 Mon Mar 10 23:35:45 2008
+++ SPECS/owfs.spec Mon Mar 24 18:50:09 2008
@@ -11,6 +11,8 @@
%bcond_without owfs # build without owfs support
%bcond_without tcl # build without tcl support
%bcond_without owftpd # build without owftpd support
+%bcond_without perl # build without perl support
+%bcond_without python # build without python support
#
Summary: One-wire file system using FUSE
Summary(pl.UTF-8): System plików 1-Wire wykorzystujący FUSE
@@ -33,13 +35,13 @@
BuildRequires: perl-devel
%{?with_owphp:BuildRequires: php-devel}
%{?with_owphp:BuildRequires: php-program}
-BuildRequires: python-devel >= 1:2.5
-BuildRequires: rpm-pythonprov
+%{?with_python:BuildRequires: python-devel >= 1:2.5}
+%{?with_python:BuildRequires: rpm-pythonprov}
BuildRequires: rpmbuild(macros) >= 1.219
BuildRequires: sed >= 4.0
-BuildRequires: swig-perl
+%{?with_perl:BuildRequires: swig-perl}
%{?with_owphp:BuildRequires: swig-php}
-BuildRequires: swig-python
+%{?with_python:BuildRequires: swig-python}
%{?with_tcl:BuildRequires: tcl-devel}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -150,6 +152,8 @@
--%{?with_tcl:en}%{!?with_tcl:dis}able-tcl \
--%{?with_libusb:en}%{!?with_libusb:dis}able-usb \
--%{?with_owftpd:en}%{!?with_owftpd:dis}able-owftpd \
+ --%{?with_perl:en}%{!?with_perl:dis}able-owperl \
+ --%{?with_python:en}%{!?with_python:dis}able-owpython \
--enable-parport
%{__make} \
@@ -162,10 +166,10 @@
DESTDIR=$RPM_BUILD_ROOT \
TCL_BIN_DIR=%{_libdir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/ow
-%py_postclean
+%{?with_python: %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/ow}
+%{?with_python:%py_postclean}
-rm $RPM_BUILD_ROOT%{_libdir}/owtcl-0.2/*.{la,a}
+%{?with_tcl:rm $RPM_BUILD_ROOT%{_libdir}/owtcl-0.2/*.{la,a}}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -177,8 +181,8 @@
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/owdir
-%attr(755,root,root) %{_bindir}/owfs
-%attr(755,root,root) %{_bindir}/owftpd
+%{?with_owfs:%attr(755,root,root) %{_bindir}/owfs}
+%{?with_owftpd:%attr(755,root,root) %{_bindir}/owftpd}
%attr(755,root,root) %{_bindir}/owhttpd
%attr(755,root,root) %{_bindir}/owmon
%attr(755,root,root) %{_bindir}/owpresent
@@ -232,6 +236,7 @@
%{_libdir}/libowcapi.a
%{_libdir}/libownet.a
+%if %{with perl}
%files -n perl-owfs
%defattr(644,root,root,755)
%{perl_vendorarch}/OW.pm
@@ -241,7 +246,9 @@
%{perl_vendorlib}/OWNet.pm
%{_mandir}/man3/OWNet.3*
%{_mandir}/man3/owperl.3*
+%endif
+%if %{with python}
%files -n python-owfs
%defattr(644,root,root,755)
%dir %{py_sitedir}/ow
@@ -251,7 +258,9 @@
%dir %{py_sitescriptdir}/ownet
%{py_sitescriptdir}/ownet/*.py[co]
%{py_sitescriptdir}/ownet-*.egg-info
+%endif
+%if %{with tcl}
%files -n tcl-owfs
%defattr(644,root,root,755)
%dir %{_libdir}/owtcl-0.2
@@ -260,6 +269,7 @@
%{_libdir}/owtcl-0.2/*.tcl
%{_mandir}/man3/owtcl.3*
%{_mandir}/mann/owtcl.n*
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -267,6 +277,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2008-03-24 17:50:09 agaran
+- perl/tcl/python packages are build only when support for perl/tcl/python is
enabled
+
Revision 1.15 2008-03-10 22:35:45 qboosh
- updated to 2.7p4
- files fixes, added perl-,python-,tcl packages
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/owfs.spec?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
