]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commitdiff
cracklib: Fix setting password issue on x86_64 (#10074). master
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 6 Apr 2012 15:04:22 +0000 (17:04 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 6 Apr 2012 15:04:22 +0000 (17:04 +0200)
This was caused by a wrong path configuration.

Also moves libs to /usr and fixes a typo in the package description.

cracklib/cracklib.nm

index dcb90034b4d05a06471adaf985dee15148a7438d..93a3464a335b47ffaeb1bb72796f5c5ef0445ca9 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = cracklib
 version    = 2.8.18
-release    = 1
+release    = 2
 
 groups     = Security/Password
 url        = http://sourceforge.net/projects/cracklib/
@@ -37,7 +37,7 @@ build
        dictpath = %{dictdir}/pw_dict
 
        configure_options += \
-               --with-default-dict=/lib/cracklib/pw_dict \
+               --with-default-dict=%{dictpath} \
                --with-python \
                --disable-static
 
@@ -67,10 +67,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 +117,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