packages: ntfs-3g/ntfs-3g.spec - up to 2011.1.15 - build with external libf...

[atler]

Author: atler                        Date: Tue Jan 25 13:08:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2011.1.15
- build with external libfuse by default (added bcond for internal_fuse)
- separate hal subpackage (TODO removed)

---- Files affected:
packages/ntfs-3g:
   ntfs-3g.spec (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: packages/ntfs-3g/ntfs-3g.spec
diff -u packages/ntfs-3g/ntfs-3g.spec:1.70 packages/ntfs-3g/ntfs-3g.spec:1.71
--- packages/ntfs-3g/ntfs-3g.spec:1.70	Sat Dec 18 21:04:53 2010
+++ packages/ntfs-3g/ntfs-3g.spec	Tue Jan 25 14:08:50 2011
@@ -1,21 +1,20 @@
 # $Revision$, $Date$
-# TODO
-# - subpackage to avoid hal dependency:
-#   /usr/share/hal/fdi/policy/10osvendor/10-ntfs-3g.fdi
+%bcond_with	internal_fuse	# build with internal libfuse
 Summary:	The NTFS driver with read and write support
 Summary(pl.UTF-8):	Sterownik do NTFS umożliwiający odczyt i zapis
 Name:		ntfs-3g
-Version:	2010.10.2
+Version:	2011.1.15
 Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://www.tuxera.com/opensource/%{name}-%{version}.tgz
-# Source0-md5:	91405690f25822142cdcb43d03e62d3f
+# Source0-md5:	15a5cf5752012269fa168c24191f00e2
 Source1:	%{name}.fdi
 URL:		http://www.ntfs-3g.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
+%{!?with_internal_fuse:BuildRequires:	libfuse-devel >= 2.6.0}
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -44,6 +43,18 @@
 Pliki nagłówkowe potrzebne do budowania programów korzystających z
 bibliotek libntfs-3g.
 
+%package hal
+Summary:	HAL integration for ntfs-3g
+Summary(pl.UTF-8):	Integracja ntfs-3g z HAL-em
+Group:		Applications/System
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description hal
+HAL integration for ntfs-3g.
+
+%description hal -l pl.UTF-8
+Integracja ntfs-3g z HAL-em.
+
 %package static
 Summary:	Static version of libntfs-3g library
 Summary:	Statyczna wersja bibliotek libntfs-3g
@@ -51,7 +62,7 @@
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
-This package contains the static version of libntfs-3g library
+This package contains the static version of libntfs-3g library.
 
 %description static -l pl.UTF-8
 Ten pakiet zawiera statyczną wersję bibliotek libntfs-3g.
@@ -68,7 +79,7 @@
 
 %configure \
 	--disable-ldconfig \
-	--with-fuse=internal
+	--with-fuse=%{?with_internal_fuse:in}%{!?with_internal_fuse:ex}ternal
 
 %{__make}
 
@@ -106,7 +117,6 @@
 %attr(755,root,root) %{_sbindir}/mount.ntfs-3g
 %attr(755,root,root) %{_libdir}/libntfs-3g.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libntfs-3g.so.??
-%{_datadir}/hal/fdi/policy/10osvendor/*
 %{_mandir}/man8/mount.lowntfs-3g.8*
 %{_mandir}/man8/mount.ntfs-3g.8*
 %{_mandir}/man8/ntfs-3g.8*
@@ -121,6 +131,10 @@
 %{_includedir}/ntfs-3g
 %{_pkgconfigdir}/libntfs-3g.pc
 
+%files hal
+%defattr(644,root,root,755)
+%{_datadir}/hal/fdi/policy/10osvendor/*
+
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libntfs-3g.a
@@ -131,6 +145,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2011/01/25 13:08:50  atler
+- up to 2011.1.15
+- build with external libfuse by default (added bcond for internal_fuse)
+- separate hal subpackage (TODO removed)
+
 Revision 1.70  2010/12/18 20:04:53  glen
 - hal todo (kill it if not valid)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntfs-3g/ntfs-3g.spec?r1=1.70&r2=1.71&f=u