X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cracklib%2Fcracklib.nm;h=dbc643928df8c5ce76592bd6f35673b683d19ada;hb=79519274fd9d2dbead3f8d9b1538ce758d95bb1e;hp=dcb90034b4d05a06471adaf985dee15148a7438d;hpb=d1fba19ad24b306c8a54516f871a5a269f04f656;p=people%2Fstevee%2Fipfire-3.x.git

diff --git a/cracklib/cracklib.nm b/cracklib/cracklib.nm
index dcb90034b..dbc643928 100644
--- a/cracklib/cracklib.nm
+++ b/cracklib/cracklib.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = cracklib
-version    = 2.8.18
-release    = 1
+version    = 2.9.5
+release    = 2
 
 groups     = Security/Password
 url        = http://sourceforge.net/projects/cracklib/
@@ -27,17 +27,16 @@ sources   += cracklib-words-20080507.gz
 
 build
 	requires
-		autoconf
-		automake
-		gettext-devel
 		python-devel
 	end
 
 	dictdir  = %{datadir}/cracklib
 	dictpath = %{dictdir}/pw_dict
 
+	export LD_LIBRARY_PATH = %{DIR_APP}/lib/.libs
+
 	configure_options += \
-		--with-default-dict=/lib/cracklib/pw_dict \
+		--with-default-dict=%{dictpath} \
 		--with-python \
 		--disable-static
 
@@ -49,11 +48,6 @@ build
 		cp lib/packer.h lib/packer.h.in
 		chmod +x util/cracklib-format
 
-		# Apply all patches.
-		%{MACRO_PATCHES}
-
-		#autoreconf -fi
-
 		mkdir cracklib-dicts
 		cp -vf %{DIR_DL}/cracklib-words-20080507.gz cracklib-dicts
 
@@ -67,10 +61,6 @@ build
 		# Install python bindings
 		make install DESTDIR=%{BUILDROOT} INSTALL="install -c -p" -C python
 
-		mkdir -pv %{BUILDROOT}/{,usr/}%{lib}
-		mv -v %{BUILDROOT}%{libdir}/libcrack.so.2* %{BUILDROOT}/%{lib}
-		ln -vsf ../../%{lib}/libcrack.so.2.8.1 %{BUILDROOT}%{libdir}/libcrack.so
-
 		mkdir -pv %{BUILDROOT}{%{dictdir},%{dictpath}}
 		util/cracklib-format cracklib-dicts/* | \
 			util/cracklib-packer %{BUILDROOT}%{dictpath}
@@ -121,10 +111,13 @@ packages
 
 	# We build an extra python package with the bindings for it.
 	package python-cracklib
-		summary = Python bindings for ${thisapp}.
+		summary = Python bindings for %{thisapp}.
 		description = %{summary}
 
-		files = /usr/lib*/python*
+		files
+			/usr/lib/python*
+			%{libdir}/python*
+		end
 	end
 
 	package %{name}-debuginfo