Author: zbyniu Date: Sun Jan 6 02:34:23 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- many BRs; strict configure options for bconds
- ldconfig for -libs; TODO added; dead bcond ownfsd removed
- %ghost for lib symlinks
---- Files affected:
SPECS:
owfs.spec (1.13 -> 1.14)
---- Diffs:
================================================================
Index: SPECS/owfs.spec
diff -u SPECS/owfs.spec:1.13 SPECS/owfs.spec:1.14
--- SPECS/owfs.spec:1.13 Sun Jan 6 00:23:31 2008
+++ SPECS/owfs.spec Sun Jan 6 03:34:18 2008
@@ -1,18 +1,22 @@
# $Revision$, $Date$
+# TODO:
+# - bconds and packages review
+# - install files in proper place
+# - files
+# - with owphp doesn't build
#
# Conditional build:
%bcond_without libusb # build without USB support
-%bcond_without owphp # build without PHP support
+%bcond_with owphp # build without PHP support
%bcond_without owfs # build without owfs support
%bcond_without tcl # build without tcl support
%bcond_without owftpd # build without owftpd support
-%bcond_without ownfsd # build without ownfs support
#
Summary: One-wire file system using FUSE
Summary(pl.UTF-8): System plików 1-Wire wykorzystujący FUSE
Name: owfs
Version: 2.7p2
-Release: 0.1
+Release: 0.2
Epoch: 2
License: GPL v2+
Group: Applications
@@ -24,7 +28,16 @@
BuildRequires: libtool
BuildRequires: libfuse-devel
%{?with_libusb:BuildRequires: libusb-devel >= 0.1.5}
-%{?with_owphp:BuildRequires: swig-php }
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl-devel
+%{?with_owphp:BuildRequires: php-devel}
+%{?with_owphp:BuildRequires: php-program}
+BuildRequires: python-devel
+BuildRequires: rpm-pythonprov
+BuildRequires: swig-perl
+%{?with_owphp:BuildRequires: swig-php}
+BuildRequires: swig-python
+%{?with_tcl:BuildRequires: tcl-devel}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,25 +101,12 @@
%{__autoheader}
%{__automake}
%configure \
-%if %{with owfs}
- --enable-owfs \
-%endif
-%if %{without owphp}
- --disable-owphp \
-%endif
-%if %{without tcl}
- --disable-tcl \
-%endif
-%if %{without libusb}
- --disable-usb \
-%endif
-%if %{without owftpd}
- --disable-owftpd \
-%endif
-%if %{without ownfsd}
- --disable-ownfsd \
-%endif
- --enable-parport
+ --%{?with_owfs:en}%{!?with_owfs:dis}able-owfs \
+ --%{?with_owphp:en}%{!?with_owphp:dis}able-owphp \
+ --%{?with_tcl:en}%{!?with_tcl:dis}able-tcl \
+ --%{?with_libusb:en}%{!?with_libusb:dis}able-usb \
+ --%{?with_owftpd:en}%{!?with_owftpd:dis}able-owftpd \
+ --enable-parport
%{__make}
@@ -119,6 +119,9 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
@@ -130,7 +133,7 @@
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %{_libdir}/lib*.so.*
+%attr(755,root,root) %ghost %{_libdir}/lib*.so.2
%files devel
%defattr(644,root,root,755)
@@ -149,6 +152,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2008-01-06 02:34:18 zbyniu
+- many BRs; strict configure options for bconds
+- ldconfig for -libs; TODO added; dead bcond ownfsd removed
+- %ghost for lib symlinks
+
Revision 1.13 2008-01-05 23:23:31 cactus
- BR: libfuse-devel
- can't use owfs without lib*.so.*
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/owfs.spec?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
