packages: cracklib/cracklib.spec - drop cracklib.magic, included in file pa...

[glen]

Author: glen                         Date: Sat May  5 20:11:20 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop cracklib.magic, included in file package

---- Files affected:
packages/cracklib:
   cracklib.spec (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: packages/cracklib/cracklib.spec
diff -u packages/cracklib/cracklib.spec:1.70 packages/cracklib/cracklib.spec:1.71
--- packages/cracklib/cracklib.spec:1.70	Thu Oct 21 13:16:44 2010
+++ packages/cracklib/cracklib.spec	Sat May  5 22:11:15 2012
@@ -1,10 +1,9 @@
 # $Revision$, $Date$
-# TODO: is $(pkgdatadir)/cracklib.magic used for anything?
-#       it's already in file database, so maybe just drop it?
 #
 # Conditional build:
 %bcond_with	words	# bigger words database
-#
+
+%define	words_v	20080507
 Summary:	Password checking library
 Summary(es.UTF-8):	Biblioteca de chequeo de contraseñas
 Summary(fr.UTF-8):	Bibliothèque de vérification de mots de passe
@@ -15,7 +14,6 @@
 Summary(uk.UTF-8):	Бібліотека перевірки паролів
 Name:		cracklib
 Version:	2.8.18
-%define	words_v	20080507
 Release:	1
 License:	GPL v2
 Group:		Libraries
@@ -236,9 +234,12 @@
 chmod 755 util/cracklib-format
 util/cracklib-format dicts/cracklib* | util/cracklib-packer $RPM_BUILD_ROOT%{_datadir}/dict/cracklib_dict
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
+
+# already in file(1) database
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/cracklib.magic
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{sl_SI,sl}
+mv -f $RPM_BUILD_ROOT%{_localedir}/{sl_SI,sl}
 
 %find_lang %{name}
 
@@ -275,7 +276,7 @@
 %files -n python-cracklib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_cracklibmodule.so
-%{python_sitelib}/%{name}.*
+%{py_sitescriptdir}/%{name}.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -283,6 +284,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2012/05/05 20:11:15  glen
+- drop cracklib.magic, included in file package
+
 Revision 1.70  2010/10/21 11:16:44  caleb
 - Up to 2.8.18
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/cracklib/cracklib.spec?r1=1.70&r2=1.71