From 298987d3ff155492689ee1ce03182d2e295d8bf15763169d1dae69bd45718e5b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 9 Apr 2015 08:04:33 +0000 Subject: [PATCH] Accepting request 294295 from home:pluskalm:branches:Base:System - Cleanup spec file with spec-cleaner - Remove old ppc provides/obsoletes OBS-URL: https://build.opensuse.org/request/show/294295 OBS-URL: https://build.opensuse.org/package/show/Base:System/cracklib?expand=0&rev=40 --- cracklib.changes | 6 +++ cracklib.spec | 98 +++++++++++++++++++++++------------------------- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/cracklib.changes b/cracklib.changes index be85e20..8461356 100644 --- a/cracklib.changes +++ b/cracklib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 3 09:01:41 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Remove old ppc provides/obsoletes + ------------------------------------------------------------------- Sun Jan 4 13:38:51 UTC 2015 - p.drouand@gmail.com diff --git a/cracklib.spec b/cracklib.spec index cb311fd..069b5eb 100644 --- a/cracklib.spec +++ b/cracklib.spec @@ -1,7 +1,7 @@ # # spec file for package cracklib # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,30 +17,26 @@ Name: cracklib +Version: 2.9.2 +Release: 0 +Summary: Library to crack passwords using dictionaries +License: LGPL-2.1 +Group: System/Libraries +Url: http://sourceforge.net/projects/cracklib +Source: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz +Source2: baselibs.conf +# PATCH-FIX-OPENSUSE (should be upstreamed) +# Remove support for broken 64bit indexes from magic entry [bnc#106007] +Patch0: cracklib-magic.diff +# PATCH-FIX-OPENSUSE Hide non-public functions +Patch1: cracklib-2.9.2-visibility.patch +BuildRequires: autoconf BuildRequires: automake BuildRequires: gzip BuildRequires: libtool BuildRequires: translation-update-upstream BuildRequires: zlib-devel -Url: http://sourceforge.net/projects/cracklib -# bug437293 -%ifarch ppc64 -Obsoletes: cracklib-64bit -%endif -# -Version: 2.9.2 -Release: 0 Requires: cracklib-dict -Summary: Library to crack passwords using dictionaries -License: LGPL-2.1 -Group: System/Libraries -Source: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz -Source2: baselibs.conf -# PATCH-FIX-OPENSUSE (should be upstreamed) -# Remove support for broken 64bit indexes from magic entry [bnc#106007] -Patch: cracklib-magic.diff -# PATCH-FIX-OPENSUSE Hide non-public functions -Patch1: cracklib-2.9.2-visibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,9 +48,9 @@ contains a full dictionary file used by cracklib. %package devel Summary: Header files and libraries for developing apps which will use CrackLib Group: Development/Libraries/C and C++ -Provides: cracklib:/usr/include/crack.h Requires: glibc-devel Requires: libcrack2 = %{version} +Provides: cracklib:%{_includedir}/crack.h %description devel The cracklib-devel package contains the header files and libraries @@ -62,7 +58,6 @@ needed to develop programs that use the CrackLib functions to to determine whether passwords match certain security-oriented characteristics. - %package -n libcrack2 Summary: Library to crack passwords using dictionaries Group: System/Libraries @@ -77,8 +72,8 @@ contains a full dictionary file used by cracklib. %package dict-small Summary: Small dictionary for cracklib - A Password-Checking Library Group: System/Libraries -Provides: cracklib-dict Conflicts: cracklib-dict-full +Provides: cracklib-dict %description dict-small CrackLib tests passwords to determine whether they match certain @@ -87,50 +82,51 @@ from choosing passwords that are easy to guess. This package contains a small dictionay file used by cracklib. - - %prep %setup -q translation-update-upstream -%patch +%patch0 %patch1 %build AUTOPOINT=true autoreconf -fi -%configure --enable-hidden-symbols --disable-static --with-pic -%{__make} %{?_smp_mflags} +%configure \ + --enable-hidden-symbols \ + --disable-static \ + --with-pic +make %{?_smp_mflags} #make -C po update-po %install -mkdir -p $RPM_BUILD_ROOT/usr/lib -make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p %{buildroot}%{_prefix}/lib +make DESTDIR=%{buildroot} install %{?_smp_mflags} # libtool is broken by design, remove this *.la files ... -rm $RPM_BUILD_ROOT/%{_libdir}/libcrack.la +rm %{buildroot}/%{_libdir}/libcrack.la # set executable chmod 755 ./util/cracklib-format # Adjust path in comment -sed "s,/usr/lib/cracklib_dict,%{_datadir}/cracklib/pw_dict,g" lib/crack.h > $RPM_BUILD_ROOT/%{_includedir}/crack.h +sed "s,%{_libexecdir}/cracklib_dict,%{_datadir}/cracklib/pw_dict,g" lib/crack.h > %{buildroot}/%{_includedir}/crack.h ./util/cracklib-format ./dicts/cracklib-small | \ -./util/cracklib-packer $RPM_BUILD_ROOT/%{_datadir}/cracklib/pw_dict -ln -s cracklib-format $RPM_BUILD_ROOT/%{_sbindir}/mkdict -ln -s cracklib-packer $RPM_BUILD_ROOT/%{_sbindir}/packer -rm -f $RPM_BUILD_ROOT/%{_datadir}/cracklib/cracklib-small -ln -sf %{_datadir}/cracklib/pw_dict.hwm $RPM_BUILD_ROOT/usr/lib/cracklib_dict.hwm -ln -sf %{_datadir}/cracklib/pw_dict.pwd $RPM_BUILD_ROOT/usr/lib/cracklib_dict.pwd -ln -sf %{_datadir}/cracklib/pw_dict.pwi $RPM_BUILD_ROOT/usr/lib/cracklib_dict.pwi +./util/cracklib-packer %{buildroot}/%{_datadir}/cracklib/pw_dict +ln -s cracklib-format %{buildroot}/%{_sbindir}/mkdict +ln -s cracklib-packer %{buildroot}/%{_sbindir}/packer +rm -f %{buildroot}/%{_datadir}/cracklib/cracklib-small +ln -sf %{_datadir}/cracklib/pw_dict.hwm %{buildroot}%{_libexecdir}/cracklib_dict.hwm +ln -sf %{_datadir}/cracklib/pw_dict.pwd %{buildroot}%{_libexecdir}/cracklib_dict.pwd +ln -sf %{_datadir}/cracklib/pw_dict.pwi %{buildroot}%{_libexecdir}/cracklib_dict.pwi # # using zip'ed dict takes too long for a check. But the support -# for this is still in the lib. +# for this is still in the lib. # #gzip $RPM_BUILD_ROOT/%{_datadir}/cracklib/pw_dict.pwd #ln -sf %{_datadir}/cracklib/pw_dict.pwd.gz $RPM_BUILD_ROOT/usr/lib/cracklib_dict.pwd.gz -%{find_lang} %{name} +%find_lang %{name} %ifnarch ppc64 nm -C -D %{buildroot}%{_libdir}/libcrack.so.2 | grep ' T ' %endif %check -make check +make %{?_smp_mflags} check %post -n libcrack2 -p /sbin/ldconfig @@ -144,18 +140,18 @@ make check %files -f %{name}.lang %defattr(-,root,root) %doc README README-WORDS NEWS README-LICENSE README-DAWG AUTHORS COPYING.LIB -/usr/sbin/create-cracklib-dict -/usr/sbin/mkdict -/usr/sbin/packer -/usr/sbin/cracklib-check -/usr/sbin/cracklib-format -/usr/sbin/cracklib-packer -/usr/sbin/cracklib-unpacker +%{_sbindir}/create-cracklib-dict +%{_sbindir}/mkdict +%{_sbindir}/packer +%{_sbindir}/cracklib-check +%{_sbindir}/cracklib-format +%{_sbindir}/cracklib-packer +%{_sbindir}/cracklib-unpacker %dir %{_datadir}/cracklib %{_datadir}/cracklib/cracklib.magic -/usr/lib/cracklib_dict.hwm -/usr/lib/cracklib_dict.pwd -/usr/lib/cracklib_dict.pwi +%{_libexecdir}/cracklib_dict.hwm +%{_libexecdir}/cracklib_dict.pwd +%{_libexecdir}/cracklib_dict.pwi %files devel %defattr(644,root,root,755)