packages: ntfs-3g/ntfs-3g.spec - unified devel/static order - track libntfs...

[qboosh]

Author: qboosh                       Date: Tue Jan 25 15:14:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unified devel/static order
- track libntfs-3g soname
- BR: pkgconfig

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

---- Diffs:

================================================================
Index: packages/ntfs-3g/ntfs-3g.spec
diff -u packages/ntfs-3g/ntfs-3g.spec:1.71 packages/ntfs-3g/ntfs-3g.spec:1.72
--- packages/ntfs-3g/ntfs-3g.spec:1.71	Tue Jan 25 14:08:50 2011
+++ packages/ntfs-3g/ntfs-3g.spec	Tue Jan 25 16:14:17 2011
@@ -1,5 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
 %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
@@ -16,6 +19,7 @@
 BuildRequires:	automake
 %{!?with_internal_fuse:BuildRequires:	libfuse-devel >= 2.6.0}
 BuildRequires:	libtool
+BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -43,18 +47,6 @@
 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
@@ -67,6 +59,18 @@
 %description static -l pl.UTF-8
 Ten pakiet zawiera statyczną wersję 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.
+
 %prep
 %setup -q
 
@@ -90,7 +94,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 # mount.ntfs-3g manpage fix
-rm $RPM_BUILD_ROOT%{_mandir}/man8/mount.ntfs-3g.8
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/mount.ntfs-3g.8
 echo ".so ntfs-3g.8" > $RPM_BUILD_ROOT%{_mandir}/man8/mount.ntfs-3g.8
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/10-%{name}.fdi
@@ -116,7 +120,7 @@
 %attr(755,root,root) %{_sbindir}/mount.ntfs
 %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.??
+%attr(755,root,root) %ghost %{_libdir}/libntfs-3g.so.80
 %{_mandir}/man8/mount.lowntfs-3g.8*
 %{_mandir}/man8/mount.ntfs-3g.8*
 %{_mandir}/man8/ntfs-3g.8*
@@ -131,20 +135,25 @@
 %{_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
 
+%files hal
+%defattr(644,root,root,755)
+%{_datadir}/hal/fdi/policy/10osvendor/10-ntfs-3g.fdi
+
 %define date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2011/01/25 15:14:17  qboosh
+- unified devel/static order
+- track libntfs-3g soname
+- BR: pkgconfig
+
 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)
================================================================

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