Attachment 147852 Details for Bug 225659 – specfile diff which includes suggested fixes for merge review issues

[patch] specfile diff which includes suggested fixes for merge review issues

cracklib_spec.patch (text/plain), 3.42 KB, created by Jef Spaleta on 2007-02-11 11:21:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jef Spaleta

Created: 2007-02-11 11:21:10 UTC

Size: 3.42 KB

patch

obsolete

>--- cracklib.spec	2007-01-31 10:30:41.000000000 -0900
>+++ cracklib.spec.new	2007-02-11 02:14:45.000000000 -0900
>@@ -1,7 +1,7 @@
> # Reflects the values hard-coded in various Makefile.am's in the source tree.
> %define dictpath %{_datadir}/cracklib/pw_dict
> 
>-Summary: A password-checking library.
>+Summary: A password-checking library
> Name: cracklib
> Version: 2.8.9
> Release: 8
>@@ -41,7 +41,7 @@
> URL: http://sourceforge.net/projects/cracklib/
> License: Artistic
> Buildroot: %{_tmppath}/%{name}-%{version}-root
>-BuildRequires: gzip, python-devel, words, automake, libtool
>+BuildRequires: python-devel, words, automake, libtool
> Conflicts: cracklib-dicts < 2.8
> 
> %description
>@@ -63,7 +63,7 @@
> CrackLib, you will also want to install the cracklib-dicts package.
> 
> %package devel
>-Summary: Development files needed for building applications which use cracklib.
>+Summary: Development files needed for building applications which use cracklib
> Group: Development/Libraries
> Requires: %{name} = %{version}-%{release}
> 
>@@ -72,7 +72,7 @@
> for compiling applications which use cracklib.
> 
> %package python
>-Summary: Python bindings for applications which use cracklib.
>+Summary: Python bindings for applications which use cracklib
> Group: Development/Libraries
> Requires: %{name} = %{version}-%{release}
> 
>@@ -81,9 +81,10 @@
> written in the Python programming language to use cracklib.
> 
> %package dicts
>-Summary: The standard CrackLib dictionaries.
>+Summary: The standard CrackLib dictionaries
> Group: System Environment/Libraries
> BuildRequires: words >= 2-13
>+Requires: %{name} = %{version}-%{release}
> 
> %description dicts
> The cracklib-dicts package includes the CrackLib dictionaries.
>@@ -105,18 +106,15 @@
>             %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \
>             %{SOURCE35} %{SOURCE36} %{SOURCE37} %{SOURCE1}
> do
>-	cp -fv ${dict} cracklib-dicts/
>+         cp -fv ${dict} cracklib-dicts/
> done
> 
> %build
>-%configure --with-pic --with-python --with-default-dict=%{dictpath}
>+%configure --with-pic --with-python --with-default-dict=%{dictpath} --disable-static
> make
> 
>-%clean
>-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
>-
> %install
>-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
>+rm -rf $RPM_BUILD_ROOT
> make install DESTDIR=$RPM_BUILD_ROOT
> ./util/cracklib-format cracklib-dicts/* | \
> ./util/cracklib-packer $RPM_BUILD_ROOT/%{dictpath}
>@@ -128,7 +126,7 @@
> toprelpath=..
> touch $RPM_BUILD_ROOT/top
> while ! test -f $RPM_BUILD_ROOT/%{_libdir}/$toprelpath/top ; do
>-	toprelpath=../$toprelpath
>+        toprelpath=../$toprelpath
> done
> rm -f $RPM_BUILD_ROOT/top
> if test %{dictpath} != %{_libdir}/cracklib_dict ; then
>@@ -137,10 +135,13 @@
> ln -s $toprelpath%{dictpath}.pwi $RPM_BUILD_ROOT/%{_libdir}/cracklib_dict.pwi
> fi
> rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/cracklibmodule.*a
>-rm -f $RPM_BUILD_ROOT/%{_libdir}/libcrack.la
>+rm -f $RPM_BUILD_ROOT/%{_libdir}/libcrack.*a
> 
> %find_lang %{name}
> 
>+%clean
>+rm -rf $RPM_BUILD_ROOT
>+
> %post -p /sbin/ldconfig
> 
> %postun -p /sbin/ldconfig
>@@ -160,7 +161,6 @@
> %defattr(-,root,root)
> %{_includedir}/*
> %{_libdir}/libcrack.so
>-%{_libdir}/libcrack.a*
> 
> %files dicts
> %defattr(-,root,root)
>@@ -332,7 +332,7 @@
> - fix undeclared function warnings from the new compiler
> - fix URL
> 
>-* Fri Apr 07 2000 Trond Eivind Glomsrød <teg@redhat.com>
>+* Fri Apr 07 2000 Trond Eivind GlomsrÃ¸d <teg@redhat.com>
> - switched to use /usr/share/dict/words
> 
> * Tue Apr 06 1999 Preston Brown <pbrown@redhat.com>

Actions: View | Diff

Attachments on bug 225659: 147852