packages: ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec - udev obsoletes hal - a...

[baggins]

Author: baggins                      Date: Thu Jul 28 10:54:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- udev obsoletes hal
- added epoch for clean update from old package

---- Files affected:
packages/ntfs-3g_ntfsprogs:
   ntfs-3g_ntfsprogs.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec
diff -u packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec:1.5 packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec:1.6
--- packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec:1.5	Mon Jun 20 12:07:47 2011
+++ packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec	Thu Jul 28 12:54:42 2011
@@ -8,6 +8,7 @@
 Name:		ntfs-3g_ntfsprogs
 Version:	2011.4.12
 Release:	0.2
+Epoch:		1
 License:	GPL v2+
 Group:		Applications/System
 #Source0-Download: http://www.tuxera.com/community/ntfs-3g-download/
@@ -135,23 +136,12 @@
 %description -n ntfs-3g-static -l pl.UTF-8
 Ten pakiet zawiera statyczną wersję bibliotek libntfs-3g.
 
-%package -n ntfs-3g-hal
-Summary:	HAL integration for ntfs-3g
-Summary(pl.UTF-8):	Integracja ntfs-3g z HAL-em
-Group:		Applications/System
-Requires:	ntfs-3g = %{version}-%{release}
-
-%description -n ntfs-3g-hal
-HAL integration for ntfs-3g.
-
-%description -n ntfs-3g-hal -l pl.UTF-8
-Integracja ntfs-3g z HAL-em.
-
 %package -n ntfs-3g-udev
 Summary:	udev integration for ntfs-3g
 Summary(pl.UTF-8):	Integracja ntfs-3g z udevem
 Group:		Applications/System
 Requires:	ntfs-3g = %{version}-%{release}
+Obsoletes:	ntfs-3g-hal
 
 %description -n ntfs-3g-udev
 udev integration for ntfs-3g.
@@ -177,7 +167,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/hal/fdi/policy/10osvendor,/lib/udev/rules.d}
+install -d $RPM_BUILD_ROOT/lib/udev/rules.d
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -185,7 +175,6 @@
 %{__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-ntfs-3g.fdi
 install %{SOURCE2} $RPM_BUILD_ROOT/lib/udev/rules.d/99-ntfs3g.rules
 
 # Symlink to allow automount using ntfs-3g:
@@ -261,10 +250,6 @@
 %defattr(644,root,root,755)
 %{_libdir}/libntfs-3g.a
 
-%files -n ntfs-3g-hal
-%defattr(644,root,root,755)
-%{_datadir}/hal/fdi/policy/10osvendor/10-ntfs-3g.fdi
-
 %files -n ntfs-3g-udev
 %defattr(644,root,root,755)
 /lib/udev/rules.d/99-ntfs3g.rules
@@ -275,6 +260,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/07/28 10:54:42  baggins
+- udev obsoletes hal
+- added epoch for clean update from old package
+
 Revision 1.5  2011/06/20 10:07:47  adamg
 - fix ldconfig call
 
================================================================

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